From e1083bd5484610a07d70afb833478c5e25d7d02d Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Sat, 12 Sep 2020 10:57:01 -0400 Subject: [PATCH] Simplify v3 scripts by removing vestigial modules. --- scad/100ft_v3/gnal_100ft.scad | 7 ++----- scad/50ft_v3/gnal_50ft.scad | 7 ++----- scripts/v3.sh | 2 ++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/scad/100ft_v3/gnal_100ft.scad b/scad/100ft_v3/gnal_100ft.scad index c0af737..d858e62 100644 --- a/scad/100ft_v3/gnal_100ft.scad +++ b/scad/100ft_v3/gnal_100ft.scad @@ -103,7 +103,7 @@ module gnal_100ft_spiral (spiral_count = 60, od = 298.75, quarter = false) { translate([0, 0, -.1]) { rotate([0, 0, -90]) { - film_guide2(spiral_count); + film_guide(spiral_count); } } } @@ -252,11 +252,8 @@ module gnal_100ft_top () { FN = 200; $fn = FN; -module film_guide (rotations = 60, id = 45.55, spacing = 2.075, bottom = -7.1) { - spiral(rotations, id, spacing, bottom, $fn); -} -module film_guide2 (rotations = 60, id = 45.55, spacing = 2.075, bottom = -2) { +module film_guide (rotations = 60, id = 45.55, spacing = 2.075, bottom = -2) { spiral(rotations, id, spacing, bottom, $fn); } diff --git a/scad/50ft_v3/gnal_50ft.scad b/scad/50ft_v3/gnal_50ft.scad index e0a031f..5e9d982 100644 --- a/scad/50ft_v3/gnal_50ft.scad +++ b/scad/50ft_v3/gnal_50ft.scad @@ -64,7 +64,7 @@ module gnal_50ft_spiral (spiral_count = 40, od = 215.75, quarter = false) { translate([0, 0, -.1]) { rotate([0, 0, -90]) { - film_guide2(spiral_count); + film_guide(spiral_count); } } } @@ -182,11 +182,8 @@ module gnal_50ft_top () { FN = 200; $fn = FN; -module film_guide (rotations = 40, id = 45.55 - .5, spacing = 2.075, bottom = -7.1) { - spiral(rotations, id, spacing, bottom, $fn); -} -module film_guide2 (rotations = 40, id = 45.55 - .5, spacing = 2.075, bottom = -2) { +module film_guide (rotations = 40, id = 45.55 - .5, spacing = 2.075, bottom = -2) { spiral(rotations, id, spacing, bottom, $fn); } diff --git a/scripts/v3.sh b/scripts/v3.sh index 753d16e..fb98639 100644 --- a/scripts/v3.sh +++ b/scripts/v3.sh @@ -9,8 +9,10 @@ DIST=./stl IMG=./img NOTES=./notes/${V}.csv + #"quarter_a" "quarter_b" "quarter_c" "quarter_d" #quarter pieces not rendering properly + FILES=( "spindle_bottom" "spindle_top" "spacer" "top" "spiral" "insert_s8" "insert_16" "spacer_16" ) SIZES=( "50ft" "100ft" )