added V12 to silkscreen and fiddled with R36 in Power conditioner schematic

diff --git a/buildbotics_controller.pcb b/buildbotics_controller.pcb
index 2343f3203590b5274c612476d3cd372fb3c51a4f..cf76032660a6e6bf133c7475b95c824a62411c69 100644 (file)
--- a/buildbotics_controller.pcb
+++ b/buildbotics_controller.pcb
@@ -3235,15 +3235,15 @@ Element["" "0805_ext" "D/A/R9" "180" 49.0000mm 38.5000mm -6.5000mm -0.5000mm 0 7
 
        )
 
-Element["" "0805_ext" "D/A/C9" "1nF" 49.0000mm 35.0000mm -4.2500mm -2.2500mm 0 75 ""]
+Element["selected" "0805_ext" "D/A/C9" "1nF" 49.0000mm 35.0000mm -4.2500mm -2.2500mm 0 75 "selected"]
 (
        Attribute("device" "CAPACITOR")
        Attribute("manufacturer" "unknown")
        Attribute("manufacturer_part_number" "unknown")
        Attribute("vendor" "unknown")
        Attribute("vendor_part_number" "unknown")
-       Pad[-1.3220mm 0.0000 -0.9820mm 0.0000 1.2000mm 0.6000mm 1.4000mm "1" "1" "square"]
-       Pad[0.9820mm 0.0000 1.3220mm 0.0000 1.2000mm 0.6000mm 1.4000mm "2" "2" "square,edge2"]
+       Pad[-1.3220mm 0.0000 -0.9820mm 0.0000 1.2000mm 0.6000mm 1.4000mm "1" "1" "selected,square"]
+       Pad[0.9820mm 0.0000 1.3220mm 0.0000 1.2000mm 0.6000mm 1.4000mm "2" "2" "selected,square,edge2"]
        ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 0.2500mm]
        ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 0.2500mm]
 
