Merge "Do ordering for the joystick board"
diff --git a/motors/big_schematic/gschem_file.rb b/motors/big_schematic/gschem_file.rb
index 5788f34..bff85fd 100644
--- a/motors/big_schematic/gschem_file.rb
+++ b/motors/big_schematic/gschem_file.rb
@@ -172,7 +172,10 @@
files.each do |file|
if file.end_with? '.gsch2pcb'
File.open(file, 'r') do |f|
- r += f.readline.split(' ')[1..-1]
+ dirname = File.dirname(file) + '/'
+ r += f.readline.split(' ')[1..-1].map do |filename|
+ dirname + filename
+ end
end
else
r.push file
diff --git a/motors/big_schematic/ordering.rb b/motors/big_schematic/ordering.rb
index 8f5a01a..1b7b389 100755
--- a/motors/big_schematic/ordering.rb
+++ b/motors/big_schematic/ordering.rb
@@ -59,7 +59,8 @@
puts ARGV
filenames = get_schematic_filenames ARGV
-$parts_yaml = YAML.load_file('parts.yaml')
+#$parts_yaml = YAML.load_file('parts.yaml')
+$parts_yaml = {}
module Unicode
NBSP = "\u00A0"
@@ -735,7 +736,8 @@
unit_price = nil
order_quantity = nil
if $bom_file
- footprint = $parts_yaml['bom_footprints'][part.footprint] || part.footprint
+ #footprint = $parts_yaml['bom_footprints'][part.footprint] || part.footprint
+ footprint = part.footprint
case options[:bom_style]
when :myro
line = [part.quantity,
diff --git a/motors/big_schematic/parts.rb b/motors/big_schematic/parts.rb
index 87650ed..d02b797 100644
--- a/motors/big_schematic/parts.rb
+++ b/motors/big_schematic/parts.rb
@@ -11,7 +11,7 @@
require 'yaml'
require 'net/http'
-require './html'
+#require './html'
def get_octopart_results(mpn)
query = [{:mpn => mpn, :limit => 20}]
diff --git a/motors/hid_schematic/board-main.sch b/motors/hid_schematic/board-main.sch
index 55fa40a..b28b51c 100644
--- a/motors/hid_schematic/board-main.sch
+++ b/motors/hid_schematic/board-main.sch
@@ -617,6 +617,8 @@
refdes=R1
T 51200 40900 5 10 1 1 270 0 1
value=1.3 k
+T 51400 41100 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 51500 41300 51500 41100 4
N 51500 40200 51500 40000 4
@@ -644,6 +646,8 @@
refdes=R2
T 52200 40900 5 10 1 1 270 0 1
value=3 k
+T 52400 41100 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
N 52500 41300 52500 41100 4
N 52500 40200 52500 40000 4
@@ -672,6 +676,8 @@
refdes=R3
T 80100 44600 5 10 1 1 270 0 1
value=1.3 k
+T 80300 44800 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 80400 45000 80400 44800 4
N 80400 43900 80400 43300 4
@@ -699,6 +705,8 @@
refdes=R4
T 81600 44600 5 10 1 1 270 0 1
value=1.3 k
+T 81800 44800 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 81900 45000 81900 44800 4
N 81900 43100 81900 43900 4
@@ -726,6 +734,8 @@
refdes=R5
T 83100 44600 5 10 1 1 270 0 1
value=1.3 k
+T 83300 44800 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 83400 45000 83400 44800 4
N 83400 43700 83400 43900 4
@@ -753,6 +763,8 @@
refdes=R6
T 84600 44600 5 10 1 1 270 0 1
value=1.3 k
+T 84800 44800 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 84900 45000 84900 44800 4
N 84900 43500 84900 43900 4
@@ -949,6 +961,8 @@
refdes=R11
T 61700 54100 5 10 1 1 270 0 1
value=3 k
+T 61900 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 61800 55600 1 0 0 5V-plus-1.sym
N 62400 52200 62400 56700 4
@@ -983,6 +997,8 @@
refdes=R12
T 62900 54100 5 10 1 1 270 0 1
value=3 k
+T 63100 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 63000 55600 1 0 0 5V-plus-1.sym
N 63200 52800 63200 53400 4
@@ -1015,6 +1031,8 @@
refdes=R13
T 64100 54100 5 10 1 1 270 0 1
value=3 k
+T 64300 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 64200 55600 1 0 0 5V-plus-1.sym
N 64400 53400 64400 53000 4
@@ -1047,6 +1065,8 @@
refdes=R14
T 65200 54100 5 10 1 1 270 0 1
value=3 k
+T 65400 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 65300 55600 1 0 0 5V-plus-1.sym
N 65500 53400 65500 53200 4
@@ -1082,6 +1102,8 @@
refdes=R15
T 66500 54100 5 10 1 1 270 0 1
value=3 k
+T 66700 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 66600 55600 1 0 0 5V-plus-1.sym
N 67200 52800 66800 52800 4
@@ -1115,6 +1137,8 @@
refdes=R16
T 67700 54100 5 10 1 1 270 0 1
value=3 k
+T 67900 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 67800 55600 1 0 0 5V-plus-1.sym
N 68000 52800 68000 53400 4
@@ -1146,6 +1170,8 @@
refdes=R17
T 68900 54100 5 10 1 1 270 0 1
value=3 k
+T 69100 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 69000 55600 1 0 0 5V-plus-1.sym
N 69200 53400 69200 53000 4
@@ -1177,6 +1203,8 @@
refdes=R18
T 70000 54100 5 10 1 1 270 0 1
value=3 k
+T 70200 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 70100 55600 1 0 0 5V-plus-1.sym
N 70300 53400 70300 53200 4
@@ -1219,6 +1247,8 @@
refdes=R19
T 71200 54100 5 10 1 1 270 0 1
value=3 k
+T 71400 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
N 72600 55600 72600 55400 4
C 72800 54500 1 90 0 led-3.sym
@@ -1245,6 +1275,8 @@
refdes=R20
T 72300 54100 5 10 1 1 270 0 1
value=3 k
+T 72500 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 71300 55600 1 0 0 5V-plus-1.sym
C 72400 55600 1 0 0 5V-plus-1.sym
@@ -1289,6 +1321,8 @@
refdes=R21
T 50500 54100 5 10 1 1 270 0 1
value=3 k
+T 50700 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 50600 55600 1 0 0 5V-plus-1.sym
N 51200 52200 51200 56700 4
@@ -1324,6 +1358,8 @@
refdes=R22
T 51700 54100 5 10 1 1 270 0 1
value=3 k
+T 51900 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 51800 55600 1 0 0 5V-plus-1.sym
N 52000 52800 52000 53400 4
@@ -1356,6 +1392,8 @@
refdes=R23
T 52900 54100 5 10 1 1 270 0 1
value=3 k
+T 53100 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 53000 55600 1 0 0 5V-plus-1.sym
N 53200 53400 53200 53000 4
@@ -1388,6 +1426,8 @@
refdes=R24
T 54000 54100 5 10 1 1 270 0 1
value=3 k
+T 54200 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 54100 55600 1 0 0 5V-plus-1.sym
N 54300 53400 54300 53200 4
@@ -1421,6 +1461,8 @@
refdes=R25
T 55300 54100 5 10 1 1 270 0 1
value=3 k
+T 55500 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 55400 55600 1 0 0 5V-plus-1.sym
N 56000 52800 55600 52800 4
@@ -1454,6 +1496,8 @@
refdes=R26
T 56500 54100 5 10 1 1 270 0 1
value=3 k
+T 56700 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 56600 55600 1 0 0 5V-plus-1.sym
N 56800 52800 56800 53400 4
@@ -1485,6 +1529,8 @@
refdes=R27
T 57700 54100 5 10 1 1 270 0 1
value=3 k
+T 57900 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 57800 55600 1 0 0 5V-plus-1.sym
N 58000 53400 58000 53000 4
@@ -1516,6 +1562,8 @@
refdes=R28
T 58800 54100 5 10 1 1 270 0 1
value=3 k
+T 59000 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 58900 55600 1 0 0 5V-plus-1.sym
N 59100 53400 59100 53200 4
@@ -1553,6 +1601,8 @@
refdes=R29
T 48100 54100 5 10 1 1 270 0 1
value=3 k
+T 48300 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
N 49600 55600 49600 55400 4
C 49800 54500 1 90 0 led-3.sym
@@ -1579,6 +1629,8 @@
refdes=R30
T 49300 54100 5 10 1 1 270 0 1
value=3 k
+T 49500 54300 5 10 0 0 0 0 1
+pn=RC0603JR-073KL
}
C 48200 55600 1 0 0 5V-plus-1.sym
C 49400 55600 1 0 0 5V-plus-1.sym
@@ -1606,6 +1658,8 @@
refdes=R31
T 75600 39000 5 10 1 1 270 0 1
value=1.3 k
+T 75800 39200 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 75900 39400 75900 39200 4
N 74800 40500 74800 40300 4
@@ -1632,6 +1686,8 @@
refdes=R32
T 74500 39000 5 10 1 1 270 0 1
value=1.3 k
+T 74700 39200 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 74800 39400 74800 39200 4
N 73600 40500 73600 40300 4
@@ -1658,6 +1714,8 @@
refdes=R33
T 73300 39000 5 10 1 1 270 0 1
value=1.3 k
+T 73500 39200 5 10 0 0 0 0 1
+pn=RC0603JR-071K3L
}
N 73600 39400 73600 39200 4
N 72800 38100 72800 41800 4
@@ -1940,6 +1998,8 @@
value=120
T 61700 40000 5 10 0 0 0 0 1
power=.25 W
+T 61700 40000 5 10 0 0 0 0 1
+pn=ESR10EZPJ121
}
N 61700 40100 61500 40100 4
N 61500 40100 61500 41300 4
diff --git a/motors/hid_schematic/ordering.rb b/motors/hid_schematic/ordering.rb
new file mode 120000
index 0000000..48325a4
--- /dev/null
+++ b/motors/hid_schematic/ordering.rb
@@ -0,0 +1 @@
+../big_schematic/ordering.rb
\ No newline at end of file
diff --git a/motors/hid_schematic/parts.rb b/motors/hid_schematic/parts.rb
new file mode 120000
index 0000000..99f7624
--- /dev/null
+++ b/motors/hid_schematic/parts.rb
@@ -0,0 +1 @@
+../big_schematic/parts.rb
\ No newline at end of file