Add another alarm circuit.

Now we've got two separate alarms; we can split out the 'local arm' vs
'remote arm' sound, or we could have a separate light and siren
circuit.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/telefire.pcb b/telefire.pcb
index 56171dca21b135db5e03b1198436bbc3ef3202a1..cdf8280ee64754b664fc8b2411125c631cb55d8f 100644 (file)
--- a/telefire.pcb
+++ b/telefire.pcb
@@ -6,11 +6,11 @@ FileVersion[20070407]
 PCB["TeleFire" 400000 400000]
 
 Grid[100.0 0 0 0]
-Cursor[32400 21200 0.000000]
+Cursor[30900 294900 0.000000]
 PolyArea[200000000.000000]
 Thermal[0.500000]
 DRC[500 1000 500 500 1500 700]
-Flags("showdrc,nameonpcb,snappin,orthomove")
+Flags("showdrc,nameonpcb,clearnew,snappin")
 Groups("1,c:2,s:3")
 Styles["Signal,1000,2900,1500,1000:Power,2500,6000,3500,1000:Fat,2500,6000,3500,1000:Skinny,600,2402,1181,600"]
 
@@ -823,9 +823,8 @@ Via[396600 158800 2900 2000 0 1500 "" "thermal(1S)"]
 Via[216800 304174 2900 2000 0 1500 "" "thermal(1S)"]
 Via[216500 103000 2900 2000 0 1500 "" "thermal(1S)"]
 Via[309457 330700 2900 2000 0 1500 "" "thermal(0X,1S)"]
-Via[301700 305000 2900 2000 0 1500 "" "thermal(1S)"]
+Via[301600 311600 2900 2000 0 1500 "" "thermal(1S)"]
 Via[277057 317300 2900 2000 0 1500 "" "thermal(1S)"]
-Via[310100 193100 2900 2000 0 1500 "" "thermal(0X,1S)"]
 Via[332500 160400 2900 2000 0 1500 "" ""]
 Via[286200 309600 2900 2000 0 1500 "" ""]
 Via[286200 300300 2900 2000 0 1500 "" ""]
@@ -870,26 +869,31 @@ Via[267900 21800 2900 2000 0 1500 "" ""]
 Via[305500 81800 2900 2000 0 1500 "" "thermal(1S)"]
 Via[357347 159900 2900 2000 0 1500 "" ""]
 Via[362200 163700 2900 2000 0 1500 "" "thermal(1S)"]
-Via[361600 313800 2900 2000 0 1500 "" ""]
 Via[255100 308300 2900 2000 0 1500 "" ""]
 Via[255100 301600 2900 2000 0 1500 "" ""]
 Via[309000 160800 2900 2000 0 1500 "" ""]
 Via[324800 171900 2900 2000 0 1500 "" ""]
 Via[334500 171600 2900 2000 0 1500 "" ""]
-Via[338600 207300 2900 2000 0 1500 "" "thermal(1S)"]
-Via[334700 183100 2900 2000 0 1500 "" ""]
-Via[318500 183100 2900 2000 0 1500 "" ""]
-Via[344000 189800 2900 2000 0 1500 "" ""]
+Via[344300 169000 2900 2000 0 1500 "" ""]
+Via[347800 169000 2900 2000 0 1500 "" ""]
+Via[321600 195500 2900 2000 0 1500 "" ""]
+Via[338200 247850 2900 2000 0 1500 "" "thermal(1S)"]
+Via[328200 247950 2900 2000 0 1500 "" "thermal(1S)"]
 Via[331500 195500 2900 2000 0 1500 "" ""]
-Via[323300 195500 2900 2000 0 1500 "" ""]
-Via[320100 176600 2900 2000 0 1500 "" ""]
-Via[308100 306226 2900 2000 0 1500 "" ""]
-Via[308100 312726 2900 2000 0 1500 "" ""]
-Via[311600 306226 2900 2000 0 1500 "" ""]
-Via[311600 312726 2900 2000 0 1500 "" ""]
-Via[317400 295626 2900 2000 0 1500 "" "thermal(1S)"]
-Via[341700 264150 2900 2000 0 1500 "" "thermal(1S)"]
-Via[351700 264050 2900 2000 0 1500 "" "thermal(1S)"]
+Via[344000 189800 2900 2000 0 1500 "" ""]
+Via[338600 207300 2900 2000 0 1500 "" "thermal(1S)"]
+Via[310100 193100 2900 2000 0 1500 "" "thermal(0X,1S)"]
+Via[318500 178200 2900 2000 0 1500 "" ""]
+Via[328400 181400 2900 2000 0 1500 "" ""]
+Via[315900 181400 2900 2000 0 1500 "" ""]
+Via[351100 175800 2900 2000 0 1500 "" ""]
+Via[354600 175800 2900 2000 0 1500 "" ""]
+Via[365000 309100 2900 2000 0 1500 "" ""]
+Via[308800 304100 2900 2000 0 1500 "" ""]
+Via[305300 304100 2900 2000 0 1500 "" ""]
+Via[305300 310700 2900 2000 0 1500 "" ""]
+Via[308800 310700 2900 2000 0 1500 "" ""]
+Via[318700 311100 2900 2000 0 1500 "" "thermal(1S)"]
 
 Element["" "sma-edge" "J8" "SMA" 383700 151800 0 0 1 10 ""]
 (
@@ -1421,47 +1425,6 @@ Element["" "0402" "R11" "3.3k" 223074 85174 -8600 2800 1 100 ""]
 
        )
 
-Element["" "0402" "C4" "0.1uF" 337600 195500 4028 -6812 0 100 ""]
-(
-       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
-
-       )
-
-Element["" "0402" "R1" "2.2k" 340900 202300 4100 600 0 100 ""]
-(
-       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
-
-       )
-
-Element["" "TSSOP16" "U3" "PCA9922" 321500 208600 -2000 -6000 0 100 ""]
-(
-       Pad[-13917 -8956 -9311 -8956 1299 1000 2299 "Vss" "1" "square"]
-       Pad[-13917 -6397 -9311 -6397 1299 1000 2299 "SDI" "2" "square"]
-       Pad[-13917 -3838 -9311 -3838 1299 1000 2299 "CLK" "3" "square"]
-       Pad[-13917 -1279 -9311 -1279 1299 1000 2299 "LE/DM1" "4" "square"]
-       Pad[-13917 1279 -9311 1279 1299 1000 2299 "LED0" "5" "square"]
-       Pad[-13917 3838 -9311 3838 1299 1000 2299 "LED1" "6" "square"]
-       Pad[-13917 6397 -9311 6397 1299 1000 2299 "LED2" "7" "square"]
-       Pad[-13917 8956 -9311 8956 1299 1000 2299 "LED3" "8" "square"]
-       Pad[9311 8956 13917 8956 1299 1000 2299 "LED4" "9" "square,edge2"]
-       Pad[9311 6397 13917 6397 1299 1000 2299 "LED5" "10" "square,edge2"]
-       Pad[9311 3838 13917 3838 1299 1000 2299 "LED6" "11" "square,edge2"]
-       Pad[9311 1279 13917 1279 1299 1000 2299 "LED7" "12" "square,edge2"]
-       Pad[9311 -1279 13917 -1279 1299 1000 2299 "OE_N/DM2" "13" "square,edge2"]
-       Pad[9311 -3838 13917 -3838 1299 1000 2299 "SDO" "14" "square,edge2"]
-       Pad[9311 -6397 13917 -6397 1299 1000 2299 "R_EXT" "15" "square,edge2"]
-       Pad[9311 -8956 13917 -8956 1299 1000 2299 "Vdd" "16" "square,edge2"]
-       ElementLine [-15566 -10606 -15566 10606 1000]
-       ElementLine [-15566 10606 15566 10606 1000]
-       ElementLine [15566 10606 15566 -10606 1000]
-       ElementLine [-15566 -10606 -2500 -10606 1000]
-       ElementLine [15566 -10606 2500 -10606 1000]
-       ElementArc [0 -10606 2500 2500 0 180 1000]
-
-       )
-
 Element["" "100mil-led" "D4" "red" 250100 350500 14700 -4200 0 100 ""]
 (
        Pin[-5000 0 7000 1500 8500 3500 "1" "1" "square"]
@@ -1533,21 +1496,21 @@ Element["" "SOT23-5" "U1" "3.3V" 302657 317500 -5300 400 0 89 ""]
 
        )
 
