From 5e09bd394ba9c785d6edd7cd57efacf7972950ce Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Wed, 3 Nov 2021 17:05:37 -0400
Subject: [PATCH] Move stacking spindle design to shared library

---
 scad/100ft_v3/gnal_100ft.scad |  6 +++--
 scad/50ft_v3/gnal_50ft.scad   | 42 ++++-------------------------------
 scad/libraries/gnal_v3.scad   | 34 +++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/scad/100ft_v3/gnal_100ft.scad b/scad/100ft_v3/gnal_100ft.scad
index cfb7e99..8a6db5b 100644
--- a/scad/100ft_v3/gnal_100ft.scad
+++ b/scad/100ft_v3/gnal_100ft.scad
@@ -278,18 +278,20 @@ if (PART == "spiral") {
     gnal_100ft_top();
 } else if (PART == "spacer") {
     gnal_spacer();
+} else if (PART == "spacer_16") {
+    gnal_spacer_16();
 } else if (PART == "insert_s8") {
     gnal_spiral_bottom_insert_s8();
 } else if (PART == "insert_16") {
     gnal_spiral_bottom_insert_16();
 } else if (PART == "insert_single") {
     gnal_spiral_bottom_insert_single();
-} else if (PART == "spacer_16") {
-    gnal_spacer_16();
 } else if (PART == "spindle_top") {
     gnal_spindle_top();
 } else if (PART == "spindle_bottom") {
     gnal_spindle_bottom();
 } else if (PART == "spindle_single") {
     gnal_spindle_single();
+} else if (PART == "spindle_stacking") {
+    rotate([0, 180, 0]) gnal_stacking_spindle();
 }
\ No newline at end of file
diff --git a/scad/50ft_v3/gnal_50ft.scad b/scad/50ft_v3/gnal_50ft.scad
index c89dd41..fd485fa 100644
--- a/scad/50ft_v3/gnal_50ft.scad
+++ b/scad/50ft_v3/gnal_50ft.scad
@@ -193,39 +193,6 @@ module film_guide (rotations = 40, id = 45.55 - .5, spacing = 2.075, bottom = -2
     
 }
 
-module gnal_stacking_spindle () {
-    OD = 10.5 + .3;
-    IN_LEN = 21;
-    
-    LEN = 17.1;
-    ALT_LEN = 27.1;
-    difference () {
-        union () {
-            gnal_spindle_base();
-            translate([0, 0, -23.75]) gnal_spacer_solid();
-        }
-        //inner screw negative
-        translate([0, 0, -30]) union() {
-            if (DEBUG) {
-                cylinder(r = OD / 2, h = IN_LEN);
-            } else { 
-                metric_thread (diameter=OD, pitch=PITCH, thread_size = THREAD, length = IN_LEN);
-            }
-            translate([0, 0, 0.2]) {    
-                if (DEBUG) {
-                    cylinder(r = OD / 2, h = IN_LEN);
-                } else {
-                    metric_thread (diameter=OD, pitch=PITCH, thread_size = THREAD, length = IN_LEN);
-                }
-            }
-        }
-   }
-
-    difference () {
-         outer_screw(LEN - 2);
-    }  
-}
-
 PART="spiral";
 
 if (PART == "spiral") {
@@ -242,22 +209,21 @@ if (PART == "spiral") {
     gnal_50ft_top();
 } else if (PART == "spacer") {
     gnal_spacer();
+} else if (PART == "spacer_16") {
+    gnal_spacer_16();
 } else if (PART == "insert_s8") {
     gnal_spiral_bottom_insert_s8();
 } else if (PART == "insert_16") {
     gnal_spiral_bottom_insert_16();
 } else if (PART == "insert_single") {
     gnal_spiral_bottom_insert_single();
-} else if (PART == "spacer_16") {
-    gnal_spacer_16();
 } else if (PART == "spindle_top") {
     gnal_spindle_top();
 } else if (PART == "spindle_bottom") {
     gnal_spindle_bottom();
 } else if (PART == "spindle_single") {
-    gnal_spindle_top();
-} else if (PART == "stacking") {
-    //stacking();
+    gnal_spindle_single();
+} else if (PART == "spindle_stacking") {
     rotate([0, 180, 0]) gnal_stacking_spindle();
 } else if (PART == "spiral_test") {
     difference () {
diff --git a/scad/libraries/gnal_v3.scad b/scad/libraries/gnal_v3.scad
index 852e51c..6aae398 100644
--- a/scad/libraries/gnal_v3.scad
+++ b/scad/libraries/gnal_v3.scad
@@ -18,7 +18,6 @@ include <./Triangles.scad>;
  */
 
 DEBUG = false;
-
 FINE = 200;
 
 OD = 10 + .5;
@@ -792,4 +791,37 @@ module gnal_spindle_single () {
     translate([0, 0, -37.5 - SINGLE_INSERT + (21 / 2) - 1]) {
         cylinder(r = 10 / 2, h = 21, center = true, $fn = FINE);
     }
+}
+
+module gnal_stacking_spindle () {
+    OD = 10.5 + .3;
+    IN_LEN = 21;
+    
+    LEN = 17.1;
+    ALT_LEN = 27.1;
+    difference () {
+        union () {
+            gnal_spindle_base();
+            translate([0, 0, -23.75]) gnal_spacer_solid();
+        }
+        //inner screw negative
+        translate([0, 0, -30]) union() {
+            if (DEBUG) {
+                cylinder(r = OD / 2, h = IN_LEN);
+            } else { 
+                metric_thread (diameter=OD, pitch=PITCH, thread_size = THREAD, length = IN_LEN);
+            }
+            translate([0, 0, 0.2]) {    
+                if (DEBUG) {
+                    cylinder(r = OD / 2, h = IN_LEN);
+                } else {
+                    metric_thread (diameter=OD, pitch=PITCH, thread_size = THREAD, length = IN_LEN);
+                }
+            }
+        }
+   }
+
+    difference () {
+         outer_screw(LEN - 2);
+    }  
 }
\ No newline at end of file