add stem_inner_slop to all places where it is supposed to be

rsheldiii · rsheldiii · commit 08f17a4e1fe3 · 2022-02-21T13:28:36.000-05:00
diff --git a/customizer.scad b/customizer.scad
@@ -3534,7 +3534,7 @@ module rounded_cherry_stem(depth, slop, throw) {
 
     // inside cross
     // translation purely for aesthetic purposes, to get rid of that awful lattice
-    inside_cherry_cross(slop);
+    inside_cherry_cross($stem_inner_slop);
   }
 }
 // a safe theoretical distance between two vertices such that they don't collapse. hard to use
@@ -3734,7 +3734,7 @@ module box_cherry_stem(depth, slop, throw) {
     }
 
     // inside cross
-    inside_cherry_cross(slop);
+    inside_cherry_cross($stem_inner_slop);
   }
 }
 module alps_stem(depth, slop, throw){
@@ -4098,12 +4098,12 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference() {
       cylinder(d=$rounded_cherry_stem_d * 2, h=stem_support_height);
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "box_cherry") {
     difference() {
@@ -4113,7 +4113,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference() {
@@ -4123,7 +4123,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if(stem_type == "choc") {
     translate([-5.7/2,0,0]) linear_extrude(height=stem_support_height) {
@@ -4372,7 +4372,7 @@ module tines_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference () {
@@ -4392,13 +4392,13 @@ module tines_support(stem_type, stem_support_height, slop) {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "alps"){
     centered_tines(stem_support_height);
diff --git a/src/stem_supports/brim.scad b/src/stem_supports/brim.scad
@@ -16,12 +16,12 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference() {
       cylinder(d=$rounded_cherry_stem_d * 2, h=stem_support_height);
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "box_cherry") {
     difference() {
@@ -31,7 +31,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference() {
@@ -41,7 +41,7 @@ module brim_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if(stem_type == "choc") {
     translate([-5.7/2,0,0]) linear_extrude(height=stem_support_height) {
diff --git a/src/stem_supports/tines.scad b/src/stem_supports/tines.scad
@@ -47,7 +47,7 @@ module tines_support(stem_type, stem_support_height, slop) {
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference () {
@@ -67,13 +67,13 @@ module tines_support(stem_type, stem_support_height, slop) {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "rounded_cherry") {
     difference () {
       centered_tines(stem_support_height);
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "alps"){
     centered_tines(stem_support_height);
diff --git a/src/stems/box_cherry.scad b/src/stems/box_cherry.scad
@@ -11,6 +11,6 @@ module box_cherry_stem(depth, slop, throw) {
     }
 
     // inside cross
-    inside_cherry_cross(slop);
+    inside_cherry_cross($stem_inner_slop);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3534,7 +3534,7 @@ module rounded_cherry_stem(depth, slop, throw) {`
`3534`	`3534`
`3535`	`3535`	`// inside cross`
`3536`	`3536`	`// translation purely for aesthetic purposes, to get rid of that awful lattice`
`3537`		`- inside_cherry_cross(slop);`
	`3537`	`+ inside_cherry_cross($stem_inner_slop);`
`3538`	`3538`	`}`
`3539`	`3539`	`}`
`3540`	`3540`	`// a safe theoretical distance between two vertices such that they don't collapse. hard to use`
`@@ -3734,7 +3734,7 @@ module box_cherry_stem(depth, slop, throw) {`
`3734`	`3734`	`}`
`3735`	`3735`
`3736`	`3736`	`// inside cross`
`3737`		`- inside_cherry_cross(slop);`
	`3737`	`+ inside_cherry_cross($stem_inner_slop);`
`3738`	`3738`	`}`
`3739`	`3739`	`}`
`3740`	`3740`	`module alps_stem(depth, slop, throw){`
`@@ -4098,12 +4098,12 @@ module brim_support(stem_type, stem_support_height, slop) {`
`4098`	`4098`	`}`
`4099`	`4099`	`}`
`4100`	`4100`
`4101`		`- inside_cherry_cross(slop);`
	`4101`	`+ inside_cherry_cross($stem_inner_slop);`
`4102`	`4102`	`}`
`4103`	`4103`	`} else if (stem_type == "rounded_cherry") {`
`4104`	`4104`	`difference() {`
`4105`	`4105`	`cylinder(d=$rounded_cherry_stem_d * 2, h=stem_support_height);`
`4106`		`- inside_cherry_cross(slop);`
	`4106`	`+ inside_cherry_cross($stem_inner_slop);`
`4107`	`4107`	`}`
`4108`	`4108`	`} else if (stem_type == "box_cherry") {`
`4109`	`4109`	`difference() {`
`@@ -4113,7 +4113,7 @@ module brim_support(stem_type, stem_support_height, slop) {`
`4113`	`4113`	`}`
`4114`	`4114`	`}`
`4115`	`4115`
`4116`		`- inside_cherry_cross(slop);`
	`4116`	`+ inside_cherry_cross($stem_inner_slop);`
`4117`	`4117`	`}`
`4118`	`4118`	`} else if (stem_type == "cherry_stabilizer") {`
`4119`	`4119`	`difference() {`
`@@ -4123,7 +4123,7 @@ module brim_support(stem_type, stem_support_height, slop) {`
`4123`	`4123`	`}`
`4124`	`4124`	`}`
`4125`	`4125`
`4126`		`- inside_cherry_cross(slop);`
	`4126`	`+ inside_cherry_cross($stem_inner_slop);`
`4127`	`4127`	`}`
`4128`	`4128`	`} else if(stem_type == "choc") {`
`4129`	`4129`	`translate([-5.7/2,0,0]) linear_extrude(height=stem_support_height) {`
`@@ -4372,7 +4372,7 @@ module tines_support(stem_type, stem_support_height, slop) {`
`4372`	`4372`	`}`
`4373`	`4373`	`}`
`4374`	`4374`
`4375`		`- inside_cherry_cross(slop);`
	`4375`	`+ inside_cherry_cross($stem_inner_slop);`
`4376`	`4376`	`}`
`4377`	`4377`	`} else if (stem_type == "cherry_stabilizer") {`
`4378`	`4378`	`difference () {`
`@@ -4392,13 +4392,13 @@ module tines_support(stem_type, stem_support_height, slop) {`
`4392`	`4392`	`difference () {`
`4393`	`4393`	`centered_tines(stem_support_height);`
`4394`	`4394`
`4395`		`- inside_cherry_cross(slop);`
	`4395`	`+ inside_cherry_cross($stem_inner_slop);`
`4396`	`4396`	`}`
`4397`	`4397`	`} else if (stem_type == "rounded_cherry") {`
`4398`	`4398`	`difference () {`
`4399`	`4399`	`centered_tines(stem_support_height);`
`4400`	`4400`
`4401`		`- inside_cherry_cross(slop);`
	`4401`	`+ inside_cherry_cross($stem_inner_slop);`
`4402`	`4402`	`}`
`4403`	`4403`	`} else if (stem_type == "alps"){`
`4404`	`4404`	`centered_tines(stem_support_height);`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ module brim_support(stem_type, stem_support_height, slop) {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`- inside_cherry_cross(slop);`
	`19`	`+ inside_cherry_cross($stem_inner_slop);`
`20`	`20`	`}`
`21`	`21`	`} else if (stem_type == "rounded_cherry") {`
`22`	`22`	`difference() {`
`23`	`23`	`cylinder(d=$rounded_cherry_stem_d * 2, h=stem_support_height);`
`24`		`- inside_cherry_cross(slop);`
	`24`	`+ inside_cherry_cross($stem_inner_slop);`
`25`	`25`	`}`
`26`	`26`	`} else if (stem_type == "box_cherry") {`
`27`	`27`	`difference() {`
`@@ -31,7 +31,7 @@ module brim_support(stem_type, stem_support_height, slop) {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- inside_cherry_cross(slop);`
	`34`	`+ inside_cherry_cross($stem_inner_slop);`
`35`	`35`	`}`
`36`	`36`	`} else if (stem_type == "cherry_stabilizer") {`
`37`	`37`	`difference() {`
`@@ -41,7 +41,7 @@ module brim_support(stem_type, stem_support_height, slop) {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- inside_cherry_cross(slop);`
	`44`	`+ inside_cherry_cross($stem_inner_slop);`
`45`	`45`	`}`
`46`	`46`	`} else if(stem_type == "choc") {`
`47`	`47`	`translate([-5.7/2,0,0]) linear_extrude(height=stem_support_height) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ module tines_support(stem_type, stem_support_height, slop) {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- inside_cherry_cross(slop);`
	`50`	`+ inside_cherry_cross($stem_inner_slop);`
`51`	`51`	`}`
`52`	`52`	`} else if (stem_type == "cherry_stabilizer") {`
`53`	`53`	`difference () {`
`@@ -67,13 +67,13 @@ module tines_support(stem_type, stem_support_height, slop) {`
`67`	`67`	`difference () {`
`68`	`68`	`centered_tines(stem_support_height);`
`69`	`69`
`70`		`- inside_cherry_cross(slop);`
	`70`	`+ inside_cherry_cross($stem_inner_slop);`
`71`	`71`	`}`
`72`	`72`	`} else if (stem_type == "rounded_cherry") {`
`73`	`73`	`difference () {`
`74`	`74`	`centered_tines(stem_support_height);`
`75`	`75`
`76`		`- inside_cherry_cross(slop);`
	`76`	`+ inside_cherry_cross($stem_inner_slop);`
`77`	`77`	`}`
`78`	`78`	`} else if (stem_type == "alps"){`
`79`	`79`	`centered_tines(stem_support_height);`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ module box_cherry_stem(depth, slop, throw) {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`// inside cross`
`14`		`- inside_cherry_cross(slop);`
	`14`	`+ inside_cherry_cross($stem_inner_slop);`
`15`	`15`	`}`
`16`	`16`	`}`