@@ -5584,14 +5584,14 @@ Element["" "HSOP8" "P/U2" "unknown" 29.5000mm 62.0000mm -3.3615mm -4.5325mm 0 75
        Attribute("manufacturer_part_number" "unknown")
        Attribute("vendor" "unknown")
        Attribute("vendor_part_number" "unknown")
-       Pad[-3.3000mm -75.00mil -2.2000mm -75.00mil 0.4000mm 0.0000 0.5000mm "1" "1" "square"]
-       Pad[-3.3000mm -25.00mil -2.2000mm -25.00mil 0.4000mm 0.2000mm 0.5000mm "2" "2" "square"]
-       Pad[-3.3000mm 25.00mil -2.2000mm 25.00mil 0.4000mm 12.00mil 0.5000mm "3" "3" "square"]
-       Pad[-3.3000mm 75.00mil -2.2000mm 75.00mil 0.4000mm 12.00mil 0.5000mm "4" "4" "square"]
-       Pad[2.2000mm -75.00mil 3.3000mm -75.00mil 0.4000mm 12.00mil 0.5000mm "8" "8" "square,edge2"]
-       Pad[2.2000mm -25.00mil 3.3000mm -25.00mil 0.4000mm 0.0000 0.5000mm "7" "7" "square,edge2"]
-       Pad[2.2000mm 25.00mil 3.3000mm 25.00mil 0.4000mm 12.00mil 0.5000mm "6" "6" "square,edge2"]
-       Pad[2.2000mm 75.00mil 3.3000mm 75.00mil 0.4000mm 12.00mil 0.5000mm "5" "5" "square,edge2"]
+       Pad[-3.3000mm -75.00mil -2.2000mm -75.00mil 0.4000mm 0.0000 0.5500mm "1" "1" "square"]
+       Pad[-3.3000mm -25.00mil -2.2000mm -25.00mil 0.4000mm 0.2000mm 0.5500mm "2" "2" "square"]
+       Pad[-3.3000mm 25.00mil -2.2000mm 25.00mil 0.4000mm 12.00mil 0.5500mm "3" "3" "square"]
+       Pad[-3.3000mm 75.00mil -2.2000mm 75.00mil 0.4000mm 12.00mil 0.5500mm "4" "4" "square"]
+       Pad[2.2000mm -75.00mil 3.3000mm -75.00mil 0.4000mm 12.00mil 0.5500mm "8" "8" "square,edge2"]
+       Pad[2.2000mm -25.00mil 3.3000mm -25.00mil 0.4000mm 0.0000 0.5500mm "7" "7" "square,edge2"]
+       Pad[2.2000mm 25.00mil 3.3000mm 25.00mil 0.4000mm 12.00mil 0.5500mm "6" "6" "square,edge2"]
+       Pad[2.2000mm 75.00mil 3.3000mm 75.00mil 0.4000mm 12.00mil 0.5500mm "5" "5" "square,edge2"]
        Pad[0.0000 -0.2500mm 0.0000 0.2500mm 3.0000mm 0.0000 3.5000mm "9" "9" "square,edge2"]
        ElementArc [-3.0000mm -2.7000mm 0.3000mm 0.3000mm 0.000000 360.000000 0.2500mm]
 
@@ -5883,7 +5883,7 @@ Element["" "0805_ext" "P/R12" "1.1k 1%" 35.2500mm 66.5000mm 1.0000mm 0.2500mm 0
 
        )
 
-Element["" "SOT23_2" "PC/Q4" "unknown" 28.7500mm 35.5000mm -2.7981mm 1.3132mm 0 75 ""]
+Element["" "SOT23_2" "PC/Q4" "unknown" 28.7500mm 35.5000mm -3.0000mm 1.5000mm 0 75 ""]
 (
        Attribute("device" "NPN_E_MOSFET")
        Attribute("manufacturer" "unknown")
@@ -7289,17 +7289,17 @@ Element["" "testpt" "M/TP1" "unknown" 12.7500mm 86.2500mm -0.5000mm -1.7500mm 1
 
        )
 
-Element["" "0805_ext" "PC/R36" "10K" 18.7022mm 37.0121mm -2.0666mm 1.0453mm 0 80 ""]
+Element["" "0805_ext" "PC/R36" "37.4K" 18.7500mm 37.0000mm -1.7500mm 1.2500mm 0 80 ""]
 (
        Attribute("device" "RESISTOR")
        Attribute("manufacturer" "unknown")
        Attribute("manufacturer_part_number" "unknown")
        Attribute("vendor" "unknown")
        Attribute("vendor_part_number" "unknown")
-       Pad[-1.3220mm 0.0000 -0.9820mm 0.0000 1.2000mm 0.5000mm 1.4000mm "1" "1" "square"]
-       Pad[0.9820mm 0.0000 1.3220mm 0.0000 1.2000mm 0.5000mm 1.4000mm "2" "2" "square,edge2"]
-       ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
+       Pad[0.9820mm 0.0000 1.3220mm 0.0000 1.2000mm 0.5000mm 1.4000mm "1" "1" "square,edge2"]
+       Pad[-1.3220mm 0.0000 -0.9820mm 0.0000 1.2000mm 0.5000mm 1.4000mm "2" "2" "square"]
        ElementLine [-3.93mil 27.55mil 3.93mil 27.55mil 8.00mil]
+       ElementLine [-3.93mil -27.55mil 3.93mil -27.55mil 8.00mil]
 
        )
 Layer(1 "top" "copper")
@@ -8540,6 +8540,8 @@ Layer(1 "top" "copper")
        Line[18.7500mm 91.5000mm 13.2500mm 86.0000mm 10.00mil 20.00mil "clearline"]
        Line[17.5000mm 36.5000mm 17.5000mm 35.0000mm 10.00mil 20.00mil "clearline"]
        Line[20.5000mm 36.5000mm 21.7500mm 35.2500mm 10.00mil 20.00mil "clearline"]
+       Line[37.0000mm 28.2500mm 37.0000mm 24.5000mm 10.00mil 20.00mil ""]
+       Line[37.0000mm 24.5000mm 37.7500mm 23.7500mm 10.00mil 20.00mil ""]
        Polygon("clearpoly")
        (
                [70.2500mm 123.7500mm] [73.7500mm 123.7500mm] [73.7500mm 133.7500mm] [70.2500mm 133.7500mm] 
@@ -9035,8 +9037,7 @@ Layer(4 "bottom" "copper")
        Line[133.5000mm 72.2500mm 134.7500mm 73.5000mm 80.00mil 0.6000mm "clearline"]
        Line[134.7500mm 73.5000mm 134.7500mm 74.7500mm 80.00mil 0.6000mm "clearline"]
        Line[114.0000mm 76.5000mm 118.2500mm 72.2500mm 80.00mil 0.6000mm "clearline"]
-       Line[101.0000mm 93.7500mm 109.2500mm 93.7500mm 80.00mil 0.6000mm ""]
-       Line[109.2500mm 93.7500mm 128.2500mm 74.7500mm 80.00mil 0.6000mm "clearline"]
+       Line[109.5000mm 93.5000mm 128.5000mm 74.5000mm 80.00mil 0.6000mm "clearline"]
        Line[108.2500mm 90.7500mm 114.0000mm 85.0000mm 80.00mil 0.6000mm "clearline"]
        Line[114.0000mm 85.0000mm 114.0000mm 76.5000mm 80.00mil 0.6000mm "clearline"]
        Line[100.7500mm 75.0000mm 112.0000mm 75.0000mm 80.00mil 0.6000mm ""]
@@ -9595,7 +9596,6 @@ Layer(4 "bottom" "copper")
        Line[114.5000mm 143.5000mm 115.5000mm 143.5000mm 10.00mil 20.00mil "clearline"]
        Line[109.7500mm 150.0000mm 113.5000mm 150.0000mm 10.00mil 20.00mil "clearline"]
        Line[100.7500mm 103.2500mm 110.7500mm 103.2500mm 80.00mil 0.6000mm ""]
-       Line[100.0000mm 105.7500mm 112.0000mm 105.7500mm 80.00mil 0.6000mm ""]
        Line[122.5000mm 27.7500mm 122.5000mm 37.0000mm 25.00mil 20.00mil "clearline"]
        Line[120.2500mm 25.5000mm 122.5000mm 27.7500mm 25.00mil 20.00mil "clearline"]
        Line[118.5000mm 109.5000mm 106.5000mm 121.5000mm 80.00mil 0.6000mm "clearline"]
@@ -9620,6 +9620,8 @@ Layer(4 "bottom" "copper")
        Line[1250.00mil 140.2500mm 1250.00mil 149.0000mm 10.00mil 20.00mil "clearline"]
        Line[47.0000mm 120.2500mm 48.2500mm 121.5000mm 10.00mil 20.00mil "clearline"]
        Line[48.2500mm 121.5000mm 51.2500mm 121.5000mm 10.00mil 20.00mil "clearline"]
+       Line[109.5000mm 93.5000mm 102.0000mm 93.5000mm 80.00mil 20.00mil ""]
+       Line[112.0000mm 105.7500mm 101.7500mm 105.7500mm 80.00mil 20.00mil ""]
        Polygon("clearpoly")
        (
                [70.2500mm 123.7500mm] [73.7500mm 123.7500mm] [73.7500mm 133.7500mm] [70.2500mm 133.7500mm] 
@@ -9707,8 +9709,8 @@ Layer(4 "bottom" "copper")
        )
        Polygon("clearpoly")
        (
-               [102.0000mm 92.5000mm] [84.7500mm 92.5000mm] [84.7500mm 98.0000mm] [90.7500mm 98.0000mm] [90.7500mm 95.0000mm] 
-               [102.0000mm 95.0000mm] 
+               [102.2500mm 92.5000mm] [84.7500mm 92.5000mm] [84.7500mm 98.0000mm] [90.7500mm 98.0000mm] [90.7500mm 95.0000mm] 
+               [102.2500mm 95.0000mm] 
        )
        Polygon("clearpoly")
        (
@@ -9808,7 +9810,7 @@ Layer(6 "top silk" "silk")
        Text[0.7500mm 102.5000mm 0 75 "PDI" "clearline"]
        Text[8.6552mm 102.4304mm 0 75 "3.3Vm" "clearline"]
        Text[86.9913mm 149.6189mm 0 155 "Buildbotics LLC" "clearline,lock"]
-       Text[84.2500mm 151.7500mm 0 155 "Copyright 2016-2018" "clearline,lock"]
+       Text[84.2500mm 151.7500mm 0 155 "Copyright 2016-2019" "clearline,lock"]
        Text[0.2500mm 109.7500mm 0 75 "RESET" "clearline"]
        Text[8.5000mm 108.7500mm 0 75 "GND" "clearline"]
        Text[84.6357mm 145.4106mm 0 155 "Machine Controller" "clearline,lock"]
@@ -9825,7 +9827,7 @@ Layer(6 "top silk" "silk")
        Text[32.7500mm 41.7500mm 1 75 "SDA" "clearline"]
        Text[30.0000mm 41.7500mm 1 75 "SCL" "clearline"]
        Text[27.0000mm 41.7500mm 1 75 "GND" "clearline"]
-       Text[88.5000mm 147.5000mm 0 155 "Revision 11" "clearline,lock"]
+       Text[88.5000mm 147.5000mm 0 155 "Revision 12" "clearline,lock"]
        Text[4.0000mm 17.7500mm 0 75 "SDA" "clearline"]
        Text[4.2500mm 15.0000mm 0 75 "SCL" "clearline"]
        Text[4.2500mm 20.0000mm 0 75 "+5V" "clearline"]
@@ -11445,7 +11447,7 @@ NetList()
        (
                Connect("PC/Q3-3")
                Connect("PC/R31-1")
-               Connect("PC/R36-1")
+               Connect("PC/R36-2")
        )
        Net("PC/unnamed_net253" "(unknown)")
        (
@@ -11458,7 +11460,7 @@ NetList()
                Connect("PC/Q3-1")
                Connect("PC/Q4-3")
                Connect("PC/R35-2")
-               Connect("PC/R36-2")
+               Connect("PC/R36-1")
                Connect("PC/TP4-1")
        )
        Net("PC/Vin" "(unknown)")

diff --git a/power_conditioner.sch b/power_conditioner.sch
index 05c83d236ab6ce51fb3261b340f648b024973c13..73e5c2ce8b140363d46e99d1b63e9198e6317d75 100644 (file)
--- a/power_conditioner.sch
+++ b/power_conditioner.sch
@@ -1337,7 +1337,7 @@ T 44000 44300 5 10 0 0 0 0 1
 model=NTD5867NLT4G
 T 44000 44300 5 10 0 0 0 0 1
 footprint=T0-252-3
-T 44400 45300 5 10 1 1 180 0 1
+T 45000 45300 5 10 1 1 180 0 1
 refdes=Q3
 }
 C 54800 49100 1 0 0 testpt.sym
@@ -1380,10 +1380,25 @@ documentation=Replaces MURS340HE3_A/H
 }
 T 53800 40400 9 10 1 0 0 0 1
 12.0
-C 43700 45600 1 270 0 resistor.sym
+N 43800 44800 43800 45000 4
+N 44600 45600 43800 45600 4
+N 43800 45600 43800 45400 4
+C 43900 44800 1 90 0 resistor.sym
 {
-T 44100 45300 5 10 0 0 270 0 1
+T 43500 45100 5 10 0 0 90 0 1
 device=RESISTOR
+<<<<<<< HEAD
+T 44250 45500 5 10 1 1 180 0 1
+refdes=R36
+T 43900 44800 5 10 0 0 0 0 1
+footprint=0805_ext
+T 43900 45100 5 10 1 1 0 0 1
+value=37.4K
+T 43900 44800 5 10 0 1 0 0 1
+model=RC0805FR-0737K4L
+T 43900 44800 5 10 0 1 0 0 1
+description=RES SMD 37.4K OHM 1% 1/8W 0805
+=======
 T 43700 45600 5 10 0 0 90 0 1
 footprint=0805_ext
 T 43700 45600 5 10 0 0 0 0 1
@@ -1394,7 +1409,5 @@ T 43750 45425 5 10 1 1 180 0 1
 refdes=R36
 T 43750 45225 5 10 1 1 180 0 1
 value=49.9K
+>>>>>>> 6f8fa475dc6cbda0a76481e7100bd96fd0a705f1
 }
-N 43800 44800 43800 45000 4
-N 44600 45600 43800 45600 4
-N 43800 45600 43800 45400 4