From 93d5086483a3174e95c94c69e8fd9621944bc4c6 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <github@flamingcow.io>
Date: Sat, 20 Jul 2024 14:54:09 -0700
Subject: [PATCH] Integrate new spoolmount

---
 v1/scad/lib/prusa_enclosure/mount.scad | 70 +++++++++-----------------
 1 file changed, 23 insertions(+), 47 deletions(-)

diff --git a/v1/scad/lib/prusa_enclosure/mount.scad b/v1/scad/lib/prusa_enclosure/mount.scad
index 3b17935..b2f5def 100644
--- a/v1/scad/lib/prusa_enclosure/mount.scad
+++ b/v1/scad/lib/prusa_enclosure/mount.scad
@@ -3,10 +3,10 @@ use <../util/screw_hole_m3.scad>
 use <../util/torus.scad>
 
 module prusa_enclosure_mount(angle, h=10) {
-    translate([0, 0, h - 5])
-    spoolmount();
+    translate([0, 0, h])
+    rotate([180, 0, angle])
+    spoolmount(h=h);
 
-    rotate([0, 0, angle])
     difference() {
         union() {
             for (yo = [-20, 20]) {
@@ -14,7 +14,7 @@ module prusa_enclosure_mount(angle, h=10) {
                 difference() {
                     // Side body
                     hull() {
-                        for (x = [30, 127]) {
+                        for (x = [40, 127]) {
                             for (y = [-7, 7]) {
                                 for (z = [2.5, h - 2.5]) {
                                     translate([x, y, z])
@@ -39,7 +39,7 @@ module prusa_enclosure_mount(angle, h=10) {
 
             // Center body
             hull() {
-                for (x = [30, 115]) {
+                for (x = [42, 115]) {
                     for (y = [-25, 25]) {
                         for (z = [2.5, h - 2.5]) {
                             translate([x, y, z])
@@ -50,52 +50,28 @@ module prusa_enclosure_mount(angle, h=10) {
                 }
             }
 
-            // Spoolmount support ring
-            {
-                // Outer core
-                difference() {
-                    union() {
-                        // Top core
-                        translate([0, 0, 2.5])
-                        cylinder(h=h - 3, r=42, $fn=200);
+            // Corner patches
+            for (ys = [-1, 1]) {
+                hull() {
+                    for (z = [2.5, h - 2.5]) {
+                        translate([35, ys * 27, z])
+                        scale([0.7, 0.7, 1.0])
+                        sphere(d=5, $fn=50);
 
-                        // Bottom core
-                        cylinder(h=5, r=40.25, $fn=200);
+                        translate([40, ys * 27, z])
+                        scale([0.7, 0.7, 1.0])
+                        sphere(d=5, $fn=50);
+
+                        translate([40, ys * 15, z])
+                        scale([0.7, 0.7, 1.0])
+                        sphere(d=5, $fn=50);
                     }
-
-                    // Center through cutout
-                    translate([0, 0, -1])
-                    cylinder(h=h + 2, r=25.1, $fn=200);
-
-                    // Bottom cutout
-                    translate([0, 0, -1])
-                    cylinder(h=3.5, r=26.75, $fn=200);
                 }
-
-                // Outer bottom rounded edge
-                translate([0, 0, 2.5])
-                torus(r_major=40.25, r_minor=2.5, xs=0.7, $fn=200);
-
-                // Inner bottom rounded edge
-                translate([0, 0, 2.5])
-                torus(r_major=26.75, r_minor=2.5, xs=0.7, $fn=200);
-            }
-        }
-
-        // Spool ring weight reduction holes
-        for (a = [0 : 20 : 340]) {
-            rotate([0, 0, a])
-            translate([0, 33, 0]) {
-                translate([0, 0, -1])
-                cylinder(h=h - 8.5, d=9, $fn=50);
-
-                translate([0, 0, h - 9.51])
-                cylinder(h=4.5, d1=9, d2=0, $fn=50);
             }
         }
 
         // Weight reduction holes rows 1/5
-        for (x = [44.5 : 12 : 105]) {
+        for (x = [46.5 : 12 : 107]) {
             for (y = [-20 : 40 : 20]) {
                 translate([x, y, -1])
                 cylinder(h=h + 2, d=9, $fn=50);
@@ -103,7 +79,7 @@ module prusa_enclosure_mount(angle, h=10) {
         }
 
         // Weight reduction holes rows 2/4
-        for (x = [51 : 12 : 105]) {
+        for (x = [53 : 12 : 107]) {
             for (y = [-10 : 20 : 10]) {
                 translate([x, y, -1])
                 cylinder(h=h + 2, d=9, $fn=50);
@@ -111,11 +87,11 @@ module prusa_enclosure_mount(angle, h=10) {
         }
 
         // Weight reduction holes row 3
-        for (x = [56.5 : 12 : 105]) {
+        for (x = [58.5 : 12 : 107]) {
                 translate([x, 0, -1])
                 cylinder(h=h + 2, d=9, $fn=50);
         }
     }
 }
 
-prusa_enclosure_mount(angle=0);
\ No newline at end of file
+prusa_enclosure_mount(angle=15);
\ No newline at end of file