notch moved, analog inputs to ARM for battery voltages defined

diff --git a/megametrum.pcb b/megametrum.pcb
index 882ad4d39ba2720fb1e1e7ec552472f35c27f77e..516ec993d2092d680d65397058b2c749edd2f76a 100644 (file)
--- a/megametrum.pcb
+++ b/megametrum.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["TeleMetrum" 325000 175000]
 
 Grid[100.0 0 0 0]
-Cursor[2400 42000 0.000000]
+Cursor[4400 1800 0.000000]
 PolyArea[200000000.000000]
 Thermal[0.500000]
 DRC[600 1000 600 500 1500 700]
@@ -977,7 +977,7 @@ Element["" "AN3111" "U3" "MMA6556" 41500 17700 0 0 3 100 ""]
 Element["onsolder" "282834-9" "J1" "Pyro_A" 18394 62395 0 0 0 100 "auto"]
 (
        Pin[5906 -12795 7087 1260 8346 4528 "9" "9" "edge2,thermal(1X)"]
-       Pin[15906 -12795 7087 1260 8346 4528 "8" "8" "edge2,thermal(2S)"]
+       Pin[15906 -12795 7087 1260 8346 4528 "8" "8" "edge2,thermal(2X)"]
        Pin[25906 -12795 7087 1260 8346 4528 "7" "7" "edge2"]
        Pin[35906 -12795 7087 1260 8346 4528 "6" "6" "edge2"]
        Pin[45906 -12795 7087 1260 8346 4528 "5" "5" "edge2,thermal(2S)"]
@@ -1103,7 +1103,7 @@ Element["" "SO8" "Q1" "FDS9926A" 74300 35500 -93300 9000 2 100 ""]
 
        )
 
-Element["" "lqfp100" "U7" "STM32L151" 183000 62400 3300 -6600 2 100 ""]
+Element["" "lqfp100" "U7" "STM32L151" 183000 62500 3300 -6600 2 100 ""]
 (
        Pad[23621 28739 23621 32282 1181 787 1811 "PA2/USART2_TX/ADC_IN2/TIM2_CH3/TIM9_CH1" "25" "square,edge2"]
        Pad[23621 -32283 23621 -28740 1181 787 1811 "PB12/SPI2_NSS/I2C2_SMBA/USART3_CKI/ADC_IN18/TIM10_CH1" "51" "square"]
@@ -1240,14 +1240,14 @@ Element["" "1206" "C40" "100uF" 11300 45700 -4450 -7950 3 100 ""]
 
        )
 