-Element["" "0402" "C37" "2.2uF" 297657 305000 -5200 2600 0 100 ""]
+Element["" "0402" "C37" "2.2uF" 297457 311600 -4700 -7500 0 100 ""]
 (
        Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
        Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "R4" "27k" 311400 325774 2457 -3039 0 100 ""]
+Element["" "0402" "R4" "27k" 311400 325774 2357 -2839 0 100 ""]
 (
        Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
        Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "R5" "100k" 307600 322600 -4457 2491 0 100 ""]
+Element["" "0402" "R5" "100k" 307600 322600 -1657 -8409 0 100 ""]
 (
        Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
        Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
@@ -1977,66 +1940,78 @@ Element["" "0402" "C31" "22pF" 358600 171474 -10607 -2974 0 100 ""]
 
        )
 
-Element["" "TE1217861" "J51" "0.25" 344200 349800 0 0 0 100 ""]
+Element["" "TE1217861" "J51" "0.25" 354200 345400 0 0 3 100 ""]
 (
-       Pin[-10000 0 12500 4000 14500 5500 "1" "1" "square,edge2,thermal(0S)"]
-       Pin[10000 0 12500 4000 14500 5500 "1" "1" "square,edge2,thermal(0S)"]
+       Pin[0 -10000 12500 4000 14500 5500 "1" "1" "square,thermal(0S)"]
+       Pin[0 10000 12500 4000 14500 5500 "1" "1" "square,thermal(0S)"]
        Pad[0 0 0 0 12500 4000 14500 "1" "1" "square"]
-       ElementLine [-15600 -6150 15600 -6150 1000]
-       ElementLine [15600 -6150 15600 6150 1000]
-       ElementLine [15600 6150 -15600 6150 1000]
-       ElementLine [-15600 6150 -15600 -6150 1000]
+       ElementLine [6150 -15600 6150 15600 1000]
+       ElementLine [-6150 15600 6150 15600 1000]
+       ElementLine [-6150 -15600 -6150 15600 1000]
+       ElementLine [-6150 -15600 6150 -15600 1000]
 
        )
 
-Element["" "TE1217861" "J52" "0.25" 344200 295800 0 0 0 100 ""]
+Element["" "0402" "C3" "47pF" 318700 315726 -2536 -8626 0 100 ""]
 (
-       Pin[-10000 0 12500 4000 14500 5500 "1" "1" "square,edge2,thermal(0S)"]
-       Pin[10000 0 12500 4000 14500 5500 "1" "1" "square,edge2,thermal(0S)"]
-       Pad[0 0 0 0 12500 0 14500 "1" "1" "square,thermal(0S)"]
-       ElementLine [-15600 -6150 15600 -6150 1000]
-       ElementLine [15600 -6150 15600 6150 1000]
-       ElementLine [15600 6150 -15600 6150 1000]
-       ElementLine [-15600 6150 -15600 -6150 1000]
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 1574 393 1574 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "C3" "47pF" 313174 295600 -9910 -3200 0 100 ""]
+Element["" "0402" "R2" "1.5k" 322600 318900 -353 -8399 0 100 ""]
 (
-       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
-       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
+       Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "R2" "1.5k" 316700 307500 -9053 -2843 0 100 ""]
+Element["" "0402" "R3" "33" 314900 318874 -4300 -8448 0 100 ""]
 (
-       Pad[-393 -1574 393 -1574 1968 2000 2568 "1" "1" "square"]
-       Pad[-393 1574 393 1574 1968 2000 2568 "2" "2" "square"]
+       Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "0402" "R3" "33" 311600 300826 -9100 -3148 0 100 ""]
+Element["" "TE1217861" "J53" "0.25" 334200 345400 0 0 3 100 ""]
 (
-       Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
-       Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
+       Pin[0 -10000 12500 4000 14500 5500 "1" "1" "square"]
+       Pin[0 10000 12500 4000 14500 5500 "1" "1" "square"]
+       Pad[0 0 0 0 12500 0 14500 "1" "1" "square"]
+       ElementLine [6150 -15600 6150 15600 1000]
+       ElementLine [-6150 15600 6150 15600 1000]
+       ElementLine [-6150 -15600 -6150 15600 1000]
+       ElementLine [-6150 -15600 6150 -15600 1000]
 
        )
 
-Element["" "0402" "R51" "3.3k" 347200 248426 3150 4516 3 100 ""]
+Element["" "TE1217861" "J52" "0.25" 341500 284700 0 0 3 100 ""]
 (
-       Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
-       Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
+       Pin[0 -10000 12500 4000 14500 5500 "1" "1" "square,thermal(0S)"]
+       Pin[0 10000 12500 4000 14500 5500 "1" "1" "square,thermal(0S)"]
+       Pad[0 0 0 0 12500 0 14500 "1" "1" "square,thermal(0S)"]
+       ElementLine [6150 -15600 6150 15600 1000]
+       ElementLine [-6150 15600 6150 15600 1000]
+       ElementLine [-6150 -15600 -6150 15600 1000]
+       ElementLine [-6150 -15600 6150 -15600 1000]
 
        )
 
-Element["" "0402" "R52" "100" 341700 248550 -12576 -2824 0 100 ""]
+Element["" "0402" "R52" "100" 333300 232450 3074 -12426 3 100 ""]
 (
        Pad[-393 -1574 393 -1574 1968 2000 2568 "1" "1" "square"]
        Pad[-393 1574 393 1574 1968 2000 2568 "2" "2" "square"]
 
        )
 
