reviewed and verified all footprints, updated BOMs with new io connecton for e-stop...

diff --git a/Combined/BOM.ods b/Combined/BOM.ods
index 385f613c7c99a75c398291d7d41c2c8a255c89c2..cd0fbe1d4046f91a6b1869d3eb263c059db31db8 100644 (file)
Binary files a/Combined/BOM.ods and b/Combined/BOM.ods differ

diff --git a/Combined/combined.pcb b/Combined/combined.pcb
index 60a9d8ff4831f98558157ba9783827685d5cde5f..5d2490d9bb1fa5b907051c704e7addb45ee8ddc6 100644 (file)
--- a/Combined/combined.pcb
+++ b/Combined/combined.pcb
@@ -1249,8 +1249,12 @@ Via[4392.80mil 2140.90mil 36.00mil 30.00mil 42.00mil 20.00mil "" "thermal(2X)"]
 Via[3884.90mil 1057.50mil 36.00mil 30.00mil 42.00mil 20.00mil "" ""]
 Via[3877.00mil 2640.00mil 36.00mil 30.00mil 42.00mil 20.00mil "" ""]
 Via[3893.20mil 3441.10mil 36.00mil 30.00mil 42.00mil 20.00mil "" ""]
+Via[389.00mil 4574.00mil 36.00mil 30.00mil 42.00mil 20.00mil "" "thermal(3X)"]
+Via[290.00mil 4616.00mil 36.00mil 30.00mil 42.00mil 20.00mil "" ""]
+Via[578.00mil 6321.00mil 36.00mil 30.00mil 42.00mil 20.00mil "" ""]
+Via[1708.00mil 6321.00mil 36.00mil 30.00mil 42.00mil 20.00mil "" ""]
 
