Path reorg

v1/scad/lib/generic/extension_clip.scad

@@ -1,8 +1,8 @@
 use <spoolmount_a.scad>
 use <spoolmount_b.scad>
 
-module extension(h) {
-    assert(h >= 14, "minimum extension height is 14");
+module extension_clip(h) {
+    assert(h >= 14, "minimum extension_clip height is 14");
 
     // Bottom spoolmount
     spoolmount_b();
@@ -41,4 +41,4 @@ module extension(h) {
     ]);
 }
 
-extension(h=25);
+extension_clip(h=25);

v1/scad/lib/generic/extension_twist.scad

@@ -1,7 +1,7 @@
 use <spoolmount_twist.scad>
 
 module extension_twist(h, twist) {
-    assert(h >= 10, "minimum extension height is 10");
+    assert(h >= 10, "minimum extension_twist height is 10");
 
     // Bottom spoolmount twist
     spoolmount_twist();

v1/scad/lib/generic/ptfe_guide_4.scad

@@ -0,0 +1,30 @@
+use <../util/screw_hole_m3.scad>
+
+module ptfe_guide_4() {
+    translate([0, 0, 5])
+    difference() {
+        hull() {
+            for (x = [-22, 22]) {
+                for (y = [-4, 4]) {
+                    for (z = [-3, 3]) {
+                        translate([x, y, z])
+                        sphere(d=4, $fn=100);
+                    }
+                }
+            }
+        }
+
+        // Screw hole
+        translate([0, 0, -5])
+        screw_hole_m3(h=10);
+
+        // PTFE holes
+        for (x = [-18, -10, 10, 18]) {
+            translate([x, 0, 0])
+            rotate([90, 0, 0])
+            cylinder(h=14, d=4.4, center=true, $fn=100);
+        }
+    }
+}
+
+ptfe_guide_4();

v1/scad/lib/generic/spool_holder_clip.scad

@@ -0,0 +1,45 @@
+use <spoolmount_b.scad>
+use <../util/torus.scad>
+
+module spool_holder_clip(h) {
+    assert(h >= 25, "minimum spool_holder_clip height is 25");
+
+    spoolmount_b();
+
+    // Fill in spoolmount
+    cylinder(h=5, r=26);
+
+    // Main body
+    translate([0, 0, 5])
+    cylinder(h=h - 5, r=12, $fn=200);
+
+    // Base fan in
+    translate([0, 0, 5])
+    rotate_extrude($fn=200)
+    translate([12, 0])
+    difference() {
+        square(10);
+
+        translate([10, 10])
+        circle(r=10);
+    }
+
+    // Cap
+    translate([0, 0, h - 5])
+    cylinder(h=5, r=17, $fn=200);
+
+    // Cap fan out
+    translate([0, 0, h - 10])
+    rotate_extrude($fn=200)
+    polygon(points=[
+        [12, 0],
+        [17, 5],
+        [12, 5],
+    ]);
+
+    // Cap rounded edge
+    translate([0, 0, h - 2.5])
+    torus(r_major=17, r_minor=2.5, xs=0.7, $fn=200);
+}
+
+spool_holder_clip(h=100);

v1/scad/lib/generic/spool_holder_twist.scad

@@ -0,0 +1,42 @@
+use <spoolmount_twist.scad>
+use <../util/torus.scad>
+
+module spool_holder_twist(h) {
+    assert(h >= 25, "minimum spool_holder_twist height is 25");
+
+    spoolmount_twist();
+
+    // Main body
+    translate([0, 0, 5])
+    cylinder(h=95, r=12, $fn=200);
+
+    // Base fan in
+    translate([0, 0, 5])
+    rotate_extrude($fn=200)
+    translate([12, 0])
+    difference() {
+        square(10);
+
+        translate([10, 10])
+        circle(r=10);
+    }
+
+    // Cap
+    translate([0, 0, h - 5])
+    cylinder(h=5, r=17, $fn=200);
+
+    // Cap fan out
+    translate([0, 0, h - 10])
+    rotate_extrude($fn=200)
+    polygon(points=[
+        [12, 0],
+        [17, 5],
+        [12, 5],
+    ]);
+
+    // Cap rounded edge
+    translate([0, 0, h - 2.5])
+    torus(r_major=17, r_minor=2.5, xs=0.7, $fn=200);
+}
+
+spool_holder_twist(h=100);

v1/scad/lib/generic/spoolmount.scad

@@ -1,4 +1,4 @@
-use <torus.scad>
+use <../util/torus.scad>
 
 module spoolmount() {
     // Ring

v1/scad/lib/generic/spoolmount_twist.scad

@@ -1,4 +1,4 @@
-use <torus.scad>
+use <../util/torus.scad>
 
 module spoolmount_twist() {
     difference() {

v1/scad/lib/prusa_enclosure/mount.scad

@@ -1,6 +1,6 @@
-use <spoolmount_a.scad>
-use <screw_hole.scad>
-use <torus.scad>
+use <../generic/spoolmount_a.scad>
+use <../util/screw_hole_m3.scad>
+use <../util/torus.scad>
 
 module prusa_enclosure_mount(angle) {
     translate([0, 0, 13])
@@ -27,7 +27,7 @@ module prusa_enclosure_mount(angle) {
                     
                     // Through screw hole
                     translate([120, 0, 0])
-                    screw_hole(h=18);
+                    screw_hole_m3(h=18);
 
                     // Underside washer alignment cutouts
                     for (y = [-4, 4]) {

v1/scad/lib/prusa_enclosure/washer.scad

@@ -0,0 +1,18 @@
+module prusa_enclosure_mount_washer() {
+    difference() {
+        // Base
+        cube([8.9, 14, 1.5]);
+
+        // Through screw hole
+        translate([3.5, 7, -1])
+        cylinder(h=3.5, d=3.2, $fn=50);
+    }
+    
+    translate([7.5, 3, 2])
+    cube([2, 2, 1], center=true);
+    
+    translate([7.5, 11, 2])
+    cube([2, 2, 1], center=true);
+}
+
+prusa_enclosure_mount_washer();

v1/scad/lib/util/screw_hole_m3.scad

@@ -1,6 +1,6 @@
 use <hexagon.scad>
 
-module screw_hole(h) {
+module screw_hole_m3(h) {
     // Through screw hole
     translate([0, 0, -0.01])
     cylinder(h=h, d=3.2, $fn=50);
@@ -27,4 +27,4 @@ module screw_hole(h) {
     cylinder(h=1.01, d=4.4, $fn=100);
 }
 
-screw_hole(h=10);
+screw_hole_m3(h=10);

v1/scad/lib/util/torus.scad

@@ -3,4 +3,6 @@ module torus(r_major, r_minor, xs=1.0, ys=1.0) {
     translate([r_major, 0, 0])
     scale([xs, ys, 1.0])
     circle(r=r_minor);
-}
+}
+
+torus(r_major=10, r_minor=2, xs=0.5, $fn=200);