-Element["" "0402" "R28" "27k" 110974 83900 14402 2750 2 100 ""]
+Element["" "0402" "R28" "27k" 123526 49700 -2354 -7450 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" "R27" "100k" 109774 78700 -21850 3150 2 100 ""]
+Element["" "0402" "R27" "100k" 114426 49800 -4902 -7350 0 100 ""]
 (
        Pad[1574 -393 1574 393 1968 2000 2568 "1" "1" "square"]
        Pad[-1574 -393 -1574 393 1968 2000 2568 "2" "2" "square"]
@@ -1408,7 +1408,7 @@ Element["" "0402" "R7" "100" 92326 28000 3250 -2050 2 100 ""]
 
        )
 
-Element["" "0402" "C4" "4.7uF" 39926 115800 -1709 650 0 100 ""]
+Element["" "0402" "C4" "4.7uF" 43426 133200 -1709 650 0 100 ""]
 (
        Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
        Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
@@ -1443,7 +1443,7 @@ Element["" "0402" "R16" "100k" 101900 60000 -3950 -7350 0 100 ""]
 
        )
 
-Element["" "0402" "C38" "0.01uF" 36026 107700 -3976 1050 0 100 ""]
+Element["" "0402" "C38" "0.01uF" 32426 132600 -3976 1050 0 100 ""]
 (
        Pad[-1574 -393 -1574 393 1968 2000 2568 "1" "1" "square"]
        Pad[1574 -393 1574 393 1968 2000 2568 "2" "2" "square"]
@@ -1644,7 +1644,7 @@ Element["onsolder" "2-338068-0" "J20" "misc" 187500 107500 0 0 2 100 "auto"]
        Pin[-10000 10000 6299 1200 7299 3150 "3" "3" "edge2"]
        Pin[-15000 0 6299 1200 7299 3150 "4" "4" "edge2"]
        Pin[-20000 10000 6299 1200 7299 3150 "5" "5" "edge2"]
-       Pin[-25000 0 6299 1200 7299 3150 "6" "6" "edge2,thermal(2X)"]
+       Pin[-25000 0 6299 1200 7299 3150 "6" "6" "edge2"]
        Pin[-30000 10000 6299 1200 7299 3150 "7" "7" "edge2,thermal(1X)"]
        Pin[-35000 0 6299 1200 7299 3150 "8" "8" "edge2"]
        Pin[-40000 10000 6299 1200 7299 3150 "9" "9" "edge2"]
@@ -2222,68 +2222,66 @@ Rat[169105 165307 0 143200 152307 0  ""]
 Rat[143200 152307 0 146400 140907 0  ""]
 Rat[143200 152307 0 112948 164007 0  ""]
 Rat[146400 140907 0 162500 107500 1  ""]
-Rat[198747 94682 0 113662 103923 3  "via"]
-Rat[215282 82084 0 113662 103923 3  "via"]
-Rat[215282 38778 0 113662 103923 3  "via"]
-Rat[38100 94200 0 1000 82000 3  "via"]
-Rat[206954 14812 0 113662 103923 3  "via"]
-Rat[317600 38807 0 113662 103923 3  "via"]
-Rat[159378 30117 0 113662 103923 3  "via"]
-Rat[150717 86021 0 113662 103923 3  "via"]
-Rat[238645 4813 0 113662 103923 3  "via"]
-Rat[238645 9813 0 113662 103923 3  "via"]
-Rat[169220 94682 0 113662 103923 3  "via"]
+Rat[162500 107500 1 1000 82000 3  "via"]
+Rat[215282 82184 0 111000 3600 3  "via"]
+Rat[198747 94782 0 111000 3600 3  "via"]
+Rat[215282 38878 0 111000 3600 3  "via"]
+Rat[179063 94782 0 111000 3600 3  "via"]
+Rat[238645 9813 0 111000 3600 3  "via"]
+Rat[317600 38807 0 111000 3600 3  "via"]
+Rat[159378 30217 0 111000 3600 3  "via"]
+Rat[150717 86121 0 111000 3600 3  "via"]
+Rat[169220 94782 0 111000 3600 3  "via"]
+Rat[238645 4813 0 111000 3600 3  "via"]
 Rat[79415 20681 0 1000 1000 3  "via"]
-Rat[179063 94682 0 113662 103923 3  "via"]
+Rat[206954 14812 0 111000 3600 3  "via"]
+Rat[38100 94200 0 1000 82000 3  "via"]
 Rat[243800 143707 0 287100 141207 0  ""]
 Rat[38100 94200 0 50952 147812 0  ""]
 Rat[50952 147812 0 42685 152143 0  ""]
 Rat[42685 152143 0 42685 156079 0  ""]
 Rat[42685 156079 0 15779 162597 0  ""]
 Rat[15779 162597 0 11802 150747 0  ""]
-Rat[183000 30117 0 135500 72385 1  ""]
-Rat[177500 117500 1 150717 74210 0  ""]
+Rat[183000 30217 0 135500 72385 1  ""]
+Rat[177500 117500 1 150717 74310 0  ""]
 Rat[177500 117500 1 252500 140607 0  ""]
 Rat[53507 19669 0 68786 20681 0  ""]
-Rat[68786 20681 0 215282 50589 0  ""]
-Rat[182500 7500 1 204653 30117 0  ""]
-Rat[204653 30117 0 238645 14812 0  ""]
+Rat[68786 20681 0 215282 50689 0  ""]
+Rat[182500 7500 1 204653 30217 0  ""]
+Rat[204653 30217 0 238645 14812 0  ""]
 Rat[238645 14812 0 285090 102366 0  ""]
-Rat[53507 11795 0 150717 56494 0  ""]
-Rat[162500 7500 1 150717 48620 0  ""]
-Rat[167500 17500 1 150717 50589 0  ""]
-Rat[206954 4813 0 150717 54526 0  ""]
+Rat[53507 11795 0 150717 56594 0  ""]
+Rat[162500 7500 1 150717 48720 0  ""]
+Rat[167500 17500 1 150717 50689 0  ""]
+Rat[206954 4813 0 150717 54626 0  ""]
 Rat[79415 5918 0 68786 5918 0  ""]
-Rat[79415 5918 0 150717 58463 0  ""]
-Rat[289066 94453 0 150717 52557 0  ""]
-Rat[99052 38000 0 186936 94682 0  ""]
-Rat[99052 28000 0 188905 94682 0  ""]
-Rat[64200 60000 0 190873 94682 0  ""]
-Rat[64126 68800 0 192842 94682 0  ""]
-Rat[99100 91707 0 215282 72242 0  ""]
-Rat[99026 81607 0 215282 70273 0  ""]
+Rat[79415 5918 0 150717 58563 0  ""]
+Rat[289066 94453 0 150717 52657 0  ""]
+Rat[99052 38000 0 186936 94782 0  ""]
+Rat[99052 28000 0 188905 94782 0  ""]
+Rat[64200 60000 0 190873 94782 0  ""]
+Rat[64126 68800 0 192842 94782 0  ""]
+Rat[99100 91707 0 215282 72342 0  ""]
+Rat[99026 81607 0 215282 70373 0  ""]
 Rat[34200 84400 0 1000 1000 2  "via"]
-Rat[112548 83507 0 1000 1000 2  "via"]
 Rat[41500 17700 0 1000 1000 2  "via"]
 Rat[79415 15760 0 1000 1000 2  "via"]
 Rat[79415 10839 0 1000 1000 2  "via"]
 Rat[206954 19812 0 1000 1000 2  "via"]
-Rat[177094 94682 0 1000 1000 2  "via"]
-Rat[194810 94682 0 1000 1000 2  "via"]
+Rat[177094 94782 0 1000 1000 2  "via"]
+Rat[194810 94782 0 1000 1000 2  "via"]
 Rat[314452 38807 0 1000 1000 2  "via"]
-Rat[196779 94682 0 1000 1000 2  "via"]
-Rat[215282 84053 0 1000 1000 2  "via"]
-Rat[215282 40746 0 1000 1000 2  "via"]
-Rat[161346 30117 0 1000 1000 2  "via"]
-Rat[150717 84053 0 1000 1000 2  "via"]
+Rat[196779 94782 0 1000 1000 2  "via"]
+Rat[215282 84153 0 1000 1000 2  "via"]
+Rat[215282 40846 0 1000 1000 2  "via"]
+Rat[161346 30217 0 1000 1000 2  "via"]
+Rat[150717 84153 0 1000 1000 2  "via"]
 Rat[112552 32007 0 1000 1000 2  "via"]
 Rat[121952 34007 0 1000 1000 2  "via"]
-Rat[37600 107307 0 1000 1000 2  "via"]
 Rat[205854 111205 0 1000 1000 2  "via"]
 Rat[235454 114501 0 1000 1000 2  "via"]
 Rat[211819 108253 0 1000 1000 2  "via"]
 Rat[229928 117700 0 1000 1000 2  "via"]
-Rat[38352 115407 0 1000 1000 2  "via"]
 Rat[187500 117500 1 185800 132907 0  ""]
 Rat[185800 132907 0 195504 138507 0  ""]
 Rat[195504 138507 0 196852 155707 0  ""]
@@ -2296,12 +2294,14 @@ Rat[143252 140907 0 161453 148207 0  ""]
 Rat[161453 148207 0 163453 158707 0  ""]
 Rat[163453 158707 0 160353 161807 0  ""]
 Rat[255648 140607 0 283952 141207 0  ""]
-Rat[38352 115407 0 25620 144802 0  ""]
+Rat[12500 112500 1 34000 132207 0  ""]
+Rat[34000 132207 0 41852 132807 0  ""]
+Rat[34000 132207 0 25620 144802 0  ""]
 Rat[25620 144802 0 11802 152716 0  ""]
 Rat[11802 152716 0 11802 156652 0  ""]
 Rat[11802 156652 0 25620 162597 0  ""]
-Rat[25620 162597 0 53314 156079 0  ""]
-Rat[53314 156079 0 53314 152143 0  ""]
+Rat[41852 132807 0 53314 152143 0  ""]
+Rat[53314 152143 0 53314 156079 0  ""]
 Rat[53314 152143 0 68952 141707 0  ""]
 Rat[68952 141707 0 81952 140407 0  ""]
 Rat[81952 140407 0 94807 147500 0  ""]
@@ -2314,74 +2314,75 @@ Rat[255149 16652 0 255149 13503 0  ""]
 Rat[256406 13500 0 259952 6810 0  ""]
 Rat[255500 46300 0 247904 55707 0  ""]
 Rat[236033 56106 0 236033 44493 0  ""]
-Rat[171189 94682 0 11802 158620 0  ""]
-Rat[132500 107500 1 150717 66336 0  ""]
-Rat[147500 117500 1 150717 38778 0  ""]
-Rat[142500 107500 1 150717 40746 0  ""]
-Rat[137500 117500 1 150717 64368 0  ""]
-Rat[152500 107500 1 165283 30117 0  ""]
-Rat[141707 16974 0 177094 30117 0  ""]
-Rat[145707 17000 0 179063 30117 0  ""]
+Rat[171189 94782 0 11802 158620 0  ""]
+Rat[132500 107500 1 150717 66436 0  ""]
+Rat[147500 117500 1 150717 38878 0  ""]
+Rat[142500 107500 1 150717 40846 0  ""]
+Rat[137500 117500 1 150717 64468 0  ""]
+Rat[152500 107500 1 165283 30217 0  ""]
+Rat[141707 16974 0 177094 30217 0  ""]
+Rat[145707 17000 0 179063 30217 0  ""]
 Rat[47405 29708 0 68786 10839 0  ""]
-Rat[68786 10839 0 215282 46652 0  ""]
+Rat[68786 10839 0 215282 46752 0  ""]
 Rat[172500 7500 1 206954 9813 0  ""]
-Rat[206954 9813 0 200716 30117 0  ""]
-Rat[200716 30117 0 289066 98390 0  ""]
+Rat[206954 9813 0 200716 30217 0  ""]
+Rat[200716 30217 0 289066 98390 0  ""]
 Rat[53507 15732 0 68786 15760 0  ""]
-Rat[68786 15760 0 215282 48620 0  ""]
-Rat[177500 17500 1 202684 30117 0  ""]
-Rat[202684 30117 0 238645 19812 0  ""]
+Rat[68786 15760 0 215282 48720 0  ""]
+Rat[177500 17500 1 202684 30217 0  ""]
+Rat[202684 30217 0 238645 19812 0  ""]
 Rat[238645 19812 0 283121 102366 0  ""]
 Rat[166601 158707 0 182500 107500 1  ""]
-Rat[182500 107500 1 184968 94682 0  ""]
-Rat[184968 94682 0 273280 102366 0  ""]
+Rat[182500 107500 1 184968 94782 0  ""]
+Rat[184968 94782 0 273280 102366 0  ""]
 Rat[273280 102366 0 296250 41848 0  ""]
-Rat[184968 94682 0 28100 33100 0  ""]
-Rat[167500 117500 1 171189 30117 0  ""]
-Rat[150717 44683 0 291447 46651 0  ""]
-Rat[150717 76179 0 42685 150174 0  ""]
+Rat[184968 94782 0 28100 33100 0  ""]
+Rat[167500 117500 1 171189 30217 0  ""]
+Rat[150717 44783 0 291447 46651 0  ""]
+Rat[150717 76279 0 42685 150174 0  ""]
 Rat[42685 150174 0 29597 150747 0  ""]
-Rat[122500 107500 1 215282 44683 0  ""]
-Rat[150717 78147 0 45047 147812 0  ""]
+Rat[122500 107500 1 215282 44783 0  ""]
+Rat[150717 78247 0 45047 147812 0  ""]
 Rat[45047 147812 0 29597 148779 0  ""]
-Rat[127500 117500 1 215282 42715 0  ""]
-Rat[54313 39987 0 202684 94682 0  ""]
-Rat[56400 32848 0 204653 94682 0  ""]
-Rat[108652 60000 0 206621 94682 0  ""]
-Rat[108726 65000 0 215282 86021 0  ""]
-Rat[54626 96707 0 215282 80116 0  ""]
-Rat[54552 86707 0 215282 78147 0  ""]
-Rat[172500 107500 1 173157 30117 0  ""]
-Rat[150717 42715 0 285148 46651 0  ""]
-Rat[34452 107307 0 30300 94200 0  ""]
+Rat[127500 117500 1 215282 42815 0  ""]
+Rat[54313 39987 0 202684 94782 0  ""]
+Rat[56400 32848 0 204653 94782 0  ""]
+Rat[108652 60000 0 206621 94782 0  ""]
+Rat[108726 65000 0 215282 86121 0  ""]
+Rat[54626 96707 0 215282 80216 0  ""]
+Rat[54552 86707 0 215282 78247 0  ""]
+Rat[172500 107500 1 173157 30217 0  ""]
+Rat[150717 42815 0 285148 46651 0  ""]
+Rat[30852 132207 0 30300 94200 0  ""]
 Rat[125100 34007 0 29492 19669 0  ""]
 Rat[115700 32007 0 29492 11795 0  ""]
 Rat[205854 114353 0 211819 117700 0  ""]
-Rat[205854 114353 0 183000 94682 0  ""]
+Rat[205854 114353 0 183000 94782 0  ""]
 Rat[235454 111353 0 229928 108253 0  ""]
-Rat[229928 108253 0 181031 94682 0  ""]
-Rat[182652 132907 0 215282 64368 0  ""]
+Rat[229928 108253 0 181031 94782 0  ""]
+Rat[182652 132907 0 215282 64468 0  ""]
 Rat[85100 140407 0 11802 154683 0  ""]
 Rat[72100 141707 0 29597 156652 0  ""]
 Rat[93048 164207 0 53314 150174 0  ""]
 Rat[96196 164207 0 50952 158441 0  ""]
 Rat[100200 164407 0 53314 154110 0  ""]
-Rat[116558 19871 0 169220 30117 0  ""]
-Rat[114000 19871 0 167252 30117 0  ""]
+Rat[116558 19871 0 169220 30217 0  ""]
+Rat[114000 19871 0 167252 30217 0  ""]
 Rat[95007 140348 0 94807 144352 0  ""]
+Rat[95007 140348 0 215282 76279 0  ""]
 Rat[24200 75400 1 272550 5550 0  ""]
 Rat[100307 137600 0 95007 137200 0  ""]
 Rat[95007 137200 0 38100 84400 0  ""]
 Rat[38100 84400 0 30300 84400 0  ""]
 Rat[30300 84400 0 34200 75400 1  ""]
 Rat[44300 49600 1 152500 7500 1  ""]
-Rat[111348 78307 0 109400 83507 0  ""]
-Rat[108200 78307 0 29000 44000 3  "via"]
-Rat[41500 115407 0 25207 101548 0  ""]
-Rat[41500 115407 0 119117 19871 0  ""]
+Rat[121852 49800 0 215282 74310 0  ""]
+Rat[104300 49600 1 112852 49407 0  ""]
+Rat[45000 132807 0 25207 101548 0  ""]
+Rat[25207 101548 0 119117 19871 0  ""]
 Rat[157205 161807 0 158305 148207 0  ""]
 Rat[157205 161807 0 172253 165307 0  ""]
-Rat[158305 148207 0 200716 94682 0  ""]
+Rat[158305 148207 0 200716 94782 0  ""]
 Layer(1 "top")
 (
        Line[94300 49600 94300 58900 4000 2000 ""]
@@ -2683,12 +2684,17 @@ Layer(1 "top")
        Line[138800 5500 141100 5500 1000 2000 "clearline"]
        Line[102200 28000 105644 28000 1000 2000 "clearline"]
        Line[108882 24762 105644 28000 1000 2000 "clearline"]
+       Line[104500 49800 104300 49600 1000 2000 "clearline"]
+       Line[125100 49700 132500 49700 1000 2000 "clearline"]
+       Line[132500 49700 135500 52700 1000 2000 "clearline"]
+       Line[116000 49800 121852 49800 1000 2000 "clearline"]
+       Line[121852 49800 121952 49700 1000 2000 "clearline"]
 )
 Layer(2 "GND plane")
 (
        Polygon("clearpoly,lock")
        (
-               [1000 1000] [113000 1000] [113000 3600] [165000 3600] [165000 1000] 
+               [1000 1000] [88000 1000] [88000 3600] [140000 3600] [140000 1000] 
                [324000 1000] [324000 124000] [1000 124000] 
        )
 )
@@ -2704,7 +2710,7 @@ Layer(3 "power plane")
        )
        Polygon("clearpoly,lock")
        (
-               [1000 1000] [113000 1000] [113000 3600] [165000 3600] [165000 1000] 
+               [1000 1000] [88000 1000] [88000 3600] [140000 3600] [140000 1000] 
                [324000 1000] [324000 43000] [1000 43000] 
        )
        Polygon("clearpoly,lock")
@@ -2713,8 +2719,8 @@ Layer(3 "power plane")
        )
        Polygon("clearpoly,lock")
        (
-               [111000 1000] [113000 1000] [113000 3600] [165000 3600] [165000 1000] 
-               [324000 1000] [324000 124000] [111000 124000] 
+               [111000 3600] [140000 3600] [140000 1000] [324000 1000] [324000 124000] 
+               [111000 124000] 
        )
 )
 Layer(4 "bottom")