-Element["lock" "Molex 39-03-0040.fp" "MM1/MD3/J1" "unknown" 4610.00mil 2480.00mil 17.00mil -175.00mil 0 100 ""]
+Element["lock" "Molex 39-03-0040.fp" "MM1/MD3/J1" "unknown" 4610.00mil 2480.00mil 29.00mil 291.00mil 0 100 ""]
 (
        Attribute("device" "CONNECTOR_4")
        Attribute("manufacturer" "unknown")
@@ -1269,7 +1273,7 @@ Element["lock" "Molex 39-03-0040.fp" "MM1/MD3/J1" "unknown" 4610.00mil 2480.00mi
 
        )
 
-Element["lock" "Molex 39-03-0040.fp" "MM1/MD2/J1" "unknown" 4610.00mil 1680.00mil -32.00mil -202.00mil 0 100 ""]
+Element["lock" "Molex 39-03-0040.fp" "MM1/MD2/J1" "unknown" 4610.00mil 1680.00mil 24.00mil 287.00mil 0 100 ""]
 (
        Attribute("device" "CONNECTOR_4")
        Attribute("manufacturer" "unknown")
@@ -1288,7 +1292,7 @@ Element["lock" "Molex 39-03-0040.fp" "MM1/MD2/J1" "unknown" 4610.00mil 1680.00mi
 
        )
 
-Element["lock" "Molex 39-03-0040.fp" "MM1/MD1/J1" "unknown" 117.0822mm 880.00mil -21.00mil -217.00mil 0 100 ""]
+Element["lock" "Molex 39-03-0040.fp" "MM1/MD1/J1" "unknown" 117.0822mm 880.00mil 25.00mil 279.00mil 0 100 ""]
 (
        Attribute("device" "CONNECTOR_4")
        Attribute("manufacturer" "unknown")
@@ -1813,7 +1817,7 @@ Element["hidename" "0402.fp" "MM1/MD4/C7" "470nF" 97.4656mm 88.5276mm -31.50mil
 
        )
 
-Element["lock" "Molex 39-03-0040.fp" "MM1/MD4/J1" "unknown" 4610.00mil 3280.00mil -8.00mil -207.00mil 0 100 ""]
+Element["lock" "Molex 39-03-0040.fp" "MM1/MD4/J1" "unknown" 4610.00mil 3280.00mil 24.00mil 283.00mil 0 100 ""]
 (
        Attribute("device" "CONNECTOR_4")
        Attribute("manufacturer" "unknown")
@@ -2114,7 +2118,7 @@ Element["hidename" "LQFP44_10_TMS2660.fp" "MM1/MD1/U3" "unknown" 89.1948mm 957.8
 
        )
 
-Element["" "HEADER6_2" "MP1/ISP" "unknown" 4937.60mil 157.8337mm 33.00mil 129.00mil 2 100 ""]
+Element["" "HEADER6_2" "MP1/ISP" "unknown" 4937.60mil 157.8337mm 33.00mil -274.00mil 2 100 ""]
 (
        Attribute("device" "unknown")
        Attribute("manufacturer" "unknown")
@@ -2196,7 +2200,7 @@ Element["lock" "26_PinDSub.fp" "RP1/J3" "unknown" 4550.00mil 7225.00mil -259.00m
 
        )
 
-Element["" "Molex_39-30-3036.fp" "PS1/J1" "unknown" 555.00mil 7697.00mil 158.00mil 79.00mil 3 100 ""]
+Element["" "Molex_39-30-3036.fp" "PS1/J1" "unknown" 555.00mil 7697.00mil 148.00mil -239.00mil 3 100 ""]
 (
        Attribute("device" "CONNECTOR_3")
        Attribute("manufacturer" "unknown")
@@ -3654,6 +3658,36 @@ Element["hidename" "0402" "MP1/C3" "22pF" 7.4102mm 4492.00mil 31.50mil 31.50mil
        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["" "HEADER2_2.fp" "RP1/J4" "unknown" 2.5510mm 116.9736mm -10.00mil 62.00mil 0 100 ""]
+(
+       Attribute("device" "JUMPER")
+       Attribute("manufacturer" "unknown")
+       Attribute("manufacturer_part_number" "unknown")
+       Attribute("vendor" "unknown")
+       Attribute("vendor_part_number" "unknown")
+       Pin[0.0000 0.0000 60.00mil 30.00mil 66.00mil 38.00mil "1" "1" "square,thermal(2X)"]
+       Pin[0.0000 -100.00mil 60.00mil 30.00mil 66.00mil 38.00mil "2" "2" ""]
+       ElementLine [-50.00mil 50.00mil 50.00mil 50.00mil 10.00mil]
+       ElementLine [50.00mil -150.00mil 50.00mil 50.00mil 10.00mil]
+       ElementLine [-50.00mil -150.00mil 50.00mil -150.00mil 10.00mil]
+       ElementLine [-50.00mil -150.00mil -50.00mil 50.00mil 10.00mil]
+       ElementLine [50.00mil -50.00mil 50.00mil 50.00mil 10.00mil]
+       ElementLine [-50.00mil -50.00mil 50.00mil -50.00mil 10.00mil]
+
+       )
+
+Element["hidename" "0402" "RP1/R1" "10K" 7.7790mm 4571.00mil -31.50mil -31.50mil 0 100 ""]
+(
+       Attribute("device" "RESISTOR")
+       Attribute("manufacturer" "unknown")
+       Attribute("manufacturer_part_number" "unknown")
+       Attribute("vendor" "unknown")
+       Attribute("vendor_part_number" "unknown")
+       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")
 (
@@ -5634,8 +5668,8 @@ Layer(1 "top")
        Line[3978.00mil 2548.00mil 4001.00mil 2571.00mil 10.00mil 30.00mil "clearline"]
        Line[94.6940mm 66.1980mm 95.9861mm 66.1980mm 10.00mil 30.00mil "clearline"]
        Line[95.9861mm 66.1980mm 3811.80mil 2573.40mil 10.00mil 30.00mil "clearline"]
-       Line[3811.80mil 2573.40mil 3948.80mil 2573.40mil 10.00mil 30.00mil "clearline"]
-       Line[3948.80mil 2573.40mil 3986.40mil 2611.00mil 10.00mil 30.00mil "clearline"]
+       Line[3811.80mil 2573.40mil 100.2995mm 2573.40mil 10.00mil 30.00mil "clearline"]
+       Line[100.2995mm 2573.40mil 3986.40mil 2611.00mil 10.00mil 30.00mil "clearline"]
        Line[3986.40mil 2611.00mil 4079.00mil 2611.00mil 10.00mil 30.00mil "clearline"]
        Line[4079.00mil 2611.00mil 4087.00mil 2603.00mil 10.00mil 30.00mil "clearline"]
        Line[94.6940mm 66.9978mm 96.1438mm 66.9978mm 10.00mil 30.00mil "clearline"]
@@ -5691,6 +5725,12 @@ Layer(1 "top")
        Line[308.00mil 4491.00mil 390.00mil 4491.00mil 10.00mil 30.00mil "clearline"]
        Line[319.00mil 3741.00mil 391.00mil 3741.00mil 10.00mil 30.00mil "clearline"]
        Line[391.00mil 3741.00mil 392.00mil 3740.00mil 10.00mil 30.00mil "clearline"]
+       Line[2.5510mm 114.4336mm 224.78mil 114.4336mm 10.00mil 30.00mil "clearline"]
+       Line[224.78mil 114.4336mm 290.52mil 4571.00mil 10.00mil 30.00mil "clearline"]
+       Line[322.00mil 4571.00mil 386.00mil 4571.00mil 10.00mil 30.00mil "clearline"]
+       Line[386.00mil 4571.00mil 389.00mil 4574.00mil 10.00mil 30.00mil "clearline"]
+       Line[7.3726mm 116.0968mm 7.3726mm 117.2398mm 10.00mil 30.00mil "clearline"]
+       Line[7.3726mm 117.2398mm 290.00mil 4616.00mil 10.00mil 30.00mil "clearline"]
        Polygon("clearpoly")
        (
                [3335.00mil 966.00mil] [3693.00mil 966.00mil] [3693.00mil 1140.00mil] [3335.00mil 1140.00mil] 
@@ -6053,7 +6093,7 @@ Layer(2 "inner1")
        Line[2804.00mil 3865.00mil 2896.00mil 3957.00mil 10.00mil 30.00mil "clearline"]
        Line[2896.00mil 3957.00mil 4221.00mil 3957.00mil 10.00mil 30.00mil "clearline"]
        Line[1819.00mil 4391.00mil 1821.00mil 4389.00mil 10.00mil 30.00mil "clearline"]
-       Line[1821.00mil 4389.00mil 3436.00mil 4389.00mil 10.00mil 30.00mil "clearline"]
+       Line[1820.00mil 4389.00mil 3435.00mil 4389.00mil 10.00mil 30.00mil "clearline"]
        Line[2309.00mil 5463.00mil 2324.00mil 5478.00mil 10.00mil 30.00mil "clearline"]
        Line[2324.00mil 5478.00mil 2324.00mil 5706.00mil 10.00mil 30.00mil "clearline"]
        Line[2324.00mil 5706.00mil 60.2287mm 146.1315mm 10.00mil 30.00mil "clearline"]
@@ -6452,6 +6492,12 @@ Layer(2 "inner1")
        Line[4169.00mil 2844.30mil 4166.00mil 2847.30mil 10.00mil 30.00mil "clearline"]
        Line[2632.00mil 4103.00mil 2564.00mil 4103.00mil 10.00mil 30.00mil "clearline"]
        Line[2564.00mil 4103.00mil 2557.50mil 4096.50mil 10.00mil 30.00mil "clearline"]
+       Line[290.00mil 4616.00mil 290.00mil 6033.00mil 10.00mil 30.00mil "clearline"]
+       Line[290.00mil 6033.00mil 578.00mil 6321.00mil 10.00mil 30.00mil "clearline"]
+       Line[2555.00mil 6507.00mil 3526.00mil 6507.00mil 10.00mil 30.00mil "clearline"]
+       Line[3526.00mil 6507.00mil 3628.00mil 6609.00mil 10.00mil 30.00mil "clearline"]
+       Line[2559.00mil 6507.00mil 1894.00mil 6507.00mil 10.00mil 30.00mil "clearline"]
+       Line[1894.00mil 6507.00mil 1708.00mil 6321.00mil 10.00mil 30.00mil "clearline"]
 )
 Layer(3 "inner2")
 (
@@ -6968,6 +7014,7 @@ Layer(4 "bottom")
        Line[2970.20mil 3127.10mil 2929.40mil 78.3920mm 10.00mil 30.00mil "clearline"]
        Line[2929.40mil 78.3920mm 71.0260mm 78.3920mm 10.00mil 30.00mil "clearline"]
        Line[71.0260mm 78.3920mm 2761.00mil 3051.00mil 10.00mil 30.00mil "clearline"]
+       Line[578.00mil 6321.00mil 1708.00mil 6321.00mil 10.00mil 30.00mil "clearline"]
        Polygon("clearpoly")
        (
                [3333.00mil 582.00mil] [3691.00mil 582.00mil] [3691.00mil 753.00mil] [3333.00mil 753.00mil] 
@@ -7071,6 +7118,18 @@ Layer(8 "silk")
        Text[1725.00mil 7323.00mil 0 300 "Controller Version 1.0" "clearline"]
        Text[2010.00mil 7509.00mil 0 300 "Buildbotics LLC" "clearline"]
        Text[1937.00mil 7716.00mil 0 300 "Copyright - 2015" "clearline"]
+       Text[2258.00mil 6361.00mil 0 100 "1" "clearline"]
+       Text[4358.00mil 6826.00mil 0 100 "1" "clearline"]
+       Text[4935.00mil 6274.00mil 0 100 "1" "clearline"]
+       Text[19.00mil 4594.00mil 0 100 "1" "clearline"]
+       Text[36.00mil 4710.00mil 0 100 "1" "clearline"]
+       Text[647.00mil 7860.00mil 0 100 "1" "clearline"]
+       Text[1967.00mil 5534.00mil 0 100 "1" "clearline"]
+       Text[4607.00mil 3099.00mil 0 100 "1" "clearline"]
+       Text[4616.00mil 2309.00mil 0 100 "1" "clearline"]
+       Text[4598.00mil 700.00mil 0 100 "1" "clearline"]
+       Text[4608.00mil 1510.00mil 0 100 "1" "clearline"]
+       Text[543.00mil 143.00mil 0 100 "1" "clearline"]
 )
 NetList()
 (
@@ -7100,6 +7159,7 @@ NetList()
                Connect("PS1/U102-3")
                Connect("RP1/J3-1")
                Connect("RP1/J3-3")
+               Connect("RP1/R1-2")
        )
        Net("+5V" "(unknown)")
        (
@@ -7218,6 +7278,7 @@ NetList()
                Connect("RP1/J2-25")
                Connect("RP1/J3-9")
                Connect("RP1/J3-11")
+               Connect("RP1/J4-1")
        )
        Net("MM1/clk_1" "(unknown)")
        (
@@ -8006,6 +8067,8 @@ NetList()
        (
                Connect("RP1/J1-33")
                Connect("RP1/J3-26")
+               Connect("RP1/J4-2")
+               Connect("RP1/R1-1")
        )
        Net("RP1/unnamed_net250" "(unknown)")
        (

diff --git a/Combined/footprints/HEADER2_2.fp b/Combined/footprints/HEADER2_2.fp
new file mode 100644 (file)
index 0000000..ad198bf
--- /dev/null
+++ b/Combined/footprints/HEADER2_2.fp
@@ -0,0 +1,17 @@
+
+       
+       
+Element(0x00 "Header connector, ribbon cable numbering" "" "HEADER2_2" 260 0 3 100 0x00)
+(
+       Pin(50 50 60 38 "1" 0x101)
+       Pin(150 50 60 38 "2" 0x01)
+        
+       ElementLine(0 0 0 100 10)
+       ElementLine(0 100 200 100 10)
+       ElementLine(200 100 200 0 10)
+       ElementLine(200 0 0 0 10)
+       ElementLine(0 100 100 100 10)
+       ElementLine(100 100 100 0 10)
+       Mark(50 50)
+)
+

diff --git a/Combined/rpi_bus.sch b/Combined/rpi_bus.sch
index 37cfe0f45caef4645e19e72d9c7e0f47b76cb46d..314d7b2dc804ffb0593b47f6b75e541c23d7eedd 100644 (file)
--- a/Combined/rpi_bus.sch
+++ b/Combined/rpi_bus.sch
@@ -241,11 +241,11 @@ device=OUTPUT
 T 47800 44300 5 10 1 1 0 0 1
 refdes=PDI
 }
-C 45900 43100 1 0 0 input-1.sym
+C 46900 43100 1 0 0 input-1.sym
 {
-T 45900 43400 5 10 0 0 0 0 1
+T 46900 43400 5 10 0 0 0 0 1
 device=INPUT
-T 45100 43100 5 10 1 1 0 0 1
+T 46100 43100 5 10 1 1 0 0 1
 refdes=spi_miso
 }
 C 51500 42700 1 0 0 output-1.sym
@@ -287,7 +287,7 @@ N 42000 48000 41100 48000 4
 N 41100 46700 41100 46800 4
 N 41100 46800 42000 46800 4
 N 42000 46800 42000 47200 4
-N 46700 43200 49300 43200 4
+N 47700 43200 49300 43200 4
 N 46600 43600 49300 43600 4
 N 49300 42800 46800 42800 4
 N 51500 42800 50700 42800 4
@@ -296,8 +296,8 @@ N 43400 44000 46600 44000 4
 N 46600 44000 46600 43600 4
 N 43400 44400 46800 44400 4
 N 46800 44400 46800 42800 4
-N 43400 44800 47000 44800 4
-N 47000 44800 47000 43200 4
+N 43400 44800 47700 44800 4
+N 47700 44800 47700 43200 4
 N 43400 45200 44900 45200 4
 N 44900 45200 44900 42200 4
 N 44900 42200 51100 42200 4
@@ -403,18 +403,54 @@ N 43400 46800 43900 46800 4
 N 43400 46400 43900 46400 4
 N 43400 46000 43900 46000 4
 N 49300 48800 45100 48800 4
-N 45100 48800 45100 49800 4
 N 45100 49800 40600 49800 4
 N 40600 49800 40600 46300 4
 N 40600 46300 42000 46300 4
 N 42000 46300 42000 46400 4
 N 49300 49200 45500 49200 4
-N 45500 49200 45500 50000 4
 N 45500 50000 40200 50000 4
 N 40200 50000 40200 46000 4
 N 40200 46000 42000 46000 4
 N 49300 49600 45900 49600 4
-N 45900 49600 45900 50300 4
 N 45900 50300 40400 50300 4
 N 40400 50300 40400 45600 4
 N 40400 45600 42000 45600 4
+C 41800 43100 1 0 0 3.3V-plus-1.sym
+C 42100 42400 1 90 0 resistor.sym
+{
+T 41700 42700 5 10 0 0 90 0 1
+device=RESISTOR
+T 41925 42500 5 10 1 1 90 0 1
+refdes=R1
+T 41925 42900 5 10 1 1 90 0 1
+value=10K
+T 42100 42400 5 10 0 0 0 0 1
+footprint=0402
+T 42100 42400 5 10 0 0 0 0 1
+model=RC0402JR-0710KL
+T 42100 42400 5 10 0 0 0 0 1
+description=RES SMD 10K OHM 5% 1/16W 0402
+}
+N 42000 43000 42000 43100 4
+N 42000 42300 43800 42300 4
+N 43800 42300 43800 44000 4
+N 44100 41900 44100 44800 4
+C 41900 40600 1 0 0 gnd-1.sym
+N 42000 42600 42000 42300 4
+N 45100 48800 45100 49800 4
+N 45500 49200 45500 50000 4
+N 45900 49600 45900 50300 4
+C 41900 41300 1 0 0 jumper-1.sym
+{
+T 42200 41800 5 8 0 0 0 0 1
+device=JUMPER
+T 42200 41800 5 10 1 1 0 0 1
+refdes=J4
+T 41900 41300 5 10 0 0 0 0 1
+footprint=HEADER2_2.fp
+T 41900 41300 5 10 0 0 0 0 1
+model=TE Connectivity 640454-2
+T 41900 41300 5 10 0 0 0 0 1
+description=TE Connectivity - CONN HEADER VERT 2POS .100 TIN
+}
+N 42000 40900 42000 41300 4