From: Bdale Garbee Date: Sat, 5 May 2018 05:04:47 +0000 (-0700) Subject: swap arm and armed at SOC to eliminate interrupt conflict with spare4 X-Git-Tag: fab-v2.0~9 X-Git-Url: https://git.gag.com/?p=hw%2Ftelelco;a=commitdiff_plain;h=89cddda776c64d0419132d25c332595f686b2529 swap arm and armed at SOC to eliminate interrupt conflict with spare4 --- diff --git a/telelco.pcb b/telelco.pcb index e31a760..8ccd049 100644 --- a/telelco.pcb +++ b/telelco.pcb @@ -881,9 +881,8 @@ Via[3282.00mil 1323.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[3896.00mil 2466.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[3253.00mil 1345.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[3694.00mil 2754.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] -Via[3223.00mil 1369.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[3224.00mil 2553.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] -Via[3025.00mil 1389.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] +Via[3025.00mil 1369.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[2747.00mil 1411.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[2740.00mil 2515.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[3299.00mil 2707.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] @@ -904,6 +903,7 @@ Via[1188.00mil 1620.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[1254.00mil 1662.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[1243.00mil 1784.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Via[2195.00mil 1346.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] +Via[3223.00mil 1400.00mil 30.00mil 20.00mil 0.0000 15.00mil "" ""] Element["hidename" "hole-M3" "H1" "unknown" 125.00mil 125.00mil -37.00mil -33.00mil 0 100 ""] ( @@ -1963,7 +1963,7 @@ Element["hidename" "0402" "R101" "22" 1861.00mil 24.6700mm 133.46mil 29.24mil 2 ) -Element["hidename,onsolder" "LCD-S101D14TR" "U21" "digit" 2400.00mil 1375.00mil 627.00mil 820.00mil 2 100 "onsolder"] +Element["hidename,selected,onsolder" "LCD-S101D14TR" "U21" "digit" 2400.00mil 1375.00mil 627.00mil 820.00mil 2 100 "selected,onsolder"] ( Pin[494.50mil 996.00mil 55.00mil 20.00mil 65.00mil 30.00mil "COM" "1" "square"] Pin[394.50mil 996.00mil 55.00mil 20.00mil 65.00mil 30.00mil "COM" "2" ""] @@ -2677,12 +2677,9 @@ Layer(1 "top" "copper") Line[3648.00mil 2799.00mil 3648.00mil 2894.00mil 10.00mil 20.00mil "clearline"] Line[3648.00mil 2894.00mil 3698.00mil 2944.00mil 10.00mil 20.00mil "clearline"] Line[3698.00mil 2944.00mil 3698.00mil 3060.00mil 10.00mil 20.00mil "clearline"] - Line[58.1314mm 34.4033mm 81.4949mm 34.4033mm 10.00mil 20.00mil "clearline"] - Line[81.4949mm 34.4033mm 3220.00mil 1366.00mil 10.00mil 20.00mil "clearline"] Line[3224.00mil 2553.00mil 88.5058mm 2553.00mil 10.00mil 20.00mil "clearline"] Line[88.5058mm 2553.00mil 3485.00mil 64.8594mm 10.00mil 20.00mil "clearline"] - Line[58.1314mm 34.9034mm 76.4578mm 34.9034mm 10.00mil 20.00mil "clearline"] - Line[76.4578mm 34.9034mm 3024.00mil 1388.00mil 10.00mil 20.00mil "clearline"] + Line[58.1314mm 34.9034mm 2962.00mil 1374.00mil 10.00mil 20.00mil "clearline"] Line[58.1314mm 35.4033mm 69.2361mm 35.4033mm 10.00mil 20.00mil "clearline"] Line[69.2361mm 35.4033mm 2745.00mil 1413.00mil 10.00mil 20.00mil "clearline"] Line[2740.00mil 2515.00mil 2740.00mil 64.8594mm 10.00mil 20.00mil "clearline"] @@ -2797,6 +2794,11 @@ Layer(1 "top" "copper") Line[35.0335mm 41.9031mm 1244.00mil 1785.00mil 10.00mil 20.00mil "clearline"] Line[52.8816mm 29.1535mm 52.8816mm 31.3170mm 10.00mil 20.00mil "clearline"] Line[52.8816mm 31.3170mm 2195.00mil 1346.00mil 10.00mil 20.00mil "clearline"] + Line[58.1314mm 34.4033mm 75.2719mm 34.4033mm 10.00mil 20.00mil "clearline"] + Line[2963.00mil 34.4033mm 76.4657mm 34.4033mm 10.00mil 20.00mil "clearline"] + Line[76.4657mm 34.4033mm 3025.00mil 1369.00mil 10.00mil 20.00mil "clearline"] + Line[3223.00mil 1400.00mil 2988.00mil 1400.00mil 10.00mil 20.00mil "clearline"] + Line[2988.00mil 1400.00mil 2962.00mil 1374.00mil 10.00mil 20.00mil "clearline"] ) Layer(2 "ground" "copper") ( @@ -2919,9 +2921,9 @@ Layer(4 "bottom" "copper") Line[3253.00mil 1345.00mil 3253.00mil 1884.00mil 10.00mil 20.00mil "clearline"] Line[3253.00mil 1884.00mil 3694.00mil 2325.00mil 10.00mil 20.00mil "clearline"] Line[3694.00mil 2325.00mil 3694.00mil 2755.00mil 10.00mil 20.00mil "clearline"] - Line[3223.00mil 1369.00mil 3223.00mil 2550.00mil 10.00mil 20.00mil "clearline"] + Line[3223.00mil 1400.00mil 3223.00mil 2550.00mil 10.00mil 20.00mil "clearline"] Line[3223.00mil 2550.00mil 3224.00mil 2551.00mil 10.00mil 20.00mil "clearline"] - Line[3025.00mil 1389.00mil 3025.00mil 2915.00mil 10.00mil 20.00mil "clearline"] + Line[3025.00mil 1369.00mil 3025.00mil 2915.00mil 10.00mil 20.00mil "clearline"] Line[3025.00mil 2915.00mil 3100.00mil 2990.00mil 10.00mil 20.00mil "clearline"] Line[2747.00mil 1411.00mil 2747.00mil 2508.00mil 10.00mil 20.00mil "clearline"] Line[2747.00mil 2508.00mil 2740.00mil 2515.00mil 10.00mil 20.00mil "clearline"] @@ -3081,12 +3083,12 @@ NetList() Net("arm" "(unknown)") ( Connect("J2-3") - Connect("U7-42") + Connect("U7-43") ) Net("armed" "(unknown)") ( Connect("R54-2") - Connect("U7-43") + Connect("U7-42") ) Net("com_0" "(unknown)") ( diff --git a/telelco.sch b/telelco.sch index 74d7da7..111f5d4 100644 --- a/telelco.sch +++ b/telelco.sch @@ -632,9 +632,9 @@ footprint=0402 T 43200 43650 5 10 1 1 90 0 1 value=2.2k } -N 57600 53900 58900 53900 4 +N 57600 53500 58900 53500 4 { -T 58600 54000 5 10 1 1 0 0 1 +T 58600 53600 5 10 1 1 0 0 1 netname=arm } N 46800 63900 48100 63900 4 @@ -642,17 +642,17 @@ N 46800 63900 48100 63900 4 T 46800 64000 5 10 1 1 0 0 1 netname=fire } -C 61400 53600 1 180 1 led.sym +C 61400 54000 1 180 1 led.sym { -T 62100 53600 5 10 1 1 180 6 1 +T 62100 54000 5 10 1 1 180 6 1 refdes=D3 -T 61300 53000 5 10 0 0 180 6 1 +T 61300 53400 5 10 0 0 180 6 1 device=LED -T 61400 53600 5 10 0 0 0 0 1 +T 61400 54000 5 10 0 0 0 0 1 footprint=100mil-led -T 49600 45500 5 10 0 0 0 0 1 +T 49600 45900 5 10 0 0 0 0 1 loadstatus=throughhole -T 61000 53600 5 10 1 1 0 0 1 +T 61000 54000 5 10 1 1 0 0 1 value=red } C 61400 56400 1 180 1 led.sym @@ -707,17 +707,17 @@ value=green T 49600 47900 5 10 0 0 0 0 1 loadstatus=throughhole } -C 60500 53600 1 180 0 resistor.sym +C 60500 54000 1 180 0 resistor.sym { -T 60200 53200 5 10 0 0 180 0 1 +T 60200 53600 5 10 0 0 180 0 1 device=RESISTOR -T 60100 53600 5 10 1 1 0 0 1 +T 60100 54000 5 10 1 1 0 0 1 refdes=R54 -T 59700 53600 5 10 1 1 0 0 1 +T 59700 54000 5 10 1 1 0 0 1 value=270 -T 60500 53600 5 10 0 0 180 0 1 +T 60500 54000 5 10 0 0 180 0 1 footprint=0402 -T 60500 53600 5 10 0 0 180 0 1 +T 60500 54000 5 10 0 0 180 0 1 loadstatus=smt } C 60500 56400 1 180 0 resistor.sym @@ -772,9 +772,9 @@ footprint=0402 T 60500 57600 5 10 0 0 180 0 1 loadstatus=smt } -N 57600 53500 59600 53500 4 +N 57600 53900 59600 53900 4 { -T 58900 53600 5 10 1 1 0 6 1 +T 58900 54000 5 10 1 1 0 6 1 netname=armed } N 57600 56300 59600 56300 4 @@ -797,7 +797,7 @@ N 57600 57500 59600 57500 4 T 58900 57600 5 10 1 1 0 6 1 netname=continuity_8 } -N 61800 53500 62000 53500 4 +N 61800 53900 62000 53900 4 N 61800 56300 62000 56300 4 N 61800 56700 62000 56700 4 N 61800 57100 62000 57100 4 @@ -1457,7 +1457,7 @@ N 57600 67900 59600 67900 4 T 58100 68000 5 10 1 1 0 0 1 netname=rf_marginal } -N 61400 53500 60500 53500 4 +N 61400 53900 60500 53900 4 N 61400 56300 60500 56300 4 N 61400 56700 60500 56700 4 N 61400 57100 60500 57100 4 @@ -2771,7 +2771,7 @@ value=NoConnection T 57700 62500 5 10 0 0 0 0 1 device=DRC_Directive } -C 61900 53200 1 0 0 gnd.sym +C 61900 53600 1 0 0 gnd.sym N 58900 52300 57600 52300 4 { T 58900 52400 5 10 1 1 0 6 1 @@ -2787,7 +2787,7 @@ N 58900 53100 57600 53100 4 T 58900 53200 5 10 1 1 0 6 1 netname=select } -N 62000 53500 62000 57500 4 +N 62000 53900 62000 57500 4 N 48100 56700 46800 56700 4 { T 46800 56800 5 10 1 1 0 0 1