From 45339677d801c32c501e4c38ae0ca89f5b56372a Mon Sep 17 00:00:00 2001
From: Ian Gulliver <github@flamingcow.io>
Date: Mon, 8 Jul 2024 21:03:19 -0700
Subject: [PATCH] Working twist

---
 lib/spoolmount_twist.scad | 108 +++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 60 deletions(-)

diff --git a/lib/spoolmount_twist.scad b/lib/spoolmount_twist.scad
index 64d13bb..502ca75 100644
--- a/lib/spoolmount_twist.scad
+++ b/lib/spoolmount_twist.scad
@@ -1,74 +1,62 @@
 module spoolmount_twist() {
     difference() {
-        // Cylinder body
-        cylinder(h=5, r=25, $fn=200);
-        
-        for (a = [45 : 90 : 335]) {
-            // Locking bump entrance cutout
-            rotate([0, 0, a - 13])
-            rotate_extrude(angle=26, $fn=200)
-            translate([22.5, 0, 0])
-            polygon(points=[
-                [0, -1],
-                [3, -1],
-                [3, 2.5],
-                [0, 2.5],
-            ]);
-            
-            // Slide cutout
-            rotate([0, 0, a - 41.5])
-            rotate_extrude(angle=83, $fn=200)
-            translate([22.5, 0, 0])
-            polygon(points=[
-                [3, 0],
-                [2.5, 0],
-                [0, 2.5],
-                [2.5, 5],
-                [3, 5],
-            ]);
+        union() {
+            difference() {
+                // Cylinder body
+                cylinder(h=5, r=24.9, $fn=200);
 
-            // Rounded end cutouts
-            for (o = [-41.5, 41.5]) {
-                rotate([0, 0, a + o])
-                translate([0, 30, 0])
-                scale([0.2, 1.0, 1.0])
-                rotate_extrude($fn=200)
-                translate([5, 0, 0])
-                polygon(points=[
-                    [0, 0],
-                    [2.5, 2.5],
-                    [0, 5],
-                ]);
+                for (a = [45 : 90 : 335]) {
+                    // Slide bump entrance cutout
+                    rotate([0, 0, a - 13])
+                    rotate_extrude(angle=26, $fn=200)
+                    translate([22.3, 0, 0])
+                    polygon(points=[
+                        [0, -1],
+                        [3, -1],
+                        [3, 2.5],
+                        [0, 2.5],
+                    ]);
+
+                    // Slide cutout
+                    rotate([0, 0, a - 41.5])
+                    rotate_extrude(angle=83, $fn=200)
+                    translate([22.4, 0, 0])
+                    polygon(points=[
+                        [3, 0],
+                        [2.5, 0],
+                        [0, 2.5],
+                        [2.5, 5],
+                        [3, 5],
+                    ]);
+                }
             }
-        }
-    }
-    
-    difference() {
-        intersection() {
-            cylinder(h=5, r=25, $fn=200);
             
-            for (a = [45 : 90 : 335]) {
-                for (o = [-20.65, 20.65]) {
-                    rotate([0, 0, a + o])
-                    translate([0, 23.5, 1])
-                    rotate([45, 0, 0])
-                    scale([1.0, 1.0, 1.0])
-                    cylinder(h=3.5, d=1, center=true, $fn=50);
-                    
-                    rotate([0, 0, a + o])
-                    translate([0, 23.5, 4])
-                    rotate([-45, 0, 0])
-                    scale([1.0, 1.0, 1.0])
-                    cylinder(h=3.5, d=1, center=true, $fn=50);
+            // Locking bumps
+            intersection() {
+                cylinder(h=5, r=24.9, $fn=200);
+
+                for (a = [45 : 90 : 335]) {
+                    for (o = [-20.75, 20.75]) {
+                        rotate([0, 0, a + o])
+                        translate([0, 23.4, 0]) {
+                            translate([0, 0, 1])
+                            rotate([45, 0, 0])
+                            cylinder(h=3.5, d=1, center=true, $fn=50);
+
+                            translate([0, 0, 4])
+                            rotate([-45, 0, 0])
+                            cylinder(h=3.5, d=1, center=true, $fn=50);
+                        }
+                    }
                 }
             }
         }
 
+        // Rounded cutouts
         for (a = [45 : 90 : 335]) {
-            // Rounded end cutouts
-            for (o = [-21.5, 21.5]) {
+            for (o = [-41.5, -21.5, 21.5, 41.5]) {
                 rotate([0, 0, a + o])
-                translate([0, 30, 0])
+                translate([0, 29.9, 0])
                 scale([0.2, 1.0, 1.0])
                 rotate_extrude($fn=200)
                 translate([5, 0, 0])