sewing-table: RoundCorner: drop INREFFRAME_EDGE from selector (nfc)

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 96673c53d7eedaba1a984a3416bbe410b08a9881..7c1023e4e6a99bbea69bfc215f6cbc9417e202e0 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -189,7 +189,7 @@ ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
 cupwidth=selsz(40,25,50);
-cupheight=selsz(55,25,55);
+cupheight=selsz(75,35,75);
 
 cupstrong_dx=selsz(0,0,-10);
 
@@ -708,6 +708,8 @@ storarm_mainlen = hubaxlelen*storarm_spools
   + (storarm_cope_hubaxle_mk1 ? 10 : 0);
 storarm_totlen = storarm_mainlen + storarm_hooklen;
 
+storarm_taller = storarm_axleslop * (storarm_spools-2);
+
 storarm_mid_off_y = storarm_axlerad;
 
 storarm_base_off_y = storarm_mid_off_y + storarm_base_h/2;
@@ -725,7 +727,7 @@ module StorageArmDiagPartSide(xmin, xmax){
   }
 }
 
-module StorageArmDiagPart(xmin, xmax, shear, adjbot){
+module StorageArmDiagPart(xmin, xmax, adjbot, shear){
   hull(){
     StorageArmDiagPartSide(xmin,xmax);
 
@@ -763,23 +765,26 @@ module StorageArmAtMountingHoles(){
 
 module StorageArmRight(){ ////toplevel
   shear = storarm_hookheight / (storarm_mainlen/2);
+  shear2 = shear + storarm_taller / (storarm_mainlen/2);
+  base_xyz = [-storarm_base_d, -storarm_base_off_y, storarm_base_w];
 
-  StorageArmDiagPart(-1, storarm_mainlen/2+1, shear, 0);
-  StorageArmDiagPart(storarm_mainlen/2-1, storarm_mainlen+1, shear/2,
-                    storarm_hookheight/2);
+  StorageArmDiagPart(-1, storarm_mainlen/2+1,
+                    -storarm_taller, shear2);
+  StorageArmDiagPart(storarm_mainlen/2-1, storarm_mainlen+1,
+                    storarm_hookheight/2, shear/2);
 
   translate([0, storarm_hookheight, 0])
     StorageArmDiagPart(storarm_mainlen, storarm_totlen,
-                      shear/2, -storarm_hookheight/2);
+                      -storarm_hookheight/2, shear/2);
 
   difference(){
     union(){
       hull(){
-       translate([-storarm_base_d, -storarm_base_off_y, storarm_base_w])
+       translate(base_xyz)
          rotate([0,90,0])
          linear_extrude(height=storarm_base_mind)
          StorageArmBaseTemplate();
-       StorageArmDiagPart(-1, 0, shear, 0);
+       StorageArmDiagPart(-1, 0, -storarm_taller, shear);
       }
       StorageArmAtMountingHoles(){
        cylinder(r= storarm_screw_hole_head/2,
@@ -794,6 +799,9 @@ module StorageArmRight(){ ////toplevel
        cylinder(r= (storarm_screw_hole_head + storarm_screw_hole_head_slop)/2,
                 h=20);
     }
+    translate(base_xyz + [0, storarm_base_h/4, -storarm_base_w/4])
+      rotate([0,90,0])
+      Commitid_BestCount([storarm_base_w/2, storarm_base_h/2]);
   }
 }