projects / bbctrl-pcb / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d307d2 9259a0b)
Resolved conflicts
authorJoseph Coffland <joseph@cauldrondevelopment.com>
Mon, 7 May 2018 19:49:05 +0000 (12:49 -0700)
committerJoseph Coffland <joseph@cauldrondevelopment.com>
Mon, 7 May 2018 19:49:05 +0000 (12:49 -0700)
1  2 
buildbotics_controller.pcb patch | diff1 | diff2 | blob | history

diff --cc buildbotics_controller.pcb
index 127a89b971b28f510db1d408cd8534709200ee50,d5a67ce81306b0aa47db2cd99b35c4c4b431d709..1b700dcb9e72d9aee1e1c1d3a5ef7d4442d19c82
--- 1/buildbotics_controller.pcb
--- 2/buildbotics_controller.pcb
+++ b/buildbotics_controller.pcb
@@@ -7181,8 -7127,62 +7127,62 @@@ Element["" "ISP" "M/ISP" "6-Pin Header
        ElementLine [-70.00mil 150.00mil -50.00mil 150.00mil 10.00mil]
        ElementLine [-70.00mil 50.00mil -70.00mil 150.00mil 10.00mil]
  
+       )
+ 
+ Element["" "SMBFlat.fp" "PC/D5" "unknown" 123.0000mm 55.0000mm -2.2500mm -3.5000mm 0 75 ""]
+ (
+       Attribute("device" "unknown")
+       Attribute("manufacturer" "unknown")
+       Attribute("manufacturer_part_number" "unknown")
+       Attribute("vendor" "unknown")
+       Attribute("vendor_part_number" "unknown")
+       Pad[2.3200mm -0.4350mm 2.3200mm 0.4350mm 1.4000mm 0.0000 1.6540mm "K" "1" "square"]
+       Pad[-2.3200mm -0.4350mm -2.3200mm 0.4350mm 1.4000mm 0.5000mm 1.6032mm "A" "2" "square"]
+       ElementLine [2.3200mm -2.0000mm 3.5000mm -1.5000mm 0.2500mm]
+       ElementLine [3.5000mm -1.5000mm 3.5000mm 1.5000mm 0.2500mm]
+       ElementLine [3.5000mm 1.5000mm 2.3200mm 2.0000mm 0.2500mm]
+       ElementLine [-3.5000mm 2.0000mm 2.3200mm 2.0000mm 0.2500mm]
+       ElementLine [-3.5000mm -2.0000mm -3.5000mm 2.0000mm 0.2500mm]
+       ElementLine [-3.5000mm -2.0000mm 2.3200mm -2.0000mm 0.2500mm]
+ 
+       )
+ 
+ Element["" "SMBFlat.fp" "PC/D3" "unknown" 126.2500mm 30.5000mm -1.7500mm 4.0000mm 0 75 ""]
+ (
+       Attribute("device" "unknown")
+       Attribute("manufacturer" "unknown")
+       Attribute("manufacturer_part_number" "unknown")
+       Attribute("vendor" "unknown")
+       Attribute("vendor_part_number" "unknown")
+       Pad[-0.4350mm 2.3200mm 0.4350mm 2.3200mm 1.4000mm 0.5000mm 1.5524mm "K" "1" "square"]
+       Pad[-0.4350mm -2.3200mm 0.4350mm -2.3200mm 1.4000mm 0.5000mm 1.5524mm "A" "2" "square"]
+       ElementLine [2.0000mm 2.3200mm 1.5000mm 3.5000mm 0.2500mm]
+       ElementLine [-1.5000mm 3.5000mm 1.5000mm 3.5000mm 0.2500mm]
+       ElementLine [-1.5000mm 3.5000mm -2.0000mm 2.3200mm 0.2500mm]
+       ElementLine [-2.0000mm -3.5000mm -2.0000mm 2.3200mm 0.2500mm]
+       ElementLine [-2.0000mm -3.5000mm 2.0000mm -3.5000mm 0.2500mm]
+       ElementLine [2.0000mm -3.5000mm 2.0000mm 2.3200mm 0.2500mm]
+ 
+       )
+ 
+ Element["" "SMBFlat.fp" "PC/D1" "unknown" 40.0000mm 23.7500mm -1.7500mm -3.5000mm 0 75 ""]
+ (
+       Attribute("device" "unknown")
+       Attribute("manufacturer" "unknown")
+       Attribute("manufacturer_part_number" "unknown")
+       Attribute("vendor" "unknown")
+       Attribute("vendor_part_number" "unknown")
+       Pad[2.3200mm -0.4350mm 2.3200mm 0.4350mm 1.4000mm 0.0000 1.6032mm "K" "1" "square"]
+       Pad[-2.3200mm -0.4350mm -2.3200mm 0.4350mm 1.4000mm 0.0000 1.6540mm "A" "2" "square"]
+       ElementLine [2.3200mm -2.0000mm 3.5000mm -1.5000mm 0.2500mm]
+       ElementLine [3.5000mm -1.5000mm 3.5000mm 1.5000mm 0.2500mm]
+       ElementLine [3.5000mm 1.5000mm 2.3200mm 2.0000mm 0.2500mm]
+       ElementLine [-3.5000mm 2.0000mm 2.3200mm 2.0000mm 0.2500mm]
+       ElementLine [-3.5000mm -2.0000mm -3.5000mm 2.0000mm 0.2500mm]
+       ElementLine [-3.5000mm -2.0000mm 2.3200mm -2.0000mm 0.2500mm]
+ 
        )
 -Layer(1 "top")
 +Layer(1 "top" "copper")
  (
        Line[74.7500mm 124.2500mm 73.2500mm 124.2500mm 10.00mil 0.6000mm ""]
        Line[74.7500mm 126.7500mm 73.0000mm 126.7500mm 10.00mil 0.6000mm ""]
@@@ -7972,9 -7972,9 +7972,8 @@@
        Line[39.2500mm 72.2500mm 44.2500mm 67.2500mm 10.00mil 20.00mil "clearline"]
        Line[44.2500mm 67.2500mm 44.2500mm 64.2500mm 10.00mil 20.00mil "clearline"]
        Line[43.7500mm 76.0000mm 43.7500mm 77.5000mm 10.00mil 20.00mil "clearline"]
--      Line[32.2500mm 60.0000mm 33.0000mm 60.0000mm 25.00mil 20.00mil "clearline"]
--      Line[34.7500mm 58.2500mm 36.5000mm 58.2500mm 25.00mil 20.00mil "clearline"]
 -      Line[32.2500mm 62.7500mm 34.5000mm 62.7500mm 20.00mil 20.00mil "clearline"]
++      Line[35.0000mm 58.0000mm 36.7500mm 58.0000mm 25.00mil 20.00mil "clearline"]
 +      Line[32.2500mm 62.7500mm 34.7500mm 62.7500mm 20.00mil 20.00mil "clearline"]
        Line[26.7500mm 62.5000mm 23.2500mm 62.5000mm 10.00mil 20.00mil "clearline"]
        Line[22.5000mm 63.2500mm 20.7500mm 63.2500mm 10.00mil 20.00mil "clearline"]
        Line[20.7500mm 65.5000mm 19.0000mm 65.5000mm 10.00mil 20.00mil "clearline"]
@@@ -8044,8 -8044,8 +8043,8 @@@
        Line[118.0000mm 47.7500mm 113.5000mm 47.7500mm 10.00mil 20.00mil "clearline"]
        Line[108.7500mm 43.0000mm 108.7500mm 26.7500mm 10.00mil 20.00mil "clearline"]
        Line[108.7500mm 26.7500mm 108.5000mm 26.5000mm 10.00mil 20.00mil "clearline"]
--      Line[36.7500mm 53.5000mm 36.7500mm 51.5000mm 25.00mil 20.00mil "clearline"]
--      Line[36.7500mm 57.5000mm 36.7500mm 55.7500mm 25.00mil 20.00mil "clearline"]
++      Line[37.0000mm 52.7500mm 37.0000mm 51.5000mm 25.00mil 20.00mil "clearline"]
++      Line[36.7500mm 58.0000mm 36.7500mm 56.2500mm 25.00mil 20.00mil "clearline"]
        Line[42.0000mm 75.2500mm 29.2500mm 75.2500mm 10.00mil 20.00mil "clearline"]
        Line[6.5000mm 64.7500mm 6.5000mm 41.0000mm 80.00mil 20.00mil "clearline"]
        Line[6.5000mm 41.0000mm 13.5000mm 34.0000mm 80.00mil 20.00mil "clearline"]
@@@ -8304,7 -8304,7 +8303,7 @@@
        Line[49.5000mm 54.7500mm 52.0000mm 52.2500mm 10.00mil 20.00mil "clearline"]
        Line[120.5000mm 49.5000mm 121.0000mm 49.0000mm 25.00mil 20.00mil "clearline"]
        Line[44.2500mm 64.2500mm 47.7500mm 60.7500mm 10.00mil 20.00mil "clearline"]
--      Line[33.0000mm 60.0000mm 34.7500mm 58.2500mm 25.00mil 20.00mil "clearline"]
++      Line[33.0000mm 60.0000mm 35.0000mm 58.0000mm 25.00mil 20.00mil "clearline"]
        Line[114.5000mm 23.5000mm 115.5000mm 22.5000mm 10.00mil 20.00mil "clearline"]
        Line[115.0000mm 43.7500mm 113.0000mm 41.7500mm 10.00mil 20.00mil "clearline"]
        Line[113.0000mm 21.5000mm 112.0000mm 20.5000mm 10.00mil 20.00mil "clearline"]
Unnamed repository; edit this file 'description' to name the repository.