@@ -2722,7 +2728,7 @@ Layer(4 "bottom")
        Line[21300 98100 24800 84200 1000 2000 "clearline"]
        Polygon("clearpoly,lock")
        (
-               [1000 1000] [113000 1000] [113000 3600] [165000 3600] [165000 1000] 
+               [1000 1000] [88000 1000] [88000 3600] [140000 3600] [140000 1000] 
                [324000 1000] [324000 124000] [1000 124000] 
        )
 )
@@ -2731,7 +2737,6 @@ Layer(5 "silk")
 )
 Layer(6 "silk")
 (
-       Line[600 125000 299200 125000 1000 2000 "clearline"]
 )
 NetList()
 (
@@ -3452,6 +3457,7 @@ NetList()
        (
                Connect("R25-1")
                Connect("R26-2")
+               Connect("U7-31")
        )
        Net("v_charge" "(unknown)")
        (
@@ -3475,6 +3481,7 @@ NetList()
        (
                Connect("R27-1")
                Connect("R28-2")
+               Connect("U7-32")
        )
        Net("v_pyro" "(unknown)")
        (

diff --git a/megametrum.sch b/megametrum.sch
index 3763f51ab8ab0a4224bc082cc852650f38f3b657..2076da70185f487af8972fa48fda25395cfdb32b 100644 (file)
--- a/megametrum.sch
+++ b/megametrum.sch
@@ -3207,3 +3207,13 @@ netname=cs_pres
 N 69300 68000 69300 67600 4
 N 80100 69900 80100 69700 4
 N 80100 69700 81700 69700 4
+N 56300 63200 55000 63200 4
+{
+T 55000 63300 5 10 1 1 0 0 1
+netname=v_batt
+}
+N 56300 62800 55000 62800 4
+{
+T 55000 62900 5 10 1 1 0 0 1
+netname=v_pbatt
+}