Merge pull request #305 from chuckwagoncomputing/workflow

Tweaks for release version of Kicad

kicad/bin/export-vrml.py

@@ -1,5 +1,5 @@
 import sys
-from pcbnewTransition.pcbnew import LoadBoard, EXPORTER_VRML
+from pcbnew import LoadBoard, EXPORTER_VRML
 
 b = LoadBoard(sys.argv[1])
 e = EXPORTER_VRML(b)

kicad/bin/export.sh

@@ -18,14 +18,14 @@ kicad-cli sch export pdf "$IN.kicad_sch" --no-background-color -o "gerber/$IN.pd
 
 # Export netlist from schematic, then run BOM plugin script on it.
 kicad-cli sch export netlist "$IN.kicad_sch" --format kicadxml -o "gerber/$IN.net"
-python "$DIR/../kicad/hellen-one-kicad-bom-plugin.py" "gerber/$IN.net" "gerber/$IN.csv"
+python "$DIR/../hellen-one-kicad-bom-plugin.py" "gerber/$IN.net" "gerber/$IN.csv"
 
 # Fill zones
 python "$DIR/fill-zones.py" "$IN.kicad_pcb"
 
 # Export Gerbers, drill file, and positions file
 kicad-cli pcb export gerbers --disable-aperture-macros -l "F.Cu,B.Cu,F.Paste,B.Paste,F.SilkS,B.SilkS,F.Mask,B.Mask,Edge.Cuts,In2.Cu,In1.Cu" --no-x2 --use-drill-file-origin "$IN.kicad_pcb" -o gerber/
-kicad-cli pcb export drill --map-format ps --drill-origin plot --excellon-zeros-format suppressleading "$IN.kicad_pcb" -o gerber/
+kicad-cli pcb export drill --map-format ps --drill-origin plot --excellon-zeros-format suppressleading -u "in" "$IN.kicad_pcb" -o gerber/
 kicad-cli pcb export pos --format csv --units mm --use-drill-file-origin --bottom-negate-x "$IN.kicad_pcb" -o "gerber/$IN-all-pos.csv"
 
 # Get Drill/Place origin from PCB

kicad/bin/fill-zones.py

@@ -1,5 +1,5 @@
 import sys
-from pcbnewTransition.pcbnew import LoadBoard, ZONE_FILLER, SaveBoard
+from pcbnew import LoadBoard, ZONE_FILLER, SaveBoard
 
 b = LoadBoard(sys.argv[1])
 bz = b.Zones()