-Element["" "SO8" "Q3" "unknown" 344200 268100 850 -2450 0 100 ""]
+Element["" "0402" "R51" "3.3k" 338800 232326 2950 -12284 3 100 ""]
+(
+       Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
+
+       )
+
+Element["" "SO8" "Q3" "unknown" 330700 251900 850 -2450 0 100 ""]
 (
        Pad[7500 -13500 7500 -7000 2000 1000 3000 "S" "1" "square"]
        Pad[2500 -13500 2500 -7000 2000 1000 3000 "G" "2" "square"]
@@ -2053,6 +2028,73 @@ Element["" "SO8" "Q3" "unknown" 344200 268100 850 -2450 0 100 ""]
        ElementLine [9500 2500 9500 15500 1000]
        ElementArc [9500 0 2500 2500 270 180 1000]
 
+       )
+
+Element["" "0402" "R54" "100" 322800 232426 2950 -12524 3 100 ""]
+(
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 1574 393 1574 1968 2000 2568 "2" "2" "square"]
+
+       )
+
+Element["" "0402" "R53" "3.3k" 328300 232400 2950 -12424 3 100 ""]
+(
+       Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
+       Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
+
+       )
+
+Element["" "TE1217861" "J54" "0.25" 319900 284700 0 0 3 100 ""]
+(
+       Pin[0 -10000 12500 4000 14500 5500 "1" "1" "square,thermal(0S)"]
+       Pin[0 10000 12500 4000 14500 5500 "1" "1" "square,thermal(0S)"]
+       Pad[0 0 0 0 12500 0 14500 "1" "1" "square"]
+       ElementLine [6150 -15600 6150 15600 1000]
+       ElementLine [-6150 15600 6150 15600 1000]
+       ElementLine [-6150 -15600 -6150 15600 1000]
+       ElementLine [-6150 -15600 6150 -15600 1000]
+
+       )
+
+Element["" "TSSOP16" "U3" "PCA9922" 321500 208600 -2000 -6000 0 100 ""]
+(
+       Pad[-13917 -8956 -9311 -8956 1299 1000 2299 "Vss" "1" "square"]
+       Pad[-13917 -6397 -9311 -6397 1299 1000 2299 "SDI" "2" "square"]
+       Pad[-13917 -3838 -9311 -3838 1299 1000 2299 "CLK" "3" "square"]
+       Pad[-13917 -1279 -9311 -1279 1299 1000 2299 "LE/DM1" "4" "square"]
+       Pad[-13917 1279 -9311 1279 1299 1000 2299 "LED0" "5" "square"]
+       Pad[-13917 3838 -9311 3838 1299 1000 2299 "LED1" "6" "square"]
+       Pad[-13917 6397 -9311 6397 1299 1000 2299 "LED2" "7" "square"]
+       Pad[-13917 8956 -9311 8956 1299 1000 2299 "LED3" "8" "square"]
+       Pad[9311 8956 13917 8956 1299 1000 2299 "LED4" "9" "square,edge2"]
+       Pad[9311 6397 13917 6397 1299 1000 2299 "LED5" "10" "square,edge2"]
+       Pad[9311 3838 13917 3838 1299 1000 2299 "LED6" "11" "square,edge2"]
+       Pad[9311 1279 13917 1279 1299 1000 2299 "LED7" "12" "square,edge2"]
+       Pad[9311 -1279 13917 -1279 1299 1000 2299 "OE_N/DM2" "13" "square,edge2"]
+       Pad[9311 -3838 13917 -3838 1299 1000 2299 "SDO" "14" "square,edge2"]
+       Pad[9311 -6397 13917 -6397 1299 1000 2299 "R_EXT" "15" "square,edge2"]
+       Pad[9311 -8956 13917 -8956 1299 1000 2299 "Vdd" "16" "square,edge2"]
+       ElementLine [-15566 -10606 -15566 10606 1000]
+       ElementLine [-15566 10606 15566 10606 1000]
+       ElementLine [15566 10606 15566 -10606 1000]
+       ElementLine [-15566 -10606 -2500 -10606 1000]
+       ElementLine [15566 -10606 2500 -10606 1000]
+       ElementArc [0 -10606 2500 2500 0 180 1000]
+
+       )
+
+Element["" "0402" "R1" "2.2k" 340900 202300 4100 600 0 100 ""]
+(
+       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
+       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
+
+       )
+
+Element["" "0402" "C4" "0.1uF" 337600 195500 4028 -6812 0 100 ""]
+(
+       Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
+       Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
+
        )
 Layer(1 "top")
 (
@@ -2158,7 +2200,6 @@ Layer(1 "top")
        Line[229500 93000 229500 87400 1000 2000 "clearline"]
        Line[229500 87400 229000 86900 1000 2000 "clearline"]
        Line[229500 102900 235300 102900 1000 2000 "clearline"]
-       Line[335400 202200 339052 202200 1000 2000 "clearline"]
        Line[245100 150500 245100 350500 2500 2000 "clearline"]
        Line[298657 337500 298657 353500 2500 2000 "clearline"]
        Line[293657 345800 293657 363100 1000 2000 "clearline"]
@@ -2174,27 +2215,21 @@ Layer(1 "top")
        Line[294657 324000 297657 321000 1000 2000 "clearline"]
        Line[300157 321000 302657 323500 1000 2000 "clearline"]
        Line[302657 323500 302657 324500 1000 2000 "clearline"]
-       Line[299657 305000 301657 305000 2500 2000 "clearline"]
        Line[294657 304500 294657 316500 2500 2000 "clearline"]
        Line[277057 317300 281857 317300 1000 2000 "clearline"]
        Line[286157 315100 286157 322900 1000 2000 "clearline"]
        Line[286157 326200 286157 338300 1000 2000 "clearline"]
        Line[286157 338300 293657 345800 1000 2000 "clearline"]
        Line[294657 302000 294657 305000 2500 2000 "clearline"]
-       Line[310100 193100 310100 199430 1000 2000 "clearline"]
-       Line[310100 199430 309886 199644 1000 2000 "clearline"]
        Line[339400 387600 339300 384143 2500 2000 "clearline"]
        Line[339300 384143 308657 353500 2500 2000 "clearline"]
        Line[294657 304900 245500 304900 2500 2000 "clearline"]
        Line[245500 304900 245100 304500 2500 2000 "clearline"]
        Line[332700 160300 332800 160400 1000 2000 "clearline"]
-       Line[294800 266500 294800 302200 2500 2000 "clearline"]
-       Line[294800 302200 294657 302343 2500 2000 "clearline"]
        Line[337726 159725 333175 159725 1000 2000 "clearline"]
        Line[333175 159725 332500 160400 1000 2000 "clearline"]
        Line[286157 315300 286157 309643 1000 2000 "clearline"]
        Line[286157 309643 286200 309600 1000 2000 "clearline"]
-       Line[286200 300300 286200 270200 1000 2000 "clearline"]
        Line[235200 106174 235200 113600 1000 2000 "clearline"]
        Line[232152 113700 231550 113700 1000 2000 "clearline"]
        Line[231550 113700 225950 108100 1000 2000 "clearline"]
@@ -2232,16 +2267,12 @@ Layer(1 "top")
        Line[286526 156674 285900 157300 1000 2000 "clearline"]
        Line[240600 110100 240600 103600 1000 2000 "clearline"]
        Line[240600 103600 234800 97800 1000 2000 "clearline"]
-       Line[309886 202203 307103 202203 1000 2000 "clearline"]
        Line[307103 202203 298200 193300 1000 2000 "clearline"]
        Line[258400 45400 250500 45400 2500 2000 "clearline"]
        Line[250500 45400 245100 50800 2500 2000 "clearline"]
        Line[243200 115300 239100 115300 1000 2000 "clearline"]
-       Line[309765 207200 309886 207321 1000 2000 "clearline"]
        Line[255100 150500 255100 163100 1000 2000 "clearline"]
        Line[255100 163100 304400 212400 1000 2000 "clearline"]
-       Line[304400 212400 309848 212400 1000 2000 "clearline"]
-       Line[309848 212400 309886 212438 1000 2000 "clearline"]
        Line[309886 214997 291003 214997 1000 2000 "clearline"]
        Line[291003 214997 255100 250900 1000 2000 "clearline"]
        Line[243400 143400 255600 143400 1000 2000 "clearline"]
@@ -2251,8 +2282,6 @@ Layer(1 "top")
        Line[243900 104900 243900 104700 1000 2000 "clearline"]
        Line[243900 104700 236400 97200 1000 2000 "clearline"]
        Line[293800 192900 305600 204700 1000 2000 "clearline"]
-       Line[305600 204700 309824 204700 1000 2000 "clearline"]
-       Line[309824 204700 309886 204762 1000 2000 "clearline"]
        Line[304500 152200 302000 149700 1000 2000 "clearline"]
        Line[302000 149700 299900 149700 1000 2000 "clearline"]
        Line[299900 149700 298000 151600 1000 2000 "clearline"]
@@ -2303,8 +2332,6 @@ Layer(1 "top")
        Line[243900 110700 243900 104700 1000 2000 "clearline"]
        Line[282900 159800 282900 187700 1000 2000 "clearline"]
        Line[282900 187700 305100 209900 1000 2000 "clearline"]
-       Line[305100 209900 309865 209900 1000 2000 "clearline"]
-       Line[309865 209900 309886 209879 1000 2000 "clearline"]
        Line[282900 138300 274300 138300 1000 2000 "clearline"]
        Line[274300 138300 255300 119300 1000 2000 "clearline"]
        Line[255300 119300 255300 51000 1000 2000 "clearline"]
@@ -2602,16 +2629,11 @@ Layer(1 "top")
        Line[378000 172748 381652 172748 1000 2000 "clearline"]
        Line[381652 172748 381700 172700 1000 2000 "clearline"]
        Line[371548 159800 381300 159800 1000 2000 "clearline"]
-       Line[294800 266500 323400 237900 2500 2000 "clearline"]
-       Line[323400 237900 323400 189600 2500 2000 "clearline"]
-       Line[286200 270200 321100 235300 1000 2000 "clearline"]
        Line[359326 231700 359326 247820 1000 2000 "clearline"]
        Line[359326 247820 385291 273785 1000 2000 "clearline"]
        Line[255100 350500 255100 308300 1000 2000 "clearline"]
        Line[255100 301600 255100 272342 1000 2000 "clearline"]
        Line[255100 272342 309886 217556 1000 2000 "clearline"]
-       Line[323400 189700 323400 175200 2500 2000 "clearline"]
-       Line[323400 175200 309000 160800 2500 2000 "clearline"]
        Line[343631 159725 343631 162669 1000 2000 "clearline"]
        Line[339694 159725 339694 160606 1000 2000 "clearline"]
        Line[339694 160606 336900 163400 1000 2000 "clearline"]
@@ -2619,136 +2641,150 @@ Layer(1 "top")
        Line[333300 163400 324800 171900 1000 2000 "clearline"]
        Line[333800 166500 323400 176900 1000 2000 "clearline"]
        Line[333800 166500 337500 166500 1000 2000 "clearline"]
-       Line[325800 176700 333400 169100 1000 2000 "clearline"]
-       Line[333400 169100 337200 169100 1000 2000 "clearline"]
        Line[337200 169100 343631 162669 1000 2000 "clearline"]
-       Line[334500 171600 333100 171600 1000 2000 "clearline"]
-       Line[333100 171600 327400 177300 1000 2000 "clearline"]
        Line[345600 159725 345600 164100 1000 2000 "clearline"]
-       Line[345600 164100 329000 180700 1000 2000 "clearline"]
-       Line[333114 207321 338579 207321 1000 2000 "clearline"]
-       Line[338579 207321 342474 203426 1000 2000 "clearline"]
+       Line[345600 164100 328400 181300 1000 2000 "clearline"]
        Line[347568 159725 347568 164432 1000 2000 "clearline"]
-       Line[347568 164432 330600 181400 1000 2000 "clearline"]
-       Line[330600 181400 330600 184800 1000 2000 "clearline"]
        Line[349536 159725 349536 164764 1000 2000 "clearline"]
-       Line[349536 164764 332200 182100 1000 2000 "clearline"]
-       Line[332200 182100 332200 184200 1000 2000 "clearline"]
-       Line[351505 159725 351505 166295 1000 2000 "clearline"]
-       Line[351505 166295 334700 183100 1000 2000 "clearline"]
-       Line[318500 183100 318500 202700 1000 2000 "clearline"]
-       Line[318500 202700 313900 207300 1000 2000 "clearline"]
-       Line[313900 207300 309907 207300 1000 2000 "clearline"]
-       Line[309907 207300 309886 207321 1000 2000 "clearline"]
-       Line[332200 184200 333700 185700 1000 2000 "clearline"]
-       Line[333700 185700 345600 185700 1000 2000 "clearline"]
-       Line[344900 187300 333100 187300 1000 2000 "clearline"]
-       Line[333100 187300 330600 184800 1000 2000 "clearline"]
-       Line[321100 196900 321100 235300 1000 2000 "clearline"]
-       Line[321100 197000 321100 196900 1000 2000 "clearline"]
-       Line[321100 196900 320700 196500 1000 2000 "clearline"]
-       Line[320700 196500 320700 194700 1000 2000 "clearline"]
-       Line[320700 194700 321100 194300 1000 2000 "clearline"]
-       Line[321100 194300 321100 177600 1000 2000 "clearline"]
-       Line[321100 177600 320100 176600 1000 2000 "clearline"]
-       Line[333114 199644 333114 197114 1000 2000 "clearline"]
-       Line[333114 197114 331500 195500 1000 2000 "clearline"]
-       Line[331500 195500 336026 195500 1000 2000 "clearline"]
-       Line[342474 202300 342474 198800 1000 2000 "clearline"]
-       Line[342474 198800 339174 195500 1000 2000 "clearline"]
        Line[367274 226600 367274 213074 1000 2000 "clearline"]
        Line[367274 213074 344000 189800 1000 2000 "clearline"]
        Line[386700 229500 375600 229500 1000 2000 "clearline"]
        Line[375600 229500 368900 222800 1000 2000 "clearline"]
-       Line[368900 222800 368900 211300 1000 2000 "clearline"]
-       Line[368900 211300 344900 187300 1000 2000 "clearline"]
        Line[376700 224500 370600 218400 1000 2000 "clearline"]
-       Line[370600 218400 370600 210700 1000 2000 "clearline"]
-       Line[370600 210700 345600 185700 1000 2000 "clearline"]
-       Line[334200 349800 334200 387400 20000 10000 "clearline"]
-       Line[354200 349800 354200 387400 20000 10000 "clearline"]
-       Line[354200 387400 334700 387400 20000 10000 "clearline"]
-       Line[334700 387400 334200 387900 20000 10000 "clearline"]
-       Line[334200 349800 354000 349800 20000 10000 "clearline"]
-       Line[354000 349800 354200 350000 20000 10000 "clearline"]
        Line[375300 363776 375291 363785 1000 2000 "clearline"]
-       Line[311600 306226 311600 302400 1000 2000 "clearline"]
-       Line[316700 305926 311600 305926 1000 2000 "clearline"]
        Line[311400 327348 311400 328757 1000 2000 "clearline"]
        Line[311400 328757 309557 330600 1000 2000 "clearline"]
        Line[307600 321026 297631 321026 1000 2000 "clearline"]
        Line[297631 321026 297628 321028 1000 2000 "clearline"]
        Line[307600 324174 311374 324174 1000 2000 "clearline"]
        Line[311374 324174 311400 324200 1000 2000 "clearline"]
-       Line[311400 324200 311400 318800 1000 2000 "clearline"]
-       Line[311400 318800 308100 315500 1000 2000 "clearline"]
-       Line[308100 315500 308100 312726 1000 2000 "clearline"]
        Line[303678 360278 303678 347622 1000 2000 "clearline"]
-       Line[303678 347622 314000 337300 1000 2000 "clearline"]
-       Line[314000 337300 314000 315126 1000 2000 "clearline"]
-       Line[314000 315126 311600 312726 1000 2000 "clearline"]
-       Line[317400 295626 314774 295626 1000 2000 "clearline"]
-       Line[314774 295626 314748 295600 1000 2000 "clearline"]
-       Line[311600 299252 311600 268200 1000 2000 "clearline"]
-       Line[311600 268200 327400 252400 1000 2000 "clearline"]
-       Line[327400 177300 327400 252400 1000 2000 "clearline"]
-       Line[308100 306226 308100 269400 1000 2000 "clearline"]
-       Line[308100 269400 325800 251700 1000 2000 "clearline"]
-       Line[325800 251700 325800 176700 1000 2000 "clearline"]
-       Line[361600 313800 321426 313800 2500 2000 "clearline"]
-       Line[294657 309500 317100 309500 2500 2000 "clearline"]
-       Line[317100 309500 321400 313800 2500 2000 "clearline"]
        Line[375291 273785 375291 266000 1000 2000 "clearline"]
        Line[375291 266000 375200 266000 1000 2000 "clearline"]
        Line[375200 266000 357200 248000 1000 2000 "clearline"]
        Line[357200 248000 357200 221000 1000 2000 "clearline"]
        Line[357200 221000 346100 209900 1000 2000 "clearline"]
-       Line[346100 209900 333135 209900 1000 2000 "clearline"]
-       Line[333135 209900 333114 209879 1000 2000 "clearline"]
        Line[375291 303785 375291 303691 1000 2000 "clearline"]
        Line[375291 303691 370700 299100 1000 2000 "clearline"]
        Line[370700 299100 370700 263700 1000 2000 "clearline"]
        Line[370700 263700 355600 248600 1000 2000 "clearline"]
-       Line[355600 248600 355600 221700 1000 2000 "clearline"]
-       Line[355600 221700 346300 212400 1000 2000 "clearline"]
-       Line[346300 212400 333152 212400 1000 2000 "clearline"]
-       Line[333152 212400 333114 212438 1000 2000 "clearline"]
        Line[375291 333785 375285 333785 1000 2000 "clearline"]
        Line[375285 333785 369100 327600 1000 2000 "clearline"]
        Line[369100 327600 369100 264400 1000 2000 "clearline"]
        Line[369100 264400 354000 249300 1000 2000 "clearline"]
-       Line[354000 249300 354000 222400 1000 2000 "clearline"]
-       Line[354000 222400 346600 215000 1000 2000 "clearline"]
-       Line[346600 215000 333117 215000 1000 2000 "clearline"]
-       Line[333117 215000 333114 214997 1000 2000 "clearline"]
        Line[375291 363785 375291 341091 1000 2000 "clearline"]
        Line[375291 341091 367500 333300 1000 2000 "clearline"]
        Line[367500 333300 367500 265000 1000 2000 "clearline"]
        Line[367500 265000 352400 249900 1000 2000 "clearline"]
-       Line[352400 249900 352400 223100 1000 2000 "clearline"]
-       Line[352400 223100 346900 217600 1000 2000 "clearline"]
-       Line[346900 217600 333158 217600 1000 2000 "clearline"]
+       Line[354200 387400 334200 387400 20000 2000 ""]
+       Line[334200 387400 334200 335400 20000 2000 ""]
+       Line[334200 335400 354200 335400 20000 2000 ""]
+       Line[354200 335400 354200 387400 20000 2000 ""]
+       Line[347568 164400 347568 165732 1000 2000 ""]
+       Line[347568 165732 344300 169000 1000 2000 ""]
+       Line[349536 164700 349536 167264 1000 2000 ""]
+       Line[349536 167264 347800 169000 1000 2000 ""]
+       Line[351505 159725 351505 168995 1000 2000 ""]
+       Line[351505 168995 349000 171500 1000 2000 ""]
+       Line[353473 159725 353473 169327 1000 2000 ""]
+       Line[353473 169327 349700 173100 1000 2000 ""]
+       Line[349700 173100 349700 173600 1000 2000 ""]
+       Line[349700 173600 329000 194300 1000 2000 ""]
+       Line[349000 171500 349000 172000 1000 2000 ""]
+       Line[349000 172000 327400 193600 1000 2000 ""]
+       Line[334500 171600 325800 180300 1000 2000 ""]
+       Line[325800 180300 325800 220800 1000 2000 ""]
+       Line[337200 169100 333400 169100 1000 2000 ""]
+       Line[333400 169100 324200 178300 1000 2000 ""]
+       Line[324200 178300 324200 220800 1000 2000 ""]
+       Line[309000 160800 321800 173600 2500 2000 ""]
+       Line[321800 173600 321800 220100 2500 2000 ""]
+       Line[327400 229926 328300 230826 1000 2000 ""]
+       Line[327400 193600 327400 229926 1000 2000 ""]
+       Line[333300 223800 333300 230850 1000 2000 ""]
+       Line[329000 219500 333300 223800 1000 2000 ""]
+       Line[329000 194300 329000 219500 1000 2000 ""]
+       Line[328274 230852 328300 230826 1000 2000 ""]
+       Line[322800 230852 328274 230852 1000 2000 ""]
+       Line[322800 241250 323200 241650 1000 2000 ""]
+       Line[322800 234000 322800 241250 1000 2000 ""]
+       Line[328300 241550 328200 241650 1000 2000 ""]
+       Line[328300 233974 328300 241550 1000 2000 ""]
+       Line[338800 241050 338200 241650 1000 2000 ""]
+       Line[338800 233900 338800 241050 1000 2000 ""]
+       Line[333200 234124 333300 234024 1000 2000 ""]
+       Line[333200 241650 333200 234124 1000 2000 ""]
+       Line[338200 241650 338200 238300 1000 2000 "clearline"]
+       Line[333300 230850 333287 230863 1000 2000 "clearline"]
+       Line[337304 230850 333300 230850 1000 2000 "clearline"]
+       Line[338200 247850 338200 241650 2500 2000 "clearline"]
+       Line[328200 247950 328200 241650 2500 2000 "clearline"]
        Line[333158 217600 333114 217556 1000 2000 "clearline"]
-       Line[341700 264150 341700 257850 2500 2000 "clearline"]
-       Line[351700 264050 351700 257850 2500 2000 "clearline"]
-       Line[336700 257850 336700 255124 1000 2000 "clearline"]
-       Line[336700 255124 341700 250124 1000 2000 "clearline"]
-       Line[346700 257850 346700 255124 1000 2000 "clearline"]
-       Line[346700 255124 341700 250124 1000 2000 "clearline"]
-       Line[345704 246950 341700 246950 1000 2000 "clearline"]
-       Line[341700 246950 341687 246963 1000 2000 "clearline"]
-       Line[351700 257850 351700 254500 1000 2000 "clearline"]
-       Line[351700 254500 347200 250000 1000 2000 "clearline"]
-       Line[329000 180700 329000 234276 1000 2000 "clearline"]
-       Line[329000 234276 341700 246976 1000 2000 "clearline"]
-       Line[336700 278350 336700 293300 2500 2000 ""]
-       Line[336700 293300 334200 295800 2500 2000 ""]
-       Line[341700 278350 341700 293300 2500 2000 ""]
-       Line[341700 293300 344200 295800 2500 2000 ""]
-       Line[346700 278350 346700 293300 2500 2000 ""]
-       Line[346700 293300 344200 295800 2500 2000 ""]
-       Line[351700 278350 351700 293300 2500 2000 ""]
-       Line[351700 293300 354200 295800 2500 2000 ""]
+       Line[346900 217600 333158 217600 1000 2000 "clearline"]
+       Line[352400 223100 346900 217600 1000 2000 "clearline"]
+       Line[352400 249900 352400 223100 1000 2000 "clearline"]
+       Line[333117 215000 333114 214997 1000 2000 "clearline"]
+       Line[346600 215000 333117 215000 1000 2000 "clearline"]
+       Line[354000 222400 346600 215000 1000 2000 "clearline"]
+       Line[354000 249300 354000 222400 1000 2000 "clearline"]
+       Line[333152 212400 333114 212438 1000 2000 "clearline"]
+       Line[346300 212400 333152 212400 1000 2000 "clearline"]
+       Line[355600 221700 346300 212400 1000 2000 "clearline"]
+       Line[355600 248600 355600 221700 1000 2000 "clearline"]
+       Line[333135 209900 333114 209879 1000 2000 "clearline"]
+       Line[346100 209900 333135 209900 1000 2000 "clearline"]
+       Line[342474 198800 339174 195500 1000 2000 "clearline"]
+       Line[342474 202300 342474 198800 1000 2000 "clearline"]
+       Line[331500 195500 336026 195500 1000 2000 "clearline"]
+       Line[333114 197114 331500 195500 1000 2000 "clearline"]
+       Line[333114 199644 333114 197114 1000 2000 "clearline"]
+       Line[338579 207321 342474 203426 1000 2000 "clearline"]
+       Line[333114 207321 338579 207321 1000 2000 "clearline"]
+       Line[309865 209900 309886 209879 1000 2000 "clearline"]
+       Line[305100 209900 309865 209900 1000 2000 "clearline"]
+       Line[309824 204700 309886 204762 1000 2000 "clearline"]
+       Line[305600 204700 309824 204700 1000 2000 "clearline"]
+       Line[309848 212400 309886 212438 1000 2000 "clearline"]
+       Line[304400 212400 309848 212400 1000 2000 "clearline"]
+       Line[309886 202203 307103 202203 1000 2000 "clearline"]
+       Line[310100 199430 309886 199644 1000 2000 "clearline"]
+       Line[310100 193100 310100 199430 1000 2000 "clearline"]
+       Line[335400 202200 339052 202200 1000 2000 "clearline"]
+       Line[315900 181400 315900 205100 1000 2000 "clearline"]
+       Line[315900 205100 313600 207400 1000 2000 "clearline"]
+       Line[313600 207400 309965 207400 1000 2000 "clearline"]
+       Line[309965 207400 309886 207321 1000 2000 "clearline"]
+       Line[368900 222800 368900 193600 1000 2000 "clearline"]
+       Line[368900 193600 351100 175800 1000 2000 "clearline"]
+       Line[370600 218400 370600 191800 1000 2000 "clearline"]
+       Line[370600 191800 354600 175800 1000 2000 "clearline"]
+       Line[299031 311600 301600 311600 2500 2000 "clearline"]
+       Line[294657 307400 363300 307400 2500 2000 "clearline"]
+       Line[363300 307400 365000 309100 2500 2000 "clearline"]
+       Line[311400 324200 311400 316800 1000 2000 "clearline"]
+       Line[311400 316800 305300 310700 1000 2000 "clearline"]
+       Line[314900 317300 314900 316800 1000 2000 "clearline"]
+       Line[314900 316800 308800 310700 1000 2000 "clearline"]
+       Line[318700 314152 318700 311100 1000 2000 "clearline"]
+       Line[322600 317326 322600 307400 1000 2000 "clearline"]
+       Line[318700 317300 314900 317300 1000 2000 "clearline"]
+       Line[314900 320448 314900 336378 1000 2000 "clearline"]
+       Line[314900 336378 303678 347600 1000 2000 "clearline"]
+       Line[322600 320474 314926 320474 1000 2000 "clearline"]
+       Line[314926 320474 314900 320448 1000 2000 "clearline"]
+       Line[308800 304100 308800 240800 1000 2000 "clearline"]
+       Line[308800 240800 325800 223800 1000 2000 "clearline"]
+       Line[325800 223800 325800 220800 1000 2000 "clearline"]
+       Line[305300 304100 305300 242000 1000 2000 "clearline"]
+       Line[305300 242000 324200 223100 1000 2000 "clearline"]
+       Line[324200 223100 324200 220800 1000 2000 "clearline"]
+       Line[294657 302100 294657 249043 2500 2000 "clearline"]
+       Line[294657 249043 321800 221900 2500 2000 "clearline"]
+       Line[321800 221900 321800 220000 2500 2000 "clearline"]
+       Line[286200 300300 286200 254000 1000 2000 "clearline"]
+       Line[286200 254000 318500 221700 1000 2000 "clearline"]
+       Line[318500 178200 318500 221700 1000 2000 "clearline"]
+       Line[284931 317300 286157 317300 1000 2000 "clearline"]
        Polygon("")
        (
                [399700 124300] [380700 124300] [380700 141800] [399700 141800] 
@@ -2759,7 +2795,11 @@ Layer(1 "top")
        )
        Polygon("clearpoly")
        (
-               [322600 266300] [364800 266300] [364800 308800] [322600 308800] 
+               [329200 251900] [310600 251900] [310600 303200] [329200 303200] 
+       )
+       Polygon("clearpoly")
+       (
+               [332200 251900] [351000 251900] [351000 303200] [332200 303200] 
        )
 )
 Layer(2 "bottom")
