From e22872d2ac4d7dcd301a4fc25799b825a5e0059e Mon Sep 17 00:00:00 2001
From: Ian Gulliver <github@flamingcow.io>
Date: Fri, 5 Jul 2024 13:58:28 -0700
Subject: [PATCH] Much thicker

---
 prusa_enclosure_mount_top_right.scad | 83 +++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 20 deletions(-)

diff --git a/prusa_enclosure_mount_top_right.scad b/prusa_enclosure_mount_top_right.scad
index 74fd80e..ceb010e 100644
--- a/prusa_enclosure_mount_top_right.scad
+++ b/prusa_enclosure_mount_top_right.scad
@@ -1,31 +1,35 @@
 use <spoolmount_a.scad>
+use <torus.scad>
 
 module prusa_enclosure_mount_top_right() {
+    translate([0, 0, 15])
     spoolmount_a();
 
     rotate([0, 0, 45])
     difference() {
         union() {
-            for (o = [-20, 20]) {
-                translate([0, o, 0])
+            for (yo = [-20, 20]) {
+                translate([0, yo, 0])
                 difference() {
                     // Side body
                     hull() {
                         for (x = [30, 127]) {
                             for (y = [-7, 7]) {
-                                translate([x, y, 2.5])
-                                scale([0.7, 0.7, 1.0])
-                                sphere(d=5, $fn=50);
+                                for (z = [2.5, 17.5]) {
+                                    translate([x, y, z])
+                                    scale([0.7, 0.7, 1.0])
+                                    sphere(d=5, $fn=50);
+                                }
                             }
                         }
                     }
                     
                     // Through screw hole
                     translate([120, 0, -1])
-                    cylinder(h=7, d=3.2, $fn=50);
+                    cylinder(h=22, d=3.2, $fn=50);
                     
                     // Hex nut / screw head cutout 
-                    translate([120, 0, 3.7])
+                    translate([120, 0, 20 - (2.6 / 2)])
                     linear_extrude(2.61, center=true)
                     polygon(points=[
                         [-2.8, 1.6175],
@@ -48,29 +52,68 @@ module prusa_enclosure_mount_top_right() {
             hull() {
                 for (x = [30, 115]) {
                     for (y = [-25, 25]) {
-                        translate([x, y, 2.5])
-                        scale([0.7, 0.7, 1.0])
-                        sphere(d=5, $fn=50);
+                        for (z = [2.5, 17.5]) {
+                            translate([x, y, z])
+                            scale([0.7, 0.7, 1.0])
+                            sphere(d=5, $fn=50);
+                        }
                     }
                 }
             }
-        }
-        
-        // Weight reduction holes rows 1/3/5
-        for (x = [49 : 12 : 105]) {
-            for (y = [-20 : 20 : 20]) {
-                translate([x, y, -1])
-                cylinder(h=7, d=9, $fn=50);
+
+            // Spoolmount support ring
+            {
+                // Outer core
+                difference() {
+                    union() {
+                        // Top core
+                        translate([0, 0, 2.5])
+                        cylinder(h=17.5, r=42, $fn=200);
+
+                        // Bottom core
+                        cylinder(h=20, r=40.25, $fn=200);
+                    }
+
+                    // Center through cutout
+                    translate([0, 0, -1])
+                    cylinder(h=22, r=25, $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);
             }
         }
-        
+
+        // Weight reduction holes rows 1/5
+        for (x = [44.5 : 12 : 105]) {
+            for (y = [-20 : 40 : 20]) {
+                translate([x, y, -1])
+                cylinder(h=22, d=9, $fn=50);
+            }
+        }
+
         // Weight reduction holes rows 2/4
-        for (x = [54.5 : 12 : 105]) {
+        for (x = [51 : 12 : 105]) {
             for (y = [-10 : 20 : 10]) {
                 translate([x, y, -1])
-                cylinder(h=7, d=9, $fn=50);
+                cylinder(h=22, d=9, $fn=50);
             }
         }
+
+        // Weight reduction holes row 3
+        for (x = [56.5 : 12 : 105]) {
+                translate([x, 0, -1])
+                cylinder(h=22, d=9, $fn=50);
+        }
     }
 }