diff --git a/accessories.py b/accessories.py index fce0cff..59aa715 100644 --- a/accessories.py +++ b/accessories.py @@ -47,11 +47,11 @@ def accessories(machine, assembly = None): if __name__ == '__main__': args = len(sys.argv) - if args > 1: - if args > 2: + if args in [2,3]: + if args == 3: accessories(sys.argv[1], sys.argv[2]) else: accessories(sys.argv[1]) else: - print("usage: accessories mendel|sturdy|your_machine [assembly_name]") + print("usage: accessories dibond|mendel|sturdy|your_machine [assembly_name]") sys.exit(1) diff --git a/set_machine.py b/set_machine.py new file mode 100644 index 0000000..d4c2bc4 --- /dev/null +++ b/set_machine.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +from __future__ import print_function + +import sys + +def set_machine(machine): + text = "include <%s_config.scad>\n" % machine; + f = open("scad/conf/machine.scad","rt") + line = f.read() + f.close() + if line != text: + f = open("scad/conf/machine.scad","wt") + f. write(text); + f.close() + +if __name__ == '__main__': + args = len(sys.argv) + if args == 2: + set_machine(sys.argv[1]) + else: + print("usage: set_machine dibond|mendel|sturdy|huxley|your_machine") + sys.exit(1) diff --git a/stls.py b/stls.py index cd626c3..1cea559 100755 --- a/stls.py +++ b/stls.py @@ -5,6 +5,7 @@ import openscad import shutil import sys import c14n_stl +from set_machine import * from bom import source_dir @@ -40,9 +41,7 @@ def stls(machine, parts = None): # # Set the target machine # - f = open(source_dir + "/conf/machine.scad","wt") - f. write("include <%s_config.scad>\n" % machine); - f.close() + set_machine(machine) # # Decide which files to make @@ -98,5 +97,5 @@ if __name__ == '__main__': if len(sys.argv) > 1: stls(sys.argv[1], sys.argv[2:]) else: - print("usage: stls [mendel|sturdy|your_machine] [part.stl ...]") + print("usage: stls dibond|mendel|sturdy|your_machine [part.stl ...]") sys.exit(1) diff --git a/views.py b/views.py index 63a51e4..e9401a0 100644 --- a/views.py +++ b/views.py @@ -4,6 +4,7 @@ import os import sys import shutil import openscad +from set_machine import * @@ -16,9 +17,8 @@ def views(machine): # # Set the target machine # - f = open("scad/conf/machine.scad","wt") - f.write("include <%s_config.scad>\n" % machine); - f.close() + set_machine(machine) + # # List of individual part files # @@ -66,5 +66,5 @@ if __name__ == '__main__': if len(sys.argv) > 1: views(sys.argv[1]) else: - print "usage: views [mendel|sturdy|your_machine]" + print "usage: views dibond|mendel|sturdy|your_machine" sys.exit(1)