@@ -2815,18 +2855,21 @@ Layer(2 "bottom")
        Line[341700 130100 345100 133500 1000 2000 "clearline"]
        Line[341700 119900 341700 130100 1000 2000 "clearline"]
        Line[267900 21800 277200 21800 1000 2000 "clearline"]
-       Line[361600 313800 375276 313800 2500 2000 "clearline"]
-       Line[375276 313800 385291 303785 2500 2000 "clearline"]
-       Line[308100 312800 308100 306300 1000 2000 "clearline"]
-       Line[311600 312800 311600 306300 1000 2000 "clearline"]
        Line[255100 308300 255100 301600 1000 2000 "clearline"]
-       Line[320100 176600 324800 171900 1000 2000 "clearline"]
        Line[332500 160400 332500 169600 1000 2000 "clearline"]
        Line[332500 169600 334500 171600 1000 2000 "clearline"]
        Line[312300 153000 344000 184700 1000 2000 "clearline"]
-       Line[334700 183100 318500 183100 1000 2000 "clearline"]
        Line[344000 189800 344000 184700 1000 2000 "clearline"]
-       Line[323300 195500 331500 195500 1000 2000 "clearline"]
+       Line[321600 195500 331500 195500 1000 2000 "clearline"]
+       Line[325700 171000 318500 178200 1000 2000 "clearline"]
+       Line[315900 181400 328400 181400 1000 2000 "clearline"]
+       Line[347800 169000 354600 175800 1000 2000 "clearline"]
+       Line[344300 169000 351100 175800 1000 2000 "clearline"]
+       Line[385291 303785 385291 303809 2500 2000 "clearline"]
+       Line[385291 303809 380000 309100 2500 2000 "clearline"]
+       Line[380000 309100 365000 309100 2500 2000 "clearline"]
+       Line[305300 304100 305300 310700 1000 2000 "clearline"]
+       Line[308800 304100 308800 310700 1000 2000 "clearline"]
        Polygon("clearpoly")
        (
                [327700 393900] [360600 393900] [360600 343200] [327700 343200] 
@@ -2854,13 +2897,14 @@ Layer(5 "silk")
 (
        Text[340444 373566 0 100 "Power" "clearline"]
        Text[248447 373022 0 100 "Ground" "clearline"]
-       Text[328900 336500 0 100 "Alarm +12V" "clearline"]
-       Text[325200 304500 0 100 "Alarm Ground" "clearline"]
+       Text[329200 322600 0 100 "Alarm +12V" "clearline"]
        Text[390578 42415 3 100 "` 2012" "clearline"]
        Text[398532 42393 3 100 "TeleFire  v0.2" "clearline"]
        Text[382600 42400 3 100 "Keith Packard" "clearline"]
        Text[374600 42400 3 100 "Licensed under the TAPR OHL" "clearline"]
        Text[366600 42400 3 100 "tapr.org/OHL" "clearline"]
+       Text[311200 274900 3 100 "Alarm 2" "clearline"]
+       Text[356300 275200 3 100 "Alarm 1" "clearline"]
        Polygon("clearpoly")
        (
                [378000 84000] [398200 84000] [398200 123200] [378000 123200] 
@@ -2915,11 +2959,17 @@ NetList()
                Connect("U2-1")
                Connect("U9-35")
        )
-       Net("alarm" "(unknown)")
+       Net("alarm1" "(unknown)")
        (
                Connect("R51-2")
                Connect("R52-1")
-               Connect("U9-14")
+               Connect("U9-18")
+       )
+       Net("alarm2" "(unknown)")
+       (
+               Connect("R53-2")
+               Connect("R54-1")
+               Connect("U9-17")
        )
        Net("debug_clock" "(unknown)")
        (
@@ -3009,6 +3059,7 @@ NetList()
                Connect("R41-1")
                Connect("R45-1")
                Connect("R51-1")
+               Connect("R53-1")
                Connect("R101-C")
                Connect("U1-2")
                Connect("U2-8")
@@ -3026,7 +3077,7 @@ NetList()
        Net("led_cs" "(unknown)")
        (
                Connect("U3-4")
-               Connect("U9-17")
+               Connect("U9-14")
        )
        Net("miso" "(unknown)")
        (
@@ -3103,283 +3154,287 @@ NetList()
                Connect("U9-27")
        )
        Net("unnamed_net4" "(unknown)")
-       (
-               Connect("U9-18")
-       )
-       Net("unnamed_net5" "(unknown)")
        (
                Connect("C18-2")
                Connect("R17-2")
                Connect("R18-1")
                Connect("U9-31")
        )
-       Net("unnamed_net6" "(unknown)")
+       Net("unnamed_net5" "(unknown)")
        (
                Connect("C2-2")
                Connect("R8-2")
                Connect("U9-11")
        )
-       Net("unnamed_net7" "(unknown)")
+       Net("unnamed_net6" "(unknown)")
        (
                Connect("C22-1")
                Connect("L4-1")
                Connect("U9-24")
        )
-       Net("unnamed_net8" "(unknown)")
+       Net("unnamed_net7" "(unknown)")
        (
                Connect("C25-1")
                Connect("L1-2")
                Connect("U9-23")
        )
-       Net("unnamed_net9" "(unknown)")
+       Net("unnamed_net8" "(unknown)")
        (
                Connect("C3-2")
                Connect("R3-2")
                Connect("U9-10")
        )
-       Net("unnamed_net10" "(unknown)")
+       Net("unnamed_net9" "(unknown)")
        (
                Connect("C19-2")
                Connect("U9-30")
        )
-       Net("unnamed_net11" "(unknown)")
+       Net("unnamed_net10" "(unknown)")
        (
                Connect("C25-2")
                Connect("L2-1")
                Connect("L4-2")
        )
-       Net("unnamed_net12" "(unknown)")
+       Net("unnamed_net11" "(unknown)")
        (
                Connect("C23-1")
                Connect("L2-2")
                Connect("L3-1")
        )
-       Net("unnamed_net13" "(unknown)")
+       Net("unnamed_net12" "(unknown)")
        (
                Connect("C26-1")
                Connect("L1-1")
        )
-       Net("unnamed_net14" "(unknown)")
+       Net("unnamed_net13" "(unknown)")
        (
                Connect("C24-1")
                Connect("C27-1")
                Connect("L3-2")
        )
-       Net("unnamed_net15" "(unknown)")
+       Net("unnamed_net14" "(unknown)")
        (
                Connect("C27-2")
                Connect("J8-1")
        )
-       Net("unnamed_net16" "(unknown)")
+       Net("unnamed_net15" "(unknown)")
        (
                Connect("Q1-4")
                Connect("R12-2")
        )
-       Net("unnamed_net17" "(unknown)")
+       Net("unnamed_net16" "(unknown)")
        (
                Connect("D11-3")
                Connect("Q1-5")
                Connect("Q1-6")
                Connect("U11-85")
        )
-       Net("unnamed_net18" "(unknown)")
+       Net("unnamed_net17" "(unknown)")
        (
                Connect("U1-4")
        )
-       Net("unnamed_net19" "(unknown)")
+       Net("unnamed_net18" "(unknown)")
        (
                Connect("J12-1")
                Connect("R13-2")
                Connect("R14-1")
                Connect("U11-87")
        )
-       Net("unnamed_net20" "(unknown)")
+       Net("unnamed_net19" "(unknown)")
        (
                Connect("J3-3")
                Connect("R2-1")
                Connect("R3-1")
        )
-       Net("unnamed_net21" "(unknown)")
+       Net("unnamed_net20" "(unknown)")
        (
                Connect("J3-2")
                Connect("R8-1")
        )
-       Net("unnamed_net22" "(unknown)")
+       Net("unnamed_net21" "(unknown)")
        (
                Connect("R101-2")
                Connect("S1-1")
                Connect("U2-11")
        )
-       Net("unnamed_net23" "(unknown)")
+       Net("unnamed_net22" "(unknown)")
        (
                Connect("R101-4")
                Connect("S1-4")
                Connect("U2-12")
        )
-       Net("unnamed_net24" "(unknown)")
+       Net("unnamed_net23" "(unknown)")
        (
                Connect("R101-1")
                Connect("S1-3")
                Connect("U2-13")
        )
-       Net("unnamed_net25" "(unknown)")
+       Net("unnamed_net24" "(unknown)")
        (
                Connect("R101-3")
                Connect("S1-6")
                Connect("U2-14")
        )
-       Net("unnamed_net26" "(unknown)")
+       Net("unnamed_net25" "(unknown)")
        (
                Connect("R101-6")
                Connect("S2-1")
                Connect("U2-3")
        )
-       Net("unnamed_net27" "(unknown)")
+       Net("unnamed_net26" "(unknown)")
        (
                Connect("R101-9")
                Connect("S2-4")
                Connect("U2-4")
        )
-       Net("unnamed_net28" "(unknown)")
+       Net("unnamed_net27" "(unknown)")
        (
                Connect("R101-8")
                Connect("S2-3")
                Connect("U2-5")
        )
-       Net("unnamed_net29" "(unknown)")
+       Net("unnamed_net28" "(unknown)")
        (
                Connect("R101-7")
                Connect("S2-6")
                Connect("U2-6")
        )
-       Net("unnamed_net30" "(unknown)")
+       Net("unnamed_net29" "(unknown)")
        (
                Connect("D1-2")
                Connect("U3-5")
        )
-       Net("unnamed_net31" "(unknown)")
+       Net("unnamed_net30" "(unknown)")
        (
                Connect("D2-2")
                Connect("U3-6")
        )
-       Net("unnamed_net32" "(unknown)")
+       Net("unnamed_net31" "(unknown)")
        (
                Connect("D3-2")
                Connect("U3-7")
        )
-       Net("unnamed_net33" "(unknown)")
+       Net("unnamed_net32" "(unknown)")
        (
                Connect("D4-2")
                Connect("U3-8")
        )
-       Net("unnamed_net34" "(unknown)")
+       Net("unnamed_net33" "(unknown)")
        (
                Connect("D5-2")
                Connect("U3-9")
        )
-       Net("unnamed_net35" "(unknown)")
+       Net("unnamed_net34" "(unknown)")
        (
                Connect("D6-2")
                Connect("U3-10")
        )
-       Net("unnamed_net36" "(unknown)")
+       Net("unnamed_net35" "(unknown)")
        (
                Connect("D7-2")
                Connect("U3-11")
        )
-       Net("unnamed_net37" "(unknown)")
+       Net("unnamed_net36" "(unknown)")
        (
                Connect("D8-2")
                Connect("U3-12")
        )
-       Net("unnamed_net38" "(unknown)")
+       Net("unnamed_net37" "(unknown)")
        (
                Connect("U3-14")
        )
-       Net("unnamed_net39" "(unknown)")
+       Net("unnamed_net38" "(unknown)")
        (
                Connect("R1-2")
                Connect("U3-15")
        )
-       Net("unnamed_net40" "(unknown)")
+       Net("unnamed_net39" "(unknown)")
        (
                Connect("Q1-2")
                Connect("R22-2")
        )
-       Net("unnamed_net41" "(unknown)")
+       Net("unnamed_net40" "(unknown)")
        (
                Connect("D21-3")
                Connect("Q1-7")
                Connect("Q1-8")
                Connect("U21-85")
        )
-       Net("unnamed_net42" "(unknown)")
+       Net("unnamed_net41" "(unknown)")
        (
                Connect("J22-1")
                Connect("R23-2")
                Connect("R24-1")
                Connect("U21-87")
        )
-       Net("unnamed_net43" "(unknown)")
+       Net("unnamed_net42" "(unknown)")
        (
                Connect("Q2-2")
                Connect("R42-2")
        )
-       Net("unnamed_net44" "(unknown)")
+       Net("unnamed_net43" "(unknown)")
        (
                Connect("D41-3")
                Connect("Q2-7")
                Connect("Q2-8")
                Connect("U41-85")
        )
-       Net("unnamed_net45" "(unknown)")
+       Net("unnamed_net44" "(unknown)")
        (
                Connect("J42-1")
                Connect("R43-2")
                Connect("R44-1")
                Connect("U41-87")
        )
-       Net("unnamed_net46" "(unknown)")
+       Net("unnamed_net45" "(unknown)")
        (
                Connect("Q2-4")
                Connect("R32-2")
        )
-       Net("unnamed_net47" "(unknown)")
+       Net("unnamed_net46" "(unknown)")
        (
                Connect("D31-3")
                Connect("Q2-5")
                Connect("Q2-6")
                Connect("U31-85")
        )
-       Net("unnamed_net48" "(unknown)")
+       Net("unnamed_net47" "(unknown)")
        (
                Connect("J32-1")
                Connect("R33-2")
                Connect("R34-1")
                Connect("U31-87")
        )
-       Net("unnamed_net49" "(unknown)")
+       Net("unnamed_net48" "(unknown)")
        (
                Connect("J3-4")
        )
-       Net("unnamed_net50" "(unknown)")
+       Net("unnamed_net49" "(unknown)")
        (
                Connect("U2-7")
        )
-       Net("unnamed_net51" "(unknown)")
+       Net("unnamed_net50" "(unknown)")
        (
                Connect("Q3-2")
-               Connect("Q3-4")
                Connect("R52-2")
        )
-       Net("unnamed_net52" "(unknown)")
+       Net("unnamed_net51" "(unknown)")
        (
                Connect("J52-1")
-               Connect("Q3-5")
-               Connect("Q3-6")
                Connect("Q3-7")
                Connect("Q3-8")
        )
+       Net("unnamed_net52" "(unknown)")
+       (
+               Connect("Q3-4")
+               Connect("R54-2")
+       )
+       Net("unnamed_net53" "(unknown)")
+       (
+               Connect("J54-1")
+               Connect("Q3-5")
+               Connect("Q3-6")
+       )
        Net("v_power" "(unknown)")
        (
                Connect("C5-2")
@@ -3415,6 +3470,7 @@ NetList()
                Connect("J1-1")
                Connect("J2-3")
                Connect("J51-1")
+               Connect("J53-1")
                Connect("R9-2")
        )
 )

diff --git a/telefire.sch b/telefire.sch
index 86b23585a983ffb4dbe91549040828bf37f4aecb..7f67abc68c80c2db78a10a7305e65794859d206a 100644 (file)
--- a/telefire.sch
+++ b/telefire.sch
@@ -859,7 +859,7 @@ netname=fire4
 N 50300 52900 49100 52900 4
 {
 T 49100 53000 5 10 1 1 0 0 1
-netname=alarm
+netname=led_cs
 }
 N 50300 49700 49100 49700 4
 {
@@ -2277,13 +2277,6 @@ value=NoConnection
 T 46800 56500 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-C 55200 46700 1 0 0 nc-right-1.sym
-{
-T 55300 47200 5 10 0 0 0 0 1
-value=NoConnection
-T 55300 47400 5 10 0 0 0 0 1
-device=DRC_Directive
-}
 C 45525 60650 1 0 0 nc-right-1.sym
 {
 T 45625 61150 5 10 0 0 0 0 1
@@ -2534,7 +2527,7 @@ N 45750 63150 45525 63150 4
 N 55200 47200 56000 47200 4
 {
 T 55500 47300 5 10 1 1 0 0 1
-netname=led_cs
+netname=alarm2
 }
 C 42625 60100 1 0 0 74HC165.sym
 {
@@ -2547,117 +2540,181 @@ footprint=SO16
 T 42620 60095 5 10 0 1 0 0 1
 device=IC
 }
-C 41200 46000 1 0 0 FDS9926A.sym
+C 41200 45000 1 0 0 FDS9926A.sym
 {
-T 41200 47200 5 10 1 1 0 0 1
+T 41200 46200 5 10 1 1 0 0 1
 refdes=Q3
-T 41238 46008 5 10 1 1 0 0 1
+T 41238 44408 5 10 1 1 0 0 1
 device=FDS9926A
-T 40895 45970 5 10 0 1 0 0 1
+T 40895 44970 5 10 0 1 0 0 1
 footprint=SO8
-T 41200 46000 5 10 0 0 0 0 1
+T 41200 45000 5 10 0 0 0 0 1
 slot=1
 }
-C 41200 44200 1 0 0 FDS9926A.sym
+C 41200 42600 1 0 0 FDS9926A.sym
 {
-T 41200 45400 5 10 1 1 0 0 1
+T 41200 43800 5 10 1 1 0 0 1
 refdes=Q3
-T 41238 44208 5 10 1 1 0 0 1
+T 41238 42608 5 10 1 1 0 0 1
 device=FDS9926A
-T 40895 44170 5 10 0 1 0 0 1
+T 40895 42570 5 10 0 1 0 0 1
 footprint=SO8
-T 41200 44200 5 10 0 0 0 0 1
+T 41200 42600 5 10 0 0 0 0 1
 slot=2
 }
-C 39900 45300 1 0 0 resistor.sym
+C 39900 45200 1 0 0 resistor.sym
 {
-T 40200 45700 5 10 0 0 0 0 1
+T 40200 45600 5 10 0 0 0 0 1
 device=RESISTOR
-T 39900 45600 5 10 1 1 0 0 1
+T 39900 45500 5 10 1 1 0 0 1
 refdes=R52
-T 39900 45300 5 10 0 1 0 0 1
+T 39900 45200 5 10 0 1 0 0 1
 footprint=0402
-T 39900 45300 5 10 0 1 0 0 1
+T 39900 45200 5 10 0 1 0 0 1
 vendor_part_number=P100JCT-ND
-T 40400 45600 5 10 1 1 0 0 1
+T 40400 45500 5 10 1 1 0 0 1
 value=100
-T 39900 45300 5 10 0 1 0 0 1
+T 39900 45200 5 10 0 1 0 0 1
 vendor=digikey
-T 39900 45300 5 10 0 1 0 0 1
+T 39900 45200 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 39800 44500 1 90 0 resistor.sym
+C 39800 44400 1 90 0 resistor.sym
 {
-T 39400 44800 5 10 0 0 90 0 1
+T 39400 44700 5 10 0 0 90 0 1
 device=RESISTOR
-T 39500 45200 5 10 1 1 180 0 1
+T 39500 45100 5 10 1 1 180 0 1
 refdes=R51
-T 39800 44500 5 10 0 1 0 0 1
+T 39800 44400 5 10 0 1 0 0 1
 vendor_part_number=RMCF0402FT3K30CT-ND
-T 39800 44500 5 10 0 1 0 0 1
+T 39800 44400 5 10 0 1 0 0 1
 loadstatus=smt
-T 39800 44500 5 10 0 1 0 0 1
+T 39800 44400 5 10 0 1 0 0 1
 footprint=0402
-T 39200 44700 5 10 1 1 0 0 1
+T 39200 44600 5 10 1 1 0 0 1
 value=3.3k
-T 39800 44500 5 10 0 1 0 0 1
+T 39800 44400 5 10 0 1 0 0 1
 vendor=digikey
 }
-N 41200 46300 40800 46300 4
-N 40800 46300 40800 44500 4
-N 40800 44500 41200 44500 4
-N 39900 45400 39100 45400 4
+N 41200 45300 40800 45300 4
+N 40800 42900 41200 42900 4
+N 39900 45300 39100 45300 4
 {
-T 39100 45500 5 10 1 1 0 0 1
-netname=alarm
+T 39100 45400 5 10 1 1 0 0 1
+netname=alarm1
 }
-C 39600 44200 1 0 0 gnd.sym
-C 42100 46000 1 0 0 gnd.sym
-C 42100 44200 1 0 0 gnd.sym
-N 42200 44500 42100 44500 4
-N 42200 46300 42100 46300 4
-C 43200 46200 1 0 0 TE1217861.sym
+C 39600 44100 1 0 0 gnd.sym
+C 42100 45000 1 0 0 gnd.sym
+C 42100 42600 1 0 0 gnd.sym
+N 42200 42900 42100 42900 4
+N 42200 45300 42100 45300 4
+C 43200 46000 1 0 0 TE1217861.sym
 {
-T 44105 46220 5 10 1 1 0 0 1
+T 44105 46020 5 10 1 1 0 0 1
 refdes=J52
-T 43995 46200 5 10 0 1 0 0 1
+T 43995 46000 5 10 0 1 0 0 1
 footprint=TE1217861
-T 43645 46225 5 10 1 1 0 0 1
+T 43645 46025 5 10 1 1 0 0 1
 value=0.25
-T 43200 46200 5 10 0 1 0 0 1
+T 43200 46000 5 10 0 1 0 0 1
 vendor=digikey
-T 43200 46200 5 10 0 1 0 0 1
+T 43200 46000 5 10 0 1 0 0 1
 vendor_part_number=A100452CT-ND
-T 43200 46200 5 10 0 1 0 0 1
+T 43200 46000 5 10 0 1 0 0 1
 loadstatus=throughhole
-T 43200 46200 5 10 0 1 0 0 1
+T 43200 46000 5 10 0 1 0 0 1
 device=CONNECTOR
 }
-C 43200 46900 1 0 0 TE1217861.sym
+C 43200 46800 1 0 0 TE1217861.sym
 {
-T 44105 46920 5 10 1 1 0 0 1
+T 44105 46820 5 10 1 1 0 0 1
 refdes=J51
-T 43995 46900 5 10 0 1 0 0 1
+T 43995 46800 5 10 0 1 0 0 1
 footprint=TE1217861
-T 43645 46925 5 10 1 1 0 0 1
+T 43645 46825 5 10 1 1 0 0 1
 value=0.25
-T 43200 46900 5 10 0 1 0 0 1
+T 43200 46800 5 10 0 1 0 0 1
 vendor=digikey
-T 43200 46900 5 10 0 1 0 0 1
+T 43200 46800 5 10 0 1 0 0 1
 vendor_part_number=A100452CT-ND
-T 43200 46900 5 10 0 1 0 0 1
+T 43200 46800 5 10 0 1 0 0 1
 loadstatus=throughhole
-T 43200 46900 5 10 0 1 0 0 1
+T 43200 46800 5 10 0 1 0 0 1
 device=CONNECTOR
 }
-N 42100 47500 42500 47500 4
-N 42500 45300 42500 47500 4
-N 42500 46300 43200 46300 4
-N 42100 47100 42500 47100 4
-N 42100 45300 42500 45300 4
-N 42100 45700 42500 45700 4
-N 43200 47000 43200 47500 4
+N 42100 46500 42500 46500 4
+N 42500 46100 42500 46500 4
+N 42100 46100 43200 46100 4
+N 42100 43700 42500 43700 4
+N 42100 44100 43200 44100 4
+N 43000 45000 43000 47400 4
 {
-T 42800 47600 5 10 1 1 0 0 1
+T 42600 47500 5 10 1 1 0 0 1
 netname=v_switched
 }
+N 55200 46800 56000 46800 4
+{
+T 55500 46900 5 10 1 1 0 0 1
+netname=alarm1
+}
+C 39900 42800 1 0 0 resistor.sym
+{
+T 40200 43200 5 10 0 0 0 0 1
+device=RESISTOR
+T 39900 43100 5 10 1 1 0 0 1
+refdes=R54
+T 39900 42800 5 10 0 1 0 0 1
+footprint=0402
+T 39900 42800 5 10 0 1 0 0 1
+vendor_part_number=P100JCT-ND
+T 40400 43100 5 10 1 1 0 0 1
+value=100
+T 39900 42800 5 10 0 1 0 0 1
+vendor=digikey
+T 39900 42800 5 10 0 1 0 0 1
+loadstatus=smt
+}
+C 39800 42000 1 90 0 resistor.sym
+{
+T 39400 42300 5 10 0 0 90 0 1
+device=RESISTOR
+T 39500 42700 5 10 1 1 180 0 1
+refdes=R53
+T 39800 42000 5 10 0 1 0 0 1
+vendor_part_number=RMCF0402FT3K30CT-ND
+T 39800 42000 5 10 0 1 0 0 1
+loadstatus=smt
+T 39800 42000 5 10 0 1 0 0 1
+footprint=0402
+T 39200 42200 5 10 1 1 0 0 1
+value=3.3k
+T 39800 42000 5 10 0 1 0 0 1
+vendor=digikey
+}
+N 39900 42900 39100 42900 4
+{
+T 39100 43000 5 10 1 1 0 0 1
+netname=alarm2
+}
+C 39600 41700 1 0 0 gnd.sym
+N 42500 43700 42500 44100 4
+C 43200 44000 1 0 0 TE1217861.sym
+{
+T 44105 44020 5 10 1 1 0 0 1
+refdes=J54
+T 43995 44000 5 10 0 1 0 0 1
+footprint=TE1217861
+T 43645 44025 5 10 1 1 0 0 1
+value=0.25
+}
+C 43200 44900 1 0 0 TE1217861.sym
+{
+T 44105 44920 5 10 1 1 0 0 1
+refdes=J53
+T 43995 44900 5 10 0 1 0 0 1
+footprint=TE1217861
+T 43645 44925 5 10 1 1 0 0 1
+value=0.25
+}
+N 43000 45000 43200 45000 4
+N 43000 46900 43200 46900 4