remove 10k in boot0 line, add jumper for USB to supply 5V for servos

diff --git a/pnpfeed.pcb b/pnpfeed.pcb
index 96065e7cc2cb7f17eced0bc196ee88b7c1cb045c..257d40198a69fd979eeb16392d454427f90e5032 100644 (file)
--- a/pnpfeed.pcb
+++ b/pnpfeed.pcb
@@ -864,6 +864,7 @@ Via[1569.00mil 558.00mil 27.00mil 12.00mil 0.0000 13.00mil "" ""]
 Via[1029.00mil 768.00mil 27.00mil 12.00mil 0.0000 13.00mil "" ""]
 Via[1268.00mil 616.00mil 27.00mil 12.00mil 0.0000 13.00mil "" ""]
 Via[982.00mil 768.00mil 27.00mil 12.00mil 0.0000 13.00mil "" ""]
+Via[429.00mil 797.00mil 27.00mil 12.00mil 0.0000 13.00mil "" ""]
 
 Element["hidename" "hole-M3" "H1" "unknown" 125.00mil 125.00mil -18.00mil -28.00mil 0 100 "lock"]
 (
@@ -1162,23 +1163,6 @@ Element["hidename" "lqfp32" "U1" "STM32F042K6T" 950.00mil 780.00mil 121.00mil 62
 
        )
 
-Element["hidename" "0605" "D1" "dualLED" 32.6920mm 843.28mil 0.0000 0.0000 1 100 ""]
-(
-       Pad[-32.47mil 16.72mil -24.60mil 16.72mil 25.59mil -17.71mil 31.59mil "pin2" "2" "square"]
-       Pad[-32.47mil -16.73mil -24.60mil -16.73mil 25.59mil -17.71mil 31.59mil "pin1" "1" "square"]
-       Pad[24.61mil 16.72mil 32.48mil 16.72mil 25.59mil -17.71mil 31.59mil "pin4" "4" "square,edge2"]
-       Pad[24.61mil -16.73mil 32.48mil -16.73mil 25.59mil -17.71mil 31.59mil "pin3" "3" "square,edge2"]
-       ElementArc [59.06mil 0.0000 5.00mil 5.00mil 90 360 10.00mil]
-
-       )
-
-Element["hidename" "0402" "R15" "10k" 1130.00mil 24.2890mm 31.50mil -31.50mil 3 100 ""]
-(
-       Pad[-3.93mil -15.74mil 3.93mil -15.74mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
-       Pad[-3.93mil 15.74mil 3.93mil 15.74mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
-
-       )
-
 Element["hidename" "0402" "C2" "0.01uF" 1169.00mil 956.74mil -31.50mil 31.50mil 1 100 ""]
 (
        Pad[-3.93mil 15.74mil 3.93mil 15.74mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
@@ -1193,14 +1177,7 @@ Element["hidename" "0402" "C5" "1uF" 1201.00mil 764.00mil 31.50mil 31.50mil 2 10
 
        )
 
-Element["hidename" "0402" "R1" "1k" 1201.00mil 862.00mil 31.50mil 31.50mil 2 100 ""]
-(
-       Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
-       Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
-
-       )
-
-Element["hidename" "0402" "R2" "1k" 1201.00mil 824.00mil 31.50mil 31.50mil 2 100 ""]
+Element["hidename" "0402" "R1" "1k" 1218.00mil 841.00mil 31.50mil 31.50mil 2 100 ""]
 (
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
@@ -1507,6 +1484,34 @@ Element["hidename" "0402" "C22" "0.01uF" 38.8554mm 325.00mil 31.50mil 31.50mil 2
        Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
        Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
 
+       )
+
+Element["hidename" "100mil2pin" "J5" "USB5V" 1341.00mil 940.00mil -30.00mil 30.00mil 2 100 ""]
+(
+       Pin[0.0000 0.0000 70.00mil 15.00mil 85.00mil 38.00mil "1" "1" "square,edge2"]
+       Pin[-100.00mil 0.0000 70.00mil 15.00mil 85.00mil 38.00mil "2" "2" "edge2"]
+       ElementLine [-150.00mil 50.00mil 50.00mil 50.00mil 15.00mil]
+       ElementLine [50.00mil -50.00mil 50.00mil 50.00mil 15.00mil]
+       ElementLine [-150.00mil -50.00mil 50.00mil -50.00mil 15.00mil]
+       ElementLine [-150.00mil -50.00mil -150.00mil 50.00mil 15.00mil]
+
+       )
+
+Element["hidename" "0605" "D1" "dualLED" 33.1238mm 822.28mil 0.0000 0.0000 1 100 ""]
+(
+       Pad[-32.47mil 16.72mil -24.60mil 16.72mil 25.59mil -17.71mil 31.59mil "pin2" "2" "square"]
+       Pad[-32.47mil -16.73mil -24.60mil -16.73mil 25.59mil -17.71mil 31.59mil "pin1" "1" "square"]
+       Pad[24.61mil 16.72mil 32.48mil 16.72mil 25.59mil -17.71mil 31.59mil "pin4" "4" "square,edge2"]
+       Pad[24.61mil -16.73mil 32.48mil -16.73mil 25.59mil -17.71mil 31.59mil "pin3" "3" "square,edge2"]
+       ElementArc [59.06mil 0.0000 5.00mil 5.00mil 90 360 10.00mil]
+
+       )
+
+Element["hidename" "0402" "R2" "1k" 1218.00mil 803.00mil 31.50mil 31.50mil 2 100 ""]
+(
+       Pad[15.74mil -3.93mil 15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "1" "1" "square"]
+       Pad[-15.74mil -3.93mil -15.74mil 3.93mil 19.68mil 20.00mil 25.68mil "2" "2" "square"]
+
        )
 Layer(1 "top")
 (
@@ -1728,30 +1733,11 @@ Layer(1 "top")
        Line[29.4320mm 764.26mil 1159.00mil 764.00mil 16.00mil 12.00mil "clearline"]
        Line[30.1056mm 764.00mil 1159.00mil 764.00mil 16.00mil 12.00mil "clearline"]
        Line[30.9052mm 764.00mil 1245.00mil 764.00mil 16.00mil 12.00mil "clearline"]
-       Line[33.4170mm 860.00mil 33.4170mm 811.63mil 10.00mil 12.00mil "clearline"]
-       Line[33.4170mm 811.63mil 1268.00mil 764.00mil 10.00mil 12.00mil "clearline"]
-       Line[1268.00mil 764.00mil 1245.00mil 764.00mil 10.00mil 12.00mil "clearline"]
-       Line[28.3797mm 827.24mil 30.0233mm 827.24mil 10.00mil 12.00mil "clearline"]
-       Line[30.0233mm 827.24mil 30.1056mm 824.00mil 10.00mil 12.00mil "clearline"]
-       Line[28.3797mm 21.8120mm 1182.00mil 21.8120mm 10.00mil 12.00mil "clearline"]
-       Line[1182.00mil 21.8120mm 30.1056mm 862.00mil 10.00mil 12.00mil "clearline"]
-       Line[30.9052mm 824.00mil 1256.00mil 824.00mil 10.00mil 12.00mil "clearline"]
-       Line[1256.00mil 824.00mil 31.9672mm 826.55mil 10.00mil 12.00mil "clearline"]
-       Line[30.9052mm 862.00mil 31.9164mm 862.00mil 10.00mil 12.00mil "clearline"]
-       Line[31.9164mm 862.00mil 31.9672mm 860.00mil 10.00mil 12.00mil "clearline"]
-       Line[26.1297mm 947.32mil 26.1297mm 918.27mil 10.00mil 12.00mil "clearline"]
-       Line[26.1297mm 918.27mil 1044.00mil 903.00mil 10.00mil 12.00mil "clearline"]
-       Line[1044.00mil 903.00mil 1073.00mil 903.00mil 10.00mil 12.00mil "clearline"]
-       Line[1073.00mil 903.00mil 1112.00mil 942.00mil 10.00mil 12.00mil "clearline"]
-       Line[1112.00mil 942.00mil 28.6644mm 942.00mil 10.00mil 12.00mil "clearline"]
-       Line[28.6644mm 942.00mil 1130.00mil 940.52mil 10.00mil 12.00mil "clearline"]
+       Line[1314.00mil 764.00mil 1245.00mil 764.00mil 10.00mil 12.00mil "clearline"]
        Line[26.9298mm 947.32mil 26.9298mm 961.23mil 16.00mil 12.00mil "clearline"]
        Line[26.9298mm 961.23mil 1071.00mil 972.00mil 16.00mil 12.00mil "clearline"]
        Line[1071.00mil 972.00mil 29.6804mm 972.00mil 16.00mil 12.00mil "clearline"]
        Line[29.6804mm 972.00mil 1169.00mil 24.7010mm 16.00mil 12.00mil "clearline"]
-       Line[28.3797mm 890.24mil 29.4447mm 890.24mil 16.00mil 12.00mil "clearline"]
-       Line[29.4447mm 890.24mil 1169.00mil 900.00mil 16.00mil 12.00mil "clearline"]
-       Line[1169.00mil 900.00mil 1169.00mil 941.00mil 16.00mil 12.00mil "clearline"]
        Line[41.1439mm 357.40mil 41.1439mm 368.84mil 10.00mil 12.00mil "clearline"]
        Line[41.1439mm 368.84mil 1626.00mil 375.00mil 10.00mil 12.00mil "clearline"]
        Line[1626.00mil 375.00mil 1626.00mil 551.00mil 10.00mil 12.00mil "clearline"]
@@ -1906,16 +1892,33 @@ Layer(1 "top")
        Line[1555.00mil 544.00mil 1568.00mil 557.00mil 10.00mil 12.00mil "clearline"]
        Line[997.23mil 947.32mil 997.23mil 799.77mil 10.00mil 12.00mil "clearline"]
        Line[997.23mil 799.77mil 1029.00mil 768.00mil 10.00mil 12.00mil "clearline"]
-       Line[1328.50mil 380.50mil 1328.50mil 451.50mil 10.00mil 12.00mil "clearline"]
-       Line[1328.50mil 451.50mil 1171.00mil 609.00mil 10.00mil 12.00mil "clearline"]
-       Line[1171.00mil 609.00mil 1171.00mil 645.00mil 10.00mil 12.00mil "clearline"]
-       Line[1171.00mil 645.00mil 1146.00mil 670.00mil 10.00mil 12.00mil "clearline"]
-       Line[1146.00mil 670.00mil 28.3855mm 670.00mil 10.00mil 12.00mil "clearline"]
-       Line[28.3855mm 670.00mil 28.3797mm 669.77mil 10.00mil 12.00mil "clearline"]
        Line[34.6588mm 450.00mil 34.6588mm 519.48mil 10.00mil 12.00mil "clearline"]
        Line[34.6588mm 519.48mil 1268.00mil 616.00mil 10.00mil 12.00mil "clearline"]
        Line[965.74mil 947.32mil 965.74mil 784.26mil 10.00mil 12.00mil "clearline"]
        Line[965.74mil 784.26mil 982.00mil 768.00mil 10.00mil 12.00mil "clearline"]
+       Line[29.4447mm 890.24mil 1169.00mil 900.00mil 16.00mil 12.00mil "clearline"]
+       Line[28.3797mm 890.24mil 29.4447mm 890.24mil 16.00mil 12.00mil "clearline"]
+       Line[1169.00mil 900.00mil 1169.00mil 941.00mil 16.00mil 12.00mil "clearline"]
+       Line[26.1297mm 947.32mil 26.1297mm 966.73mil 10.00mil 12.00mil "clearline"]
+       Line[26.1297mm 966.73mil 1035.00mil 973.00mil 10.00mil 12.00mil "clearline"]
+       Line[1035.00mil 973.00mil 1094.00mil 973.00mil 10.00mil 12.00mil "clearline"]
+       Line[1094.00mil 973.00mil 1095.00mil 972.00mil 10.00mil 12.00mil "clearline"]
+       Line[1330.00mil 381.00mil 1330.00mil 505.00mil 10.00mil 12.00mil "clearline"]
+       Line[1330.00mil 505.00mil 1165.00mil 670.00mil 10.00mil 12.00mil "clearline"]
+       Line[1165.00mil 670.00mil 28.3855mm 670.00mil 10.00mil 12.00mil "clearline"]
+       Line[28.3855mm 670.00mil 28.3797mm 669.77mil 10.00mil 12.00mil "clearline"]
+       Line[31.3370mm 803.00mil 1273.00mil 803.00mil 10.00mil 12.00mil "clearline"]
+       Line[1273.00mil 803.00mil 32.3990mm 20.4610mm 10.00mil 12.00mil "clearline"]
+       Line[31.3370mm 841.00mil 32.3482mm 841.00mil 10.00mil 12.00mil "clearline"]
+       Line[32.3482mm 841.00mil 32.3990mm 839.00mil 10.00mil 12.00mil "clearline"]
+       Line[28.3797mm 827.24mil 29.0769mm 827.24mil 10.00mil 12.00mil "clearline"]
+       Line[29.0769mm 827.24mil 1169.00mil 803.00mil 10.00mil 12.00mil "clearline"]
+       Line[1169.00mil 803.00mil 30.5374mm 803.00mil 10.00mil 12.00mil "clearline"]
+       Line[28.3797mm 21.8120mm 29.2420mm 21.8120mm 10.00mil 12.00mil "clearline"]
+       Line[29.2420mm 21.8120mm 1169.00mil 841.00mil 10.00mil 12.00mil "clearline"]
+       Line[1169.00mil 841.00mil 30.5374mm 841.00mil 10.00mil 12.00mil "clearline"]
+       Line[33.8488mm 839.00mil 33.8488mm 19.8788mm 10.00mil 12.00mil "clearline"]
+       Line[33.8488mm 19.8788mm 1314.00mil 764.00mil 10.00mil 12.00mil "clearline"]
 )
 Layer(2 "ground")
 (
@@ -1952,6 +1955,9 @@ Layer(3 "power")
        Line[950.00mil 544.00mil 924.00mil 570.00mil 10.00mil 12.00mil "clearline"]
        Line[965.00mil 570.00mil 977.00mil 570.00mil 10.00mil 12.00mil "clearline"]
        Line[977.00mil 570.00mil 1064.00mil 483.00mil 10.00mil 12.00mil "clearline"]
+       Line[1489.00mil 678.00mil 1341.00mil 940.00mil 20.00mil 12.00mil "clearline"]
+       Line[1241.00mil 940.00mil 572.00mil 940.00mil 20.00mil 12.00mil "clearline"]
+       Line[572.00mil 940.00mil 429.00mil 797.00mil 20.00mil 12.00mil "clearline"]
        Polygon("clearpoly,lock")
        (
                [10.00mil 10.00mil] [1990.00mil 10.00mil] [1990.00mil 990.00mil] [10.00mil 990.00mil] 
@@ -2032,6 +2038,7 @@ Layer(8 "silk")
        Text[1337.00mil 633.00mil 0 150 "+" "clearline"]
        Text[1748.00mil 633.00mil 0 150 "-" "clearline"]
        Text[1381.00mil 559.00mil 0 100 "motor power" "clearline"]
+       Text[1181.00mil 830.00mil 0 100 "usb pwr" "clearline"]
 )
 NetList()
 (
@@ -2072,6 +2079,7 @@ NetList()
                Connect("C19-2")
                Connect("C21-2")
                Connect("J3-1")
+               Connect("J5-1")
                Connect("U3-1")
                Connect("U4-1")
                Connect("U5-1")
@@ -2163,8 +2171,8 @@ NetList()
                Connect("J3-2")
                Connect("J4-25")
                Connect("J4-26")
-               Connect("R15-2")
                Connect("U1-16")
+               Connect("U1-31")
                Connect("U1-32")
                Connect("U2-2")
                Connect("U3-4")
@@ -2395,46 +2403,41 @@ NetList()
                Connect("U1-25")
        )
        Net("unnamed_net8" "(unknown)")
-       (
-               Connect("R15-1")
-               Connect("U1-31")
-       )
-       Net("unnamed_net9" "(unknown)")
        (
                Connect("J4-3")
                Connect("R5-1")
        )
-       Net("unnamed_net10" "(unknown)")
+       Net("unnamed_net9" "(unknown)")
        (
                Connect("J4-9")
                Connect("R7-1")
        )
-       Net("unnamed_net11" "(unknown)")
+       Net("unnamed_net10" "(unknown)")
        (
                Connect("J4-6")
                Connect("R6-1")
        )
-       Net("unnamed_net12" "(unknown)")
+       Net("unnamed_net11" "(unknown)")
        (
                Connect("J4-15")
                Connect("R9-1")
        )
-       Net("unnamed_net13" "(unknown)")
+       Net("unnamed_net12" "(unknown)")
        (
                Connect("J4-12")
                Connect("R8-1")
        )
-       Net("unnamed_net14" "(unknown)")
+       Net("unnamed_net13" "(unknown)")
        (
                Connect("J4-18")
                Connect("R10-1")
        )
-       Net("unnamed_net15" "(unknown)")
+       Net("unnamed_net14" "(unknown)")
        (
                Connect("J4-24")
                Connect("R12-1")
        )
-       Net("unnamed_net16" "(unknown)")
+       Net("unnamed_net15" "(unknown)")
        (
                Connect("J4-21")
                Connect("R11-1")
@@ -2453,6 +2456,7 @@ NetList()
        (
                Connect("C3-2")
                Connect("J1-1")
+               Connect("J5-2")
                Connect("U2-1")
                Connect("U2-3")
        )

diff --git a/pnpfeed.sch b/pnpfeed.sch
index 502355e4e8f4d9bf5e8f005f1dd3bdf2ff9f5ea2..7e8b47ed7a17d31aa634c22b19ea665dc75af8e4 100644 (file)
--- a/pnpfeed.sch
+++ b/pnpfeed.sch
@@ -462,19 +462,8 @@ C 45300 71400 1 0 0 3.3V-plus.sym
 C 46100 71400 1 0 0 5V-plus.sym
 N 46300 71400 46300 70800 4
 N 45500 70800 45500 71400 4
-C 43800 49600 1 180 0 resistor.sym
-{
-T 43500 49200 5 10 0 1 180 0 1
-device=RESISTOR
-T 43800 49600 5 10 0 1 90 0 1
-footprint=0402
-T 43350 49825 5 10 1 1 180 0 1
-refdes=R15
-T 43400 49700 5 10 1 1 0 0 1
-value=10k
-}
-C 42800 49200 1 0 0 gnd.sym
-N 44900 49500 43800 49500 4
+C 44600 49200 1 0 0 gnd.sym
+N 44900 49500 44700 49500 4
 C 47600 71300 1 180 0 capacitor.sym
 {
 T 47400 70600 5 10 0 0 180 0 1
@@ -518,19 +507,19 @@ N 58700 49500 58700 48300 4
 N 59100 48300 58700 48300 4
 N 51600 56900 51600 56500 4
 N 51200 57300 51200 56500 4
-C 73200 45200 1 0 1 conn-2.sym
+C 59300 50800 1 0 1 conn-2.sym
 {
-T 72895 45845 5 10 1 1 0 6 1
+T 58995 51445 5 10 1 1 0 6 1
 refdes=J3
-T 72400 44900 5 10 1 1 0 0 1
+T 58500 50500 5 10 1 1 0 0 1
 value=Vmotor
-T 73200 45200 5 10 0 1 0 0 1
+T 59300 50800 5 10 0 1 0 0 1
 footprint=284512-2
-T 73200 45200 5 10 0 1 0 0 1
+T 59300 50800 5 10 0 1 0 0 1
 device=CONNECTOR
 }
-C 73100 45000 1 0 0 gnd.sym
-C 73000 45700 1 0 0 5V-plus.sym
+C 59200 50600 1 0 0 gnd.sym
+C 59500 51300 1 0 0 5V-plus.sym
 N 71500 56900 70100 56900 4
 {
 T 70800 57000 5 10 1 1 0 0 1
@@ -1488,3 +1477,15 @@ N 72400 54900 72100 54900 4
 N 72100 54900 72100 54500 4
 N 72400 56100 72100 56100 4
 N 72100 56100 72100 55700 4
+C 60100 50800 1 0 0 conn-2.sym
+{
+T 60405 51445 5 10 1 1 0 0 1
+refdes=J5
+T 60100 50800 5 10 0 1 0 0 1
+footprint=100mil2pin
+T 60300 50500 5 10 1 1 0 0 1
+value=USB5V
+}
+N 59300 51300 60100 51300 4
+N 59700 50900 59700 49500 4
+N 59700 50900 60100 50900 4