filamentspool: Move FilamentCup commitid to very outside, with new FilamentCupPositive

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index b07c2e9478c3cd3473fcee7dda4ec7c5233890e8..73daad1187f37eb1526e25c322612ce83210111c 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -46,6 +46,8 @@
 //
 //     You will also need  4 x M4 machine screws and nuts.
 //
+//     This is the default.
+//
 // ===== Light duty 3-armed spool for 3mm x <=30m coil =====
 //
 // A light duty 3-armed spool suitable for up to around 30m
@@ -54,6 +56,8 @@
 //     Set
 //           fdia=2.85
 //           lightduty=true
+//     (or look in filamentspool-lt.scad).
+//
 //     And print following parts
 //           Hub
 //           ArmEnd x 3
@@ -119,6 +123,8 @@
 //     Set
 //           fdia=2.85
 //           lightduty=false
+//     (or look in filamentspool-sm.scad).
+//
 //     And print one of these, according to taste
 //            StorageArmLeft
 //            StorageArmRight
@@ -246,6 +252,7 @@ include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
 include <axlepin.scad>
+include <commitid.scad>
 
 hub_clip_baseextend = (hubeffrad - DoveClip_depth()
                       - hubbigrad + hublwidth);
@@ -277,6 +284,9 @@ module ArmEnd(length=armend_length){ ////toplevel
                 -armendwallthick + totalwidth/2,
                 -armendbasethick -1])
        cylinder(r= nondove_armhole_hole/2, h=totalheight+2, $fn=10);
+      translate([-nondove_armbase, -armendwallthick, -armendbasethick])
+        rotate([90,0,0])
+       Commitid_BestCount([nondove_armbase, totalwidth]);
     }
   }
 
@@ -316,6 +326,11 @@ module ArmEnd(length=armend_length){ ////toplevel
       cube([length+1 - ratchettooth, channelwidth, channeldepth+1]);
     translate([-1, 0, ratchettoothheight])
       cube([length+2, channelwidth, channeldepth+1]);
+
+    if (usedove()){
+      translate([0,0, -armendbasethick])
+       Commitid_BestCount_M([length/3, totalwidth]);
+    }
   }
   for (dx = [0 : ratchetstep : length - ratchetstep]) translate([dx,0,0]) {
     translate([ratchettoothsmoothr+0.5, armendwallthick/2, 0]) minkowski(){
@@ -359,7 +374,7 @@ module FilamentCupCup(){
   }
 }
 
-module FilamentCup() { ////toplevel
+module FilamentCupPositive() {
   FilamentCupHandle();
 
   gapy = prongwidth;
@@ -414,6 +429,14 @@ module FilamentCup() { ////toplevel
   }      
 }
 
+module FilamentCup() { ////toplevel
+  difference(){
+    FilamentCupPositive();
+    translate([0, -stalkwidth, 0])
+      Commitid_BestCount_M([stalklength - stalkwidth, stalkwidth]);
+  }
+}
+
 module CupSecuringClipSolid(w,d,h1,h2){
   rotate([0,-90,0]) translate([0,-h1/2,-w/2]) linear_extrude(height=w) {
     polygon(points=[[0,0], [d,0], [d,h2], [0,h1]]);
@@ -511,6 +534,16 @@ module Hub(){ ////toplevel
        }
     }
     translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
+
+    rotate([0,0, selsz(0,0,45)])
+      translate([axlerad+hublwidth,
+                -hublwidth/2,
+                0])
+      rotate([90,0,0])
+      Commitid_BestCount([(hubbigrad-hublwidth) - (axlerad+hublwidth),
+                         hublthick +
+                         hublwidth/2 * hubaxlelen/(hubbigrad-axlerad),
+                         ]);
   }
 }