diff --git a/dibond/sheets/frame_base.pdf b/dibond/sheets/frame_base.pdf index 499f640..c6b5e5c 100644 Binary files a/dibond/sheets/frame_base.pdf and b/dibond/sheets/frame_base.pdf differ diff --git a/dibond/sheets/frame_base_dxf.scad b/dibond/sheets/frame_base_dxf.scad deleted file mode 100644 index 2f54d63..0000000 --- a/dibond/sheets/frame_base_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_base_dxf(); diff --git a/dibond/sheets/frame_gantry.pdf b/dibond/sheets/frame_gantry.pdf index bcac407..2874d32 100644 Binary files a/dibond/sheets/frame_gantry.pdf and b/dibond/sheets/frame_gantry.pdf differ diff --git a/dibond/sheets/frame_gantry_and_y_carriage.pdf b/dibond/sheets/frame_gantry_and_y_carriage.pdf index c18d1f5..a69a7bd 100644 Binary files a/dibond/sheets/frame_gantry_and_y_carriage.pdf and b/dibond/sheets/frame_gantry_and_y_carriage.pdf differ diff --git a/dibond/sheets/frame_gantry_and_y_carriage_dxf.scad b/dibond/sheets/frame_gantry_and_y_carriage_dxf.scad deleted file mode 100644 index 6312706..0000000 --- a/dibond/sheets/frame_gantry_and_y_carriage_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_gantry_and_y_carriage_dxf(); diff --git a/dibond/sheets/frame_gantry_dxf.scad b/dibond/sheets/frame_gantry_dxf.scad deleted file mode 100644 index 3057bb7..0000000 --- a/dibond/sheets/frame_gantry_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_gantry_dxf(); diff --git a/dibond/sheets/frame_left.pdf b/dibond/sheets/frame_left.pdf index 8b22dcf..d964b27 100644 Binary files a/dibond/sheets/frame_left.pdf and b/dibond/sheets/frame_left.pdf differ diff --git a/dibond/sheets/frame_left_dxf.scad b/dibond/sheets/frame_left_dxf.scad deleted file mode 100644 index 30833ea..0000000 --- a/dibond/sheets/frame_left_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_left_dxf(); diff --git a/dibond/sheets/frame_right.pdf b/dibond/sheets/frame_right.pdf index 4b4a90c..fb53c70 100644 Binary files a/dibond/sheets/frame_right.pdf and b/dibond/sheets/frame_right.pdf differ diff --git a/dibond/sheets/frame_right_dxf.scad b/dibond/sheets/frame_right_dxf.scad deleted file mode 100644 index df3680c..0000000 --- a/dibond/sheets/frame_right_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_right_dxf(); diff --git a/dibond/sheets/frame_stays.pdf b/dibond/sheets/frame_stays.pdf index 3d48a1a..92a1793 100644 Binary files a/dibond/sheets/frame_stays.pdf and b/dibond/sheets/frame_stays.pdf differ diff --git a/dibond/sheets/frame_stays_dxf.scad b/dibond/sheets/frame_stays_dxf.scad deleted file mode 100644 index 0357eda..0000000 --- a/dibond/sheets/frame_stays_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_stays_dxf(); diff --git a/dibond/sheets/y_carriage.pdf b/dibond/sheets/y_carriage.pdf index cd2ced0..45981c0 100644 Binary files a/dibond/sheets/y_carriage.pdf and b/dibond/sheets/y_carriage.pdf differ diff --git a/dibond/sheets/y_carriage_dxf.scad b/dibond/sheets/y_carriage_dxf.scad deleted file mode 100644 index 8f34fc2..0000000 --- a/dibond/sheets/y_carriage_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -y_carriage_dxf(); diff --git a/dibond/sheets/y_heatshield.pdf b/dibond/sheets/y_heatshield.pdf index 2142e29..0d1a314 100644 Binary files a/dibond/sheets/y_heatshield.pdf and b/dibond/sheets/y_heatshield.pdf differ diff --git a/dibond/sheets/y_heatshield_dxf.scad b/dibond/sheets/y_heatshield_dxf.scad deleted file mode 100644 index 7e676bf..0000000 --- a/dibond/sheets/y_heatshield_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -y_heatshield_dxf(); diff --git a/mendel/sheets/frame_base.pdf b/mendel/sheets/frame_base.pdf index 8d3bf98..a54044d 100644 Binary files a/mendel/sheets/frame_base.pdf and b/mendel/sheets/frame_base.pdf differ diff --git a/mendel/sheets/frame_base_dxf.scad b/mendel/sheets/frame_base_dxf.scad deleted file mode 100644 index 2f54d63..0000000 --- a/mendel/sheets/frame_base_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_base_dxf(); diff --git a/mendel/sheets/frame_gantry.pdf b/mendel/sheets/frame_gantry.pdf index 740c0b5..23a189f 100644 Binary files a/mendel/sheets/frame_gantry.pdf and b/mendel/sheets/frame_gantry.pdf differ diff --git a/mendel/sheets/frame_gantry_and_y_carriage.pdf b/mendel/sheets/frame_gantry_and_y_carriage.pdf index d4fb0b7..cee9b3b 100644 Binary files a/mendel/sheets/frame_gantry_and_y_carriage.pdf and b/mendel/sheets/frame_gantry_and_y_carriage.pdf differ diff --git a/mendel/sheets/frame_gantry_and_y_carriage_dxf.scad b/mendel/sheets/frame_gantry_and_y_carriage_dxf.scad deleted file mode 100644 index 6312706..0000000 --- a/mendel/sheets/frame_gantry_and_y_carriage_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_gantry_and_y_carriage_dxf(); diff --git a/mendel/sheets/frame_gantry_dxf.scad b/mendel/sheets/frame_gantry_dxf.scad deleted file mode 100644 index 3057bb7..0000000 --- a/mendel/sheets/frame_gantry_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_gantry_dxf(); diff --git a/mendel/sheets/frame_left.pdf b/mendel/sheets/frame_left.pdf index 69c1807..63f6f9f 100644 Binary files a/mendel/sheets/frame_left.pdf and b/mendel/sheets/frame_left.pdf differ diff --git a/mendel/sheets/frame_left_dxf.scad b/mendel/sheets/frame_left_dxf.scad deleted file mode 100644 index 30833ea..0000000 --- a/mendel/sheets/frame_left_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_left_dxf(); diff --git a/mendel/sheets/frame_right.pdf b/mendel/sheets/frame_right.pdf index 0fe4686..0467166 100644 Binary files a/mendel/sheets/frame_right.pdf and b/mendel/sheets/frame_right.pdf differ diff --git a/mendel/sheets/frame_right_dxf.scad b/mendel/sheets/frame_right_dxf.scad deleted file mode 100644 index df3680c..0000000 --- a/mendel/sheets/frame_right_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_right_dxf(); diff --git a/mendel/sheets/frame_stays.pdf b/mendel/sheets/frame_stays.pdf index cb43286..ae87b36 100644 Binary files a/mendel/sheets/frame_stays.pdf and b/mendel/sheets/frame_stays.pdf differ diff --git a/mendel/sheets/frame_stays_dxf.scad b/mendel/sheets/frame_stays_dxf.scad deleted file mode 100644 index 0357eda..0000000 --- a/mendel/sheets/frame_stays_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_stays_dxf(); diff --git a/mendel/sheets/y_carriage.pdf b/mendel/sheets/y_carriage.pdf index 8681962..45bd5ea 100644 Binary files a/mendel/sheets/y_carriage.pdf and b/mendel/sheets/y_carriage.pdf differ diff --git a/mendel/sheets/y_carriage_dxf.scad b/mendel/sheets/y_carriage_dxf.scad deleted file mode 100644 index 8f34fc2..0000000 --- a/mendel/sheets/y_carriage_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -y_carriage_dxf(); diff --git a/mendel/sheets/y_heatshield.pdf b/mendel/sheets/y_heatshield.pdf index 38a68cc..5f43a8f 100644 Binary files a/mendel/sheets/y_heatshield.pdf and b/mendel/sheets/y_heatshield.pdf differ diff --git a/mendel/sheets/y_heatshield_dxf.scad b/mendel/sheets/y_heatshield_dxf.scad deleted file mode 100644 index 7e676bf..0000000 --- a/mendel/sheets/y_heatshield_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -y_heatshield_dxf(); diff --git a/sheets.py b/sheets.py index c21b274..a0a0fab 100755 --- a/sheets.py +++ b/sheets.py @@ -6,6 +6,8 @@ import InkCL import shutil import sys from dxf import * +from set_machine import * +from time import * source_dir = "scad" @@ -15,20 +17,16 @@ def sheets(machine): # target_dir = machine + "/sheets" if os.path.isdir(target_dir): - try: - shutil.rmtree(target_dir) - os.makedirs(target_dir) - except: - pass + shutil.rmtree(target_dir) + sleep(0.1) + os.makedirs(target_dir) else: os.makedirs(target_dir) # # Set the target machine # - f = open("scad/conf/machine.scad","wt") - f. write("include <%s_config.scad>\n" % machine); - f.close() + set_machine(machine) # # Find all the scad files @@ -65,6 +63,7 @@ def sheets(machine): # Make PDF for printing # InkCL.run("-f", base_name + ".svg", "-A", base_name + ".pdf") + os.remove(dxf_maker_name) if __name__ == '__main__': if len(sys.argv) > 1: diff --git a/stls.py b/stls.py index 1cea559..e8c839a 100755 --- a/stls.py +++ b/stls.py @@ -6,6 +6,7 @@ import shutil import sys import c14n_stl from set_machine import * +from time import * from bom import source_dir @@ -34,6 +35,7 @@ def stls(machine, parts = None): if os.path.isdir(target_dir): if not parts: shutil.rmtree(target_dir) #if making the BOM clear the directory first + sleep(0.1) os.makedirs(target_dir) else: os.makedirs(target_dir) diff --git a/sturdy/sheets/frame_base.pdf b/sturdy/sheets/frame_base.pdf index 3175cb7..0176781 100644 Binary files a/sturdy/sheets/frame_base.pdf and b/sturdy/sheets/frame_base.pdf differ diff --git a/sturdy/sheets/frame_base_dxf.scad b/sturdy/sheets/frame_base_dxf.scad deleted file mode 100644 index 2f54d63..0000000 --- a/sturdy/sheets/frame_base_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_base_dxf(); diff --git a/sturdy/sheets/frame_gantry.pdf b/sturdy/sheets/frame_gantry.pdf index 9eb6c43..17b698b 100644 Binary files a/sturdy/sheets/frame_gantry.pdf and b/sturdy/sheets/frame_gantry.pdf differ diff --git a/sturdy/sheets/frame_gantry_and_y_carriage.pdf b/sturdy/sheets/frame_gantry_and_y_carriage.pdf index d44b14c..20e1afe 100644 Binary files a/sturdy/sheets/frame_gantry_and_y_carriage.pdf and b/sturdy/sheets/frame_gantry_and_y_carriage.pdf differ diff --git a/sturdy/sheets/frame_gantry_and_y_carriage_dxf.scad b/sturdy/sheets/frame_gantry_and_y_carriage_dxf.scad deleted file mode 100644 index 6312706..0000000 --- a/sturdy/sheets/frame_gantry_and_y_carriage_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_gantry_and_y_carriage_dxf(); diff --git a/sturdy/sheets/frame_gantry_dxf.scad b/sturdy/sheets/frame_gantry_dxf.scad deleted file mode 100644 index 3057bb7..0000000 --- a/sturdy/sheets/frame_gantry_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_gantry_dxf(); diff --git a/sturdy/sheets/frame_left.pdf b/sturdy/sheets/frame_left.pdf index 4e123f6..5a2145f 100644 Binary files a/sturdy/sheets/frame_left.pdf and b/sturdy/sheets/frame_left.pdf differ diff --git a/sturdy/sheets/frame_left_dxf.scad b/sturdy/sheets/frame_left_dxf.scad deleted file mode 100644 index 30833ea..0000000 --- a/sturdy/sheets/frame_left_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_left_dxf(); diff --git a/sturdy/sheets/frame_right.pdf b/sturdy/sheets/frame_right.pdf index d2b57b1..69b7435 100644 Binary files a/sturdy/sheets/frame_right.pdf and b/sturdy/sheets/frame_right.pdf differ diff --git a/sturdy/sheets/frame_right_dxf.scad b/sturdy/sheets/frame_right_dxf.scad deleted file mode 100644 index df3680c..0000000 --- a/sturdy/sheets/frame_right_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_right_dxf(); diff --git a/sturdy/sheets/frame_stays.pdf b/sturdy/sheets/frame_stays.pdf index 557237d..de7602c 100644 Binary files a/sturdy/sheets/frame_stays.pdf and b/sturdy/sheets/frame_stays.pdf differ diff --git a/sturdy/sheets/frame_stays_dxf.scad b/sturdy/sheets/frame_stays_dxf.scad deleted file mode 100644 index 0357eda..0000000 --- a/sturdy/sheets/frame_stays_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -frame_stays_dxf(); diff --git a/sturdy/sheets/y_carriage.pdf b/sturdy/sheets/y_carriage.pdf index e158f36..da43b5d 100644 Binary files a/sturdy/sheets/y_carriage.pdf and b/sturdy/sheets/y_carriage.pdf differ diff --git a/sturdy/sheets/y_carriage_dxf.scad b/sturdy/sheets/y_carriage_dxf.scad deleted file mode 100644 index 8f34fc2..0000000 --- a/sturdy/sheets/y_carriage_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -y_carriage_dxf(); diff --git a/sturdy/sheets/y_heatshield.pdf b/sturdy/sheets/y_heatshield.pdf index 8435f5c..a032cb3 100644 Binary files a/sturdy/sheets/y_heatshield.pdf and b/sturdy/sheets/y_heatshield.pdf differ diff --git a/sturdy/sheets/y_heatshield_dxf.scad b/sturdy/sheets/y_heatshield_dxf.scad deleted file mode 100644 index 7e676bf..0000000 --- a/sturdy/sheets/y_heatshield_dxf.scad +++ /dev/null @@ -1,2 +0,0 @@ -use <../../scad/main.scad> -y_heatshield_dxf();