add outer cherry bevel

src/settings.scad

@@ -113,7 +113,16 @@ $dish_overdraw_height = 0;
 
 /* [Misc] */
 // There's a bevel on the cherry stems to aid insertion / guard against first layer squishing making a hard-to-fit stem.
-$cherry_bevel = true;
+// Set height to 0 to disable.
+$cherry_bevel_height = 0.5;
+$cherry_bevel_width = 0.4;
+
+// Add bevel to outside of cherry stems.  Set to 0 to disable.
+$cherry_outer_bevel_height = 0;
+$cherry_outer_bevel_width = $cherry_outer_bevel_height;
+
+// Radius of corner on cherry and box_cherry stems
+$cherry_radius = 1;
 
 // How tall in mm the stem support is, if there is any. stem support sits around the keystem and helps to secure it while printing.
 $stem_support_height = .8;

src/stems/box_cherry.scad

@@ -4,10 +4,15 @@ include <cherry.scad>
 module box_cherry_stem(depth, slop, throw) {
   difference(){
     // outside shape
-    linear_extrude(height = depth) {
-      offset(r=1){
-        square(outer_box_cherry_stem(slop) - [2,2], center=true);
-      }
+    hull() {
+      translate([0,0,$cherry_outer_bevel_height])
+      linear_extrude(height = depth-$cherry_outer_bevel_height)
+      offset(r=$cherry_radius)
+      square(outer_box_cherry_stem(slop) - [$cherry_radius*2,$cherry_radius*2], center=true);
+
+      linear_extrude(height = depth)
+      offset(r=$cherry_radius-$cherry_outer_bevel_width)
+      square(outer_box_cherry_stem(slop) - [$cherry_radius*2,$cherry_radius*2], center=true);
     }
 
     // inside cross

src/stems/cherry.scad

@@ -15,21 +15,31 @@ module inside_cherry_cross(slop) {
   }
 
   // Guides to assist insertion and mitigate first layer squishing
-  if ($cherry_bevel){
+  if ($cherry_bevel_height){
     for (i = cherry_cross(slop, extra_vertical)) hull() {
-      linear_extrude(height = $zero, center = false) offset(delta = 0.4) square(i, center=true);
-      translate([0, 0, 0.5]) linear_extrude(height = $zero, center = false)  square(i, center=true);
+      linear_extrude(height = $zero, center = false)
+      offset(delta = $cherry_bevel_width)
+      square(i, center=true);
+
+      translate([0, 0, $cherry_bevel_height-$zero])
+      linear_extrude(height = $zero, center = false)
+      square(i, center=true);
     }
   }
 }
 
 module cherry_stem(depth, slop, throw) {
   difference(){
     // outside shape
-    linear_extrude(height = depth) {
-      offset(r=1){
-        square(outer_cherry_stem(slop) - [2,2], center=true);
-      }
+    hull() {
+      translate([0,0,$cherry_outer_bevel_height])
+      linear_extrude(height = depth - $cherry_outer_bevel_height)
+      offset(r=$cherry_radius)
+      square(outer_cherry_stem(slop) - [$cherry_radius*2,$cherry_radius*2], center=true);
+
+      linear_extrude(height = depth, center = false)
+      offset(r=$cherry_radius-$cherry_outer_bevel_width)
+      square(outer_cherry_stem(slop) - [$cherry_radius*2,$cherry_radius*2], center=true);
     }
 
     inside_cherry_cross($stem_inner_slop);

src/stems/rounded_cherry.scad

@@ -3,7 +3,11 @@ include <cherry.scad>
 
 module rounded_cherry_stem(depth, slop, throw) {
   difference(){
-    cylinder(d=$rounded_cherry_stem_d, h=depth);
+    hull() {
+      translate([0,0,$cherry_outer_bevel_height])
+      cylinder(d=$rounded_cherry_stem_d, h=depth-$cherry_outer_bevel_height);
+      cylinder(d=$rounded_cherry_stem_d-$cherry_outer_bevel_width*2, h=depth);
+    }
 
     // inside cross
     // translation purely for aesthetic purposes, to get rid of that awful lattice