tweaks on mt3/hipro support

Two new dishes; clone of MT3 profile; second HiPro clone with more accurate dishes

README.md

@@ -25,7 +25,19 @@ If you are technically inclined at all, this is definitely the best way to run t
 
 First, you'll need OpenSCAD: http://www.openscad.org/downloads.html. I highly recommend installing the development snapshot, as they generally support more features and are relatively stable. Development snapshots are listed in their own section on the downloads page.
 
-After you have openSCAD installed, you need to download the code and run it. running `git clone https://github.com/rsheldiii/KeyV2.git` if you have git, or downloading [this zip](https://github.com/rsheldiii/KeyV2/archive/master.zip) and extracting the directory should do it. Then all you need to do is open `keys.scad` with openSCAD and you are set! It is possible to edit this project with an external editor by checking off Design => 'Automatic Reload and Preview' in OpenSCAD.
+After you have openSCAD installed, you need to download the code and run it. running `git clone https://github.com/rsheldiii/openSCAD-projects.git` if you have git, or downloading [this zip](https://github.com/rsheldiii/openSCAD-projects/archive/master.zip) and extracting the directory should do it. 
+
+To make your own key, all you need to do is open `keys.scad` with openSCAD and modify this line:
+
+```
+dcs_row(5) legend("⇪", size=9) key();
+``` 
+
+To be whatever you want. For example, this is for a ctrl key on an OEM keyboard:  
+
+```u(1.25) oem_row(3) legend("ctrl", size=4.5) key();```
+
+It is possible to edit this project with an external editor by checking off Design => 'Automatic Reload and Preview' in OpenSCAD.
 
 All examples below assume you are running the library on your computer with OpenSCAD.
 
@@ -78,7 +90,7 @@ These modifier functions may not cover every use case; in that case, you may hav
 
 new to the library and still in a beta state, layouts allows you to generate an entire layout for a keyboard!
 
-It is recommended to use tined stem support and set `$extra_long_stem_support = true` if you plan on printing these keycaps.
+It is recommended to print layouts with a brim that extends to the next key.
 
 ```
 60_percent_default("dcs") key();

TODO.md

@@ -0,0 +1,8 @@
+TODO:
+  * Make flat stem support default
+  * support repositioning to print on the back surface of the keycap
+  * implement regular polygon for skin extrusions
+  * switch to skin-shaped extrusions by default
+  * kailh choc has a non-square key unit; should I get that working for layouts etc? 
+  * move everything over to layouts requiring a child key
+  * add an "errors" or "warnings" or "suggestions" echo section in key.scad, right when the key is being made, so the errors don't get lost / repeated

customizer.scad

@@ -94,10 +94,6 @@ $stem_inset = 0;
 // How many degrees to rotate the stems. useful for sideways keycaps, maybe
 $stem_rotation = 0;
 
-// enable to have stem support extend past the keycap bottom, to (hopefully) the next
-// keycap. only works on tines right now
-$extra_long_stem_support = false;
-
 /* [Shape] */
 
 // Key shape type, determines the shape of the key. default is 'rounded square'
@@ -218,6 +214,12 @@ $3d_surface_step = 10;
 // "flat" / "dished" / "disable"
 $inner_shape_type = "flat";
 
+// When sculpting sides using sculpted_square, how much in should the tops come
+$side_sculpting_factor = 4.5;
+// When sculpting corners, how much extra radius should be added
+$corner_sculpting_factor = 1;
+// When doing more side sculpting corners, how much extra radius should be added
+$more_side_sculpting_factor = 0.4;
 // key width functions
 
 module u(u=1) {
@@ -513,7 +515,6 @@ module g20_row(row=3, column = 0) {
     children();
   }
 }
-// my own measurements
 module hipro_row(row=3, column=0) {
   $key_shape_type = "sculpted_square";
 
@@ -522,7 +523,7 @@ module hipro_row(row=3, column=0) {
 
   $width_difference = ($bottom_key_width - 12.3);
   $height_difference = ($bottom_key_height - 12.65);
-  $dish_type = "spherical";
+  $dish_type = "squared scoop";
   $dish_depth = 0.75;
   $dish_skew_x = 0;
   $dish_skew_y = 0;
@@ -554,6 +555,57 @@ module hipro_row(row=3, column=0) {
     children();
   }
 }
+// This is an imperfect attempt to clone the MT3 profile
+module mt3_row(row=3, column=0, deep_dish=false) {
+  $key_shape_type = "sculpted_square";
+
+  $bottom_key_width = 18.35;
+  $bottom_key_height = 18.6;
+
+  $width_difference = ($bottom_key_width - 13.0);
+  $height_difference = ($bottom_key_height - 13.0);
+  $dish_type = "squared spherical";
+  $dish_depth = deep_dish ? 1.6 : 1.2;
+  $dish_skew_x = 0;
+  $dish_skew_y = 0;
+  $top_skew = 0;
+  $height_slices = 10;
+  $corner_radius = 1;
+
+  $more_side_sculpting_factor = 0.75;
+
+  $top_tilt_y = side_tilt(column);
+  extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;
+
+  if (row == 0){
+    // TODO I didn't change these yet
+    $total_depth = 14.7 + extra_height;
+    $top_tilt = -12.5;
+    children();
+  } else if (row == 1) {
+    $total_depth = 13.1 + extra_height;
+    $top_tilt = -6;
+    children();
+  }  else if (row == 2) {
+    $total_depth = 10.7 + extra_height;
+    $top_tilt = -6;
+    children();
+  } else if (row == 3) {
+    $total_depth = 10.7 + extra_height;
+    $top_tilt = 6;
+    children();
+  } else if (row == 4){
+    $total_depth = 11.6 + extra_height;
+    $top_tilt = 12;
+    children();
+  } else if (row >= 5) {
+    $total_depth = 11.6 + extra_height;
+    $top_tilt = 0;
+    children();
+  } else {
+    children();
+  }
+}
 module grid_row(row=3, column = 0) {
   $bottom_key_width = 18.16;
   $bottom_key_height = 18.16;
@@ -791,6 +843,8 @@ module key_profile(key_profile_type, row, column=0) {
     octagonal_row(row, column) children();
   } else if (key_profile_type == "cherry") {
     cherry_row(row, column) children();
+  } else if (key_profile_type == "mt3") {
+    mt3_row(row, column) children();  
   } else if (key_profile_type == "disable") {
     children();
   } else {
@@ -835,7 +889,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -923,14 +977,15 @@ module iso_enter() {
   /* $top_tilt = 0; */
   $stem_support_type = "disable";
   $key_shape_type = "iso_enter";
-  /* $hull_shape_type = "linear extrude"; */
+  $hull_shape_type = "skin";
   $linear_extrude_height_adjustment = 19.05 * 0.5;
   // this equals (unit_length(1.5) - unit_length(1.25)) / 2
   /* $dish_overdraw_width = 2.38125; */
 
-
-  stabilized(vertical=true) {
-    children();
+  render() {
+    stabilized(vertical=true) {
+      children();
+    }
   }
 }
 // kind of a catch-all at this point for any directive that doesn't fit in the other files
@@ -1235,7 +1290,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -1314,7 +1369,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -2076,12 +2131,12 @@ module ISO_enter_shape(size, delta, progress){
 }
 
 function iso_enter_vertices(size, delta, progress, thickness_difference) = [
-  [                       0-delta.x/2 * progress - thickness_difference/2,                      0 - delta.y / 2 * progress - thickness_difference/2], // top right
-  [                       0-delta.x/2 * progress - thickness_difference/2,               -size[1] + delta.y / 2 * progress + thickness_difference/2], // bottom right
-  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/2,               -size[1] + delta.y / 2 * progress + thickness_difference/2], // bottom left
-  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/2,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // inner middle point
-  [              -size[0] + delta.x/2 * progress + thickness_difference/2,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // outer middle point
-  [              -size[0] + delta.x/2 * progress + thickness_difference/2,                      0 - delta.y / 2 * progress - thickness_difference/2]  // top left
+  [                       0-delta.x/2 * progress - thickness_difference/8,                      0 - delta.y / 2 * progress - thickness_difference/8], // top right
+  [                       0-delta.x/2 * progress - thickness_difference/8,               -size[1] + delta.y / 2 * progress + thickness_difference/8], // bottom right
+  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/8,               -size[1] + delta.y / 2 * progress + thickness_difference/8], // bottom left
+  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/8,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // inner middle point
+  [              -size[0] + delta.x/2 * progress + thickness_difference/8,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // outer middle point
+  [              -size[0] + delta.x/2 * progress + thickness_difference/8,                      0 - delta.y / 2 * progress - thickness_difference/8]  // top left
 ] + [
   [(size[0] * width_ratio)/2, size[1]/2 ],
   [(size[0] * width_ratio)/2, size[1]/2 ],
@@ -2107,19 +2162,11 @@ function skin_iso_enter_shape(size, delta, progress, thickness_difference) =
   );
 // rounded square shape with additional sculpting functions to better approximate
 
-// When sculpting sides, how much in should the tops come
-side_sculpting_factor = 4.5;
-// When sculpting corners, how much extra radius should be added
-corner_sculpting_factor = 1;
-// When doing more side sculpting corners, how much extra radius should be added
-more_side_sculpting_factor = 0.4;
-
-
 // side sculpting functions
 // bows the sides out on stuff like SA and DSA keycaps
-function side_sculpting(progress) = (1 - progress) * side_sculpting_factor;
+function side_sculpting(progress) = (1 - progress) * $side_sculpting_factor;
 // makes the rounded corners of the keycap grow larger as they move upwards
-function corner_sculpting(progress) = pow(progress, 2) * corner_sculpting_factor;
+function corner_sculpting(progress) = pow(progress, 2) * $corner_sculpting_factor;
 
 module sculpted_square_shape(size, delta, progress) {
   width = size[0];
@@ -2144,7 +2191,7 @@ module sculpted_square_shape(size, delta, progress) {
 
   offset(r = extra_corner_radius_this_slice, $fa=360/$shape_facets) {
     offset(r = -extra_corner_radius_this_slice) {
-      side_rounded_square(square_size, r = more_side_sculpting_factor * progress);
+      side_rounded_square(square_size, r = $more_side_sculpting_factor * progress);
     }
   }
 }
@@ -2199,7 +2246,7 @@ function skin_sculpted_square_shape(size, delta, progress, thickness_difference)
       width - extra_width_this_slice - thickness_difference,
       height - extra_height_this_slice - thickness_difference
     ]
-  ) new_side_rounded_square(square_size, more_side_sculpting_factor * progress, extra_corner_radius_this_slice);
+  ) new_side_rounded_square(square_size, $more_side_sculpting_factor * progress, extra_corner_radius_this_slice);
 
 
 module side_rounded_square(size, r) {
@@ -2257,7 +2304,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3081,7 +3128,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3271,7 +3318,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3382,7 +3429,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3457,7 +3504,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3537,7 +3584,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
@@ -3578,7 +3625,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3653,7 +3700,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3737,7 +3784,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){
@@ -3792,7 +3839,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -3937,7 +3984,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -4012,7 +4059,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -4101,12 +4148,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() {
@@ -4116,7 +4163,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() {
@@ -4126,7 +4173,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) {
@@ -4180,7 +4227,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -4255,7 +4302,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -4329,17 +4376,20 @@ module cherry_stem(depth, slop, throw) {
   }
 }
 
+/* NOTE: every reference to total_key_width and total_key_height
+ * is multiplied by two in order to account for offset stems
+ */ 
 module centered_tines(stem_support_height) {
   if ($key_length < 2) {
     translate([0,0,$stem_support_height / 2]) {
-      cube([total_key_width(), 0.5, $stem_support_height], center = true);
+      cube([total_key_width()*2, 0.5, $stem_support_height], center = true);
     }
   }
 
   translate([0,0,$stem_support_height / 2]) {
     cube([
       1,
-      total_key_height(),
+      total_key_height()*2,
       $stem_support_height
     ],
     center = true);
@@ -4347,16 +4397,13 @@ module centered_tines(stem_support_height) {
 }
 
 module tines_support(stem_type, stem_support_height, slop) {
-  extra_height = $extra_long_stem_support ? ($unit - total_key_height()) + 0.1 : -$wall_thickness/4; // fudge
-  extra_width = $extra_long_stem_support ? ($unit - total_key_width()) + 0.1 : -$wall_thickness/4;
-
   if (stem_type == "cherry" || stem_type == "costar_stabilizer") {
     difference () {
       union() {
         if ($key_length < 2) {
           translate([0,0,$stem_support_height / 2]) {
             cube([
-              total_key_width() + extra_width*2,
+              total_key_width()*2,
               0.5,
               $stem_support_height
             ], center = true);
@@ -4368,14 +4415,14 @@ module tines_support(stem_type, stem_support_height, slop) {
           translate([x,0,$stem_support_height / 2]) {
             cube([
               0.5,
-              total_key_height() + extra_height*2, // this is to extend past
+              total_key_height()*2, // this is to extend past
               $stem_support_height
             ], center = true);
           }
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference () {
@@ -4383,7 +4430,7 @@ module tines_support(stem_type, stem_support_height, slop) {
         translate([x,0,$stem_support_height / 2]) {
           cube([
             1,
-            total_key_height($wall_thickness),
+            total_key_height()*2,
             $stem_support_height
           ], center = true);
         }
@@ -4395,20 +4442,20 @@ 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);
   } else if (stem_type == "choc"){
-    if ($key_length < 2) translate([0,0,$stem_support_height / 2]) cube([total_key_width($wall_thickness)+$wall_thickness/4, 0.42, $stem_support_height], center = true);
-    /* translate([-5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height($wall_thickness), $stem_support_height], center = true); */
-    /* translate([5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height($wall_thickness), $stem_support_height], center = true); */
+    if ($key_length < 2) translate([0,0,$stem_support_height / 2]) cube([total_key_width(), 0.42, $stem_support_height], center = true);
+    /* translate([-5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height(), $stem_support_height], center = true); */
+    /* translate([5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height(), $stem_support_height], center = true); */
   }
 }
 
@@ -4618,6 +4665,62 @@ module spherical_dish(width, height, depth, inverted){
     }
   }
 }
+module squared_spherical_dish(width, height, depth, inverted=false) {
+    chord = pow(pow(height / 2, 2) + pow(width / 2, 2),0.5);
+    direction = inverted ? -1 : 1;
+    r=max(height,width,chord) / 5;
+    // ^^^^^ Nothing special about this code to figure out r.
+    // I just modeled up 1u, 1.25u, 1.5u, 2u, 2.25u, and 2.75u
+    // keys and messed around until I came up with something that
+    // looked reasonable for all key sizes.  This just seems to work
+    // well for all sizes
+
+    translate([-width / 2, -height / 2, 0 * direction]) {
+      resize([width, height, depth])
+        hull() {
+          cube([chord,chord,0.001]);
+          // Use something larger in this translate than -depth 
+          // (like -chord) if you want more of a defined circle
+          // in the keywell
+          translate([chord/2, chord/2, -depth]) 
+            sphere(r=r, $fn=128);
+        }
+    }
+}
+module squared_scoop_dish(height, width, depth, r=0.5, inverted=false, num=4, den=5){
+  // changable numerator/denoninator on where to place the square's corners
+  // for example, num=2, den=3 means the dish will happen at 1/3 and 2/3 the
+  // width and the height.  Defaults to 4/5. Customizable when calling 
+  // this module
+  //
+  // This was initially intended for the scoop on the HiPro, since that's what
+  // it uses.  Use "hipro_row()" if that's what you'd like.  However, I do NOT
+  // know how close the inner square is for the HiPro keycaps.  In fact, it could
+  // just be a sphere, in which the "squared spherical" scoop is more appropriate.
+  // If, however, it the "squared scoop" makes sense, you can adjust where the square
+  // lands with the num (numerator) and den (denominator) variables.  For instance,
+  // "3" and "4" mean 3/4 of the width/height is where the flat part starts.
+
+  chord = pow(pow(height/2, 2) + pow(width/2, 2),0.5);
+  direction = inverted ? -1 : 1;
+
+  //This is the set of points to hull around for the scoop
+  points=[
+    [height/den - height/2, width/den - width/2, -chord],
+    [num*height/den - height/2, width/den - width/2, -chord],
+    [height/den - height/2, num*width/den - width/2, -chord],
+    [num*height/den - height/2, num*width/den - width/2, -chord]
+  ];
+
+  resize([height,width,depth])
+    hull() {
+      shape_slice(1,0,0);
+      for(i=[0:len(points)-1]) {
+        translate(points[i])
+          sphere(r=r,$fn=64);
+      }
+  }
+}
 module flat_dish(width, height, depth, inverted){
   cube([width + 100,height + 100, depth], center=true);
 }
@@ -4661,7 +4764,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -4795,11 +4898,9 @@ geodesic=false;
 module  dish(width, height, depth, inverted) {
     if($dish_type == "cylindrical"){
       cylindrical_dish(width, height, depth, inverted);
-    }
-    else if ($dish_type == "spherical") {
+    } else if ($dish_type == "spherical") {
       spherical_dish(width, height, depth, inverted);
-    }
-    else if ($dish_type == "sideways cylindrical"){
+    } else if ($dish_type == "sideways cylindrical"){
       sideways_cylindrical_dish(width, height, depth, inverted);
     } else if ($dish_type == "old spherical") {
       old_spherical_dish(width, height, depth, inverted);
@@ -4809,6 +4910,10 @@ module  dish(width, height, depth, inverted) {
       flat_dish(width, height, depth, inverted);
     } else if ($dish_type == "disable") {
       // else no dish
+    } else if ($dish_type == "squared spherical") {
+      squared_spherical_dish(width, height, depth, inverted=inverted);
+    } else if ($dish_type == "squared scoop") {
+      squared_scoop_dish(width, height, depth, inverted=inverted);
     } else {
       echo("WARN: $dish_type unsupported");
     }
@@ -4851,7 +4956,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps
@@ -5092,13 +5197,13 @@ module linear_extrude_shape_hull(thickness_difference, depth_difference, extra_s
 module hull_shape_hull(thickness_difference, depth_difference, extra_slices = 0) {
   for (index = [0:$height_slices - 1 + extra_slices]) {
     hull() {
-      shape_slice(index / $height_slices, thickness_difference, depth_difference);
-      shape_slice((index + 1) / $height_slices, thickness_difference, depth_difference);
+      placed_shape_slice(index / $height_slices, thickness_difference, depth_difference);
+      placed_shape_slice((index + 1) / $height_slices, thickness_difference, depth_difference);
     }
   }
 }
 
-module shape_slice(progress, thickness_difference, depth_difference) {
+module placed_shape_slice(progress, thickness_difference, depth_difference) {
   skew_this_slice = $top_skew * progress;
   x_skew_this_slice = $top_skew_x * progress;
 
@@ -5109,20 +5214,24 @@ module shape_slice(progress, thickness_difference, depth_difference) {
 
   translate([x_skew_this_slice, skew_this_slice, depth_this_slice]) {
     rotate([tilt_this_slice,y_tilt_this_slice,0]){
-      linear_extrude(height = SMALLEST_POSSIBLE, scale = 1){
-        key_shape(
-          [
-            total_key_width(thickness_difference),
-            total_key_height(thickness_difference)
-          ],
-          [$width_difference, $height_difference],
-          progress
-        );
-      }
+      shape_slice(progress, thickness_difference, depth_difference);
     }
   }
 }
 
+module shape_slice(progress, thickness_difference, depth_difference) {
+  linear_extrude(height = SMALLEST_POSSIBLE, scale = 1){
+    key_shape(
+      [
+        total_key_width(thickness_difference),
+        total_key_height(thickness_difference)
+      ],
+      [$width_difference, $height_difference],
+      progress
+    );
+  }
+}
+
 // basic key shape, no dish, no inside
 // which is only used for dishing to cut the dish off correctly
 // $height_difference used for keytop thickness
@@ -6089,7 +6198,6 @@ module shape(thickness_difference, depth_difference=0){
   }
 }
 
-// Not currently used due to CGAL errors. Rounds the shape via minkowski
 module rounded_shape() {
   color($primary_color) minkowski(){
     // half minkowski in the z direction
@@ -6178,9 +6286,9 @@ module top_placement(depth_difference=0) {
   top_tilt_by_height = -$top_tilt / $key_height;
   top_tilt_y_by_length = $double_sculpted ? (-$top_tilt_y / $key_length) : 0;
 
-  minkowski_height = $rounded_key ? $minkowski_radius : 0;
+  // minkowski_height = $rounded_key ? $minkowski_radius : 0;
 
-  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference + minkowski_height/2]){
+  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference]){
     rotate([top_tilt_by_height, top_tilt_y_by_length,0]){
       children();
     }
@@ -6300,7 +6408,9 @@ module outer_total_shape(inset=false) {
 // takes all the bits and glues them together. requires configuration with special variables.
 module key(inset=false) {
   difference(){
-    outer_total_shape(inset);
+    outer_total_shape(inset) {
+      children();
+    };
 
     if ($inner_shape_type != "disable") {
       translate([0,0,-SMALLEST_POSSIBLE]) {
@@ -6403,10 +6513,6 @@ $stem_inset = 0;
 // How many degrees to rotate the stems. useful for sideways keycaps, maybe
 $stem_rotation = 0;
 
-// enable to have stem support extend past the keycap bottom, to (hopefully) the next
-// keycap. only works on tines right now
-$extra_long_stem_support = false;
-
 /* [Shape] */
 
 // Key shape type, determines the shape of the key. default is 'rounded square'
@@ -6526,7 +6632,13 @@ $3d_surface_step = 10;
 
 // "flat" / "dished" / "disable"
 $inner_shape_type = "flat";
-  key();
+
+// When sculpting sides using sculpted_square, how much in should the tops come
+$side_sculpting_factor = 4.5;
+// When sculpting corners, how much extra radius should be added
+$corner_sculpting_factor = 1;
+// When doing more side sculpting corners, how much extra radius should be added
+$more_side_sculpting_factor = 0.4;  key();
 }
 
 if (!$using_customizer) {

keys.scad

@@ -17,4 +17,4 @@ dcs_row(5) legend("⇪", size=9) key();
 } */
 
 // example layout
-/* preonic_default("dcs"); */
+/* preonic_default("dcs") key(); */

src/dishes.scad

@@ -4,6 +4,8 @@ include <dishes/cylindrical.scad>
 include <dishes/old_spherical.scad>
 include <dishes/sideways_cylindrical.scad>
 include <dishes/spherical.scad>
+include <dishes/squared_spherical.scad>
+include <dishes/squared_scoop.scad>
 include <dishes/flat.scad>
 include <dishes/3d_surface.scad>
 
@@ -14,11 +16,9 @@ geodesic=false;
 module  dish(width, height, depth, inverted) {
     if($dish_type == "cylindrical"){
       cylindrical_dish(width, height, depth, inverted);
-    }
-    else if ($dish_type == "spherical") {
+    } else if ($dish_type == "spherical") {
       spherical_dish(width, height, depth, inverted);
-    }
-    else if ($dish_type == "sideways cylindrical"){
+    } else if ($dish_type == "sideways cylindrical"){
       sideways_cylindrical_dish(width, height, depth, inverted);
     } else if ($dish_type == "old spherical") {
       old_spherical_dish(width, height, depth, inverted);
@@ -28,6 +28,10 @@ module  dish(width, height, depth, inverted) {
       flat_dish(width, height, depth, inverted);
     } else if ($dish_type == "disable") {
       // else no dish
+    } else if ($dish_type == "squared spherical") {
+      squared_spherical_dish(width, height, depth, inverted=inverted);
+    } else if ($dish_type == "squared scoop") {
+      squared_scoop_dish(width, height, depth, inverted=inverted);
     } else {
       echo("WARN: $dish_type unsupported");
     }

src/dishes/squared_scoop.scad

@@ -0,0 +1,34 @@
+module squared_scoop_dish(height, width, depth, r=0.5, inverted=false, num=4, den=5){
+  // changable numerator/denoninator on where to place the square's corners
+  // for example, num=2, den=3 means the dish will happen at 1/3 and 2/3 the
+  // width and the height.  Defaults to 4/5. Customizable when calling 
+  // this module
+  //
+  // This was initially intended for the scoop on the HiPro, since that's what
+  // it uses.  Use "hipro_row()" if that's what you'd like.  However, I do NOT
+  // know how close the inner square is for the HiPro keycaps.  In fact, it could
+  // just be a sphere, in which the "squared spherical" scoop is more appropriate.
+  // If, however, it the "squared scoop" makes sense, you can adjust where the square
+  // lands with the num (numerator) and den (denominator) variables.  For instance,
+  // "3" and "4" mean 3/4 of the width/height is where the flat part starts.
+
+  chord = pow(pow(height/2, 2) + pow(width/2, 2),0.5);
+  direction = inverted ? -1 : 1;
+
+  //This is the set of points to hull around for the scoop
+  points=[
+    [height/den - height/2, width/den - width/2, -chord],
+    [num*height/den - height/2, width/den - width/2, -chord],
+    [height/den - height/2, num*width/den - width/2, -chord],
+    [num*height/den - height/2, num*width/den - width/2, -chord]
+  ];
+
+  resize([height,width,depth])
+    hull() {
+      shape_slice(1,0,0);
+      for(i=[0:len(points)-1]) {
+        translate(points[i])
+          sphere(r=r,$fn=64);
+      }
+  }
+}

src/dishes/squared_spherical.scad

@@ -0,0 +1,22 @@
+module squared_spherical_dish(width, height, depth, inverted=false) {
+    chord = pow(pow(height / 2, 2) + pow(width / 2, 2),0.5);
+    direction = inverted ? -1 : 1;
+    r=max(height,width,chord) / 5;
+    // ^^^^^ Nothing special about this code to figure out r.
+    // I just modeled up 1u, 1.25u, 1.5u, 2u, 2.25u, and 2.75u
+    // keys and messed around until I came up with something that
+    // looked reasonable for all key sizes.  This just seems to work
+    // well for all sizes
+
+    translate([-width / 2, -height / 2, 0 * direction]) {
+      resize([width, height, depth])
+        hull() {
+          cube([chord,chord,0.001]);
+          // Use something larger in this translate than -depth 
+          // (like -chord) if you want more of a defined circle
+          // in the keywell
+          translate([chord/2, chord/2, -depth]) 
+            sphere(r=r, $fn=128);
+        }
+    }
+}

src/functions.scad

@@ -33,7 +33,7 @@ function top_total_key_height() = $bottom_key_height + ($unit * ($key_height - 1
 
 function side_tilt(column) = asin($unit * column / $double_sculpt_radius);
 // tan of 0 is 0, division by 0 is nan, so we have to guard
-function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - (unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
+function extra_side_tilt_height(column) = side_tilt(column) ? ($double_sculpt_radius - ($unit * abs(column)) / tan(abs(side_tilt(column)))) : 0;
 
 // (I think) extra length of the side of the keycap due to the keytop being tilted.
 // necessary for calculating flat sided keycaps

src/hulls/hull.scad

@@ -1,13 +1,13 @@
 module hull_shape_hull(thickness_difference, depth_difference, extra_slices = 0) {
   for (index = [0:$height_slices - 1 + extra_slices]) {
     hull() {
-      shape_slice(index / $height_slices, thickness_difference, depth_difference);
-      shape_slice((index + 1) / $height_slices, thickness_difference, depth_difference);
+      placed_shape_slice(index / $height_slices, thickness_difference, depth_difference);
+      placed_shape_slice((index + 1) / $height_slices, thickness_difference, depth_difference);
     }
   }
 }
 
-module shape_slice(progress, thickness_difference, depth_difference) {
+module placed_shape_slice(progress, thickness_difference, depth_difference) {
   skew_this_slice = $top_skew * progress;
   x_skew_this_slice = $top_skew_x * progress;
 
@@ -18,16 +18,20 @@ module shape_slice(progress, thickness_difference, depth_difference) {
 
   translate([x_skew_this_slice, skew_this_slice, depth_this_slice]) {
     rotate([tilt_this_slice,y_tilt_this_slice,0]){
-      linear_extrude(height = SMALLEST_POSSIBLE, scale = 1){
-        key_shape(
-          [
-            total_key_width(thickness_difference),
-            total_key_height(thickness_difference)
-          ],
-          [$width_difference, $height_difference],
-          progress
-        );
-      }
+      shape_slice(progress, thickness_difference, depth_difference);
     }
   }
 }
+
+module shape_slice(progress, thickness_difference, depth_difference) {
+  linear_extrude(height = SMALLEST_POSSIBLE, scale = 1){
+    key_shape(
+      [
+        total_key_width(thickness_difference),
+        total_key_height(thickness_difference)
+      ],
+      [$width_difference, $height_difference],
+      progress
+    );
+  }
+}

src/key.scad

@@ -24,7 +24,6 @@ module shape(thickness_difference, depth_difference=0){
   }
 }
 
-// Not currently used due to CGAL errors. Rounds the shape via minkowski
 module rounded_shape() {
   color($primary_color) minkowski(){
     // half minkowski in the z direction
@@ -113,9 +112,9 @@ module top_placement(depth_difference=0) {
   top_tilt_by_height = -$top_tilt / $key_height;
   top_tilt_y_by_length = $double_sculpted ? (-$top_tilt_y / $key_length) : 0;
 
-  minkowski_height = $rounded_key ? $minkowski_radius : 0;
+  // minkowski_height = $rounded_key ? $minkowski_radius : 0;
 
-  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference + minkowski_height/2]){
+  translate([$top_skew_x + $dish_skew_x, $top_skew + $dish_skew_y, $total_depth - depth_difference]){
     rotate([top_tilt_by_height, top_tilt_y_by_length,0]){
       children();
     }
@@ -235,7 +234,9 @@ module outer_total_shape(inset=false) {
 // takes all the bits and glues them together. requires configuration with special variables.
 module key(inset=false) {
   difference(){
-    outer_total_shape(inset);
+    outer_total_shape(inset) {
+      children();
+    };
 
     if ($inner_shape_type != "disable") {
       translate([0,0,-SMALLEST_POSSIBLE]) {

src/key_profiles.scad

@@ -8,6 +8,7 @@ include <key_profiles/dsa.scad>
 include <key_profiles/sa.scad>
 include <key_profiles/g20.scad>
 include <key_profiles/hipro.scad>
+include <key_profiles/mt3.scad>
 include <key_profiles/grid.scad>
 include <key_profiles/regular_polygon.scad>
 include <key_profiles/cherry.scad>
@@ -37,6 +38,8 @@ module key_profile(key_profile_type, row, column=0) {
     octagonal_row(row, column) children();
   } else if (key_profile_type == "cherry") {
     cherry_row(row, column) children();
+  } else if (key_profile_type == "mt3") {
+    mt3_row(row, column) children();  
   } else if (key_profile_type == "disable") {
     children();
   } else {

src/key_profiles/hipro.scad

@@ -1,4 +1,3 @@
-// my own measurements
 module hipro_row(row=3, column=0) {
   $key_shape_type = "sculpted_square";
 
@@ -7,7 +6,7 @@ module hipro_row(row=3, column=0) {
 
   $width_difference = ($bottom_key_width - 12.3);
   $height_difference = ($bottom_key_height - 12.65);
-  $dish_type = "spherical";
+  $dish_type = "squared scoop";
   $dish_depth = 0.75;
   $dish_skew_x = 0;
   $dish_skew_y = 0;

src/key_profiles/mt3.scad

@@ -0,0 +1,51 @@
+// This is an imperfect attempt to clone the MT3 profile
+module mt3_row(row=3, column=0, deep_dish=false) {
+  $key_shape_type = "sculpted_square";
+
+  $bottom_key_width = 18.35;
+  $bottom_key_height = 18.6;
+
+  $width_difference = ($bottom_key_width - 13.0);
+  $height_difference = ($bottom_key_height - 13.0);
+  $dish_type = "squared spherical";
+  $dish_depth = deep_dish ? 1.6 : 1.2;
+  $dish_skew_x = 0;
+  $dish_skew_y = 0;
+  $top_skew = 0;
+  $height_slices = 10;
+  $corner_radius = 1;
+
+  $more_side_sculpting_factor = 0.75;
+
+  $top_tilt_y = side_tilt(column);
+  extra_height =  $double_sculpted ? extra_side_tilt_height(column) : 0;
+
+  if (row == 0){
+    // TODO I didn't change these yet
+    $total_depth = 14.7 + extra_height;
+    $top_tilt = -12.5;
+    children();
+  } else if (row == 1) {
+    $total_depth = 13.1 + extra_height;
+    $top_tilt = -6;
+    children();
+  }  else if (row == 2) {
+    $total_depth = 10.7 + extra_height;
+    $top_tilt = -6;
+    children();
+  } else if (row == 3) {
+    $total_depth = 10.7 + extra_height;
+    $top_tilt = 6;
+    children();
+  } else if (row == 4){
+    $total_depth = 11.6 + extra_height;
+    $top_tilt = 12;
+    children();
+  } else if (row >= 5) {
+    $total_depth = 11.6 + extra_height;
+    $top_tilt = 0;
+    children();
+  } else {
+    children();
+  }
+}

src/key_types.scad

@@ -50,13 +50,14 @@ module iso_enter() {
   /* $top_tilt = 0; */
   $stem_support_type = "disable";
   $key_shape_type = "iso_enter";
-  /* $hull_shape_type = "linear extrude"; */
+  $hull_shape_type = "skin";
   $linear_extrude_height_adjustment = 19.05 * 0.5;
   // this equals (unit_length(1.5) - unit_length(1.25)) / 2
   /* $dish_overdraw_width = 2.38125; */
 
-
-  stabilized(vertical=true) {
-    children();
+  render() {
+    stabilized(vertical=true) {
+      children();
+    }
   }
 }

src/layouts/60_percent/default.scad

@@ -17,5 +17,5 @@ include <../layout.scad>
 ];
 
 module 60_percent_default(profile) {
-  layout(60_percent_default_layout, profile, 60_percent_legends) children();
+  layout(60_percent_default_layout, profile, 60_percent_legends, row_sculpting_offset=1) children();
 }

src/settings.scad

@@ -79,10 +79,6 @@ $stem_inset = 0;
 // How many degrees to rotate the stems. useful for sideways keycaps, maybe
 $stem_rotation = 0;
 
-// enable to have stem support extend past the keycap bottom, to (hopefully) the next
-// keycap. only works on tines right now
-$extra_long_stem_support = false;
-
 /* [Shape] */
 
 // Key shape type, determines the shape of the key. default is 'rounded square'
@@ -202,3 +198,10 @@ $3d_surface_step = 10;
 
 // "flat" / "dished" / "disable"
 $inner_shape_type = "flat";
+
+// When sculpting sides using sculpted_square, how much in should the tops come
+$side_sculpting_factor = 4.5;
+// When sculpting corners, how much extra radius should be added
+$corner_sculpting_factor = 1;
+// When doing more side sculpting corners, how much extra radius should be added
+$more_side_sculpting_factor = 0.4;

src/shapes/ISO_enter.scad

@@ -38,12 +38,12 @@ module ISO_enter_shape(size, delta, progress){
 }
 
 function iso_enter_vertices(size, delta, progress, thickness_difference) = [
-  [                       0-delta.x/2 * progress - thickness_difference/2,                      0 - delta.y / 2 * progress - thickness_difference/2], // top right
-  [                       0-delta.x/2 * progress - thickness_difference/2,               -size[1] + delta.y / 2 * progress + thickness_difference/2], // bottom right
-  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/2,               -size[1] + delta.y / 2 * progress + thickness_difference/2], // bottom left
-  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/2,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // inner middle point
-  [              -size[0] + delta.x/2 * progress + thickness_difference/2,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // outer middle point
-  [              -size[0] + delta.x/2 * progress + thickness_difference/2,                      0 - delta.y / 2 * progress - thickness_difference/2]  // top left
+  [                       0-delta.x/2 * progress - thickness_difference/8,                      0 - delta.y / 2 * progress - thickness_difference/8], // top right
+  [                       0-delta.x/2 * progress - thickness_difference/8,               -size[1] + delta.y / 2 * progress + thickness_difference/8], // bottom right
+  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/8,               -size[1] + delta.y / 2 * progress + thickness_difference/8], // bottom left
+  [-size[0] * width_ratio + delta.x/2 * progress + thickness_difference/8,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // inner middle point
+  [              -size[0] + delta.x/2 * progress + thickness_difference/8,-size[1] * height_ratio + delta.y / 2 * progress + thickness_difference/2], // outer middle point
+  [              -size[0] + delta.x/2 * progress + thickness_difference/8,                      0 - delta.y / 2 * progress - thickness_difference/8]  // top left
 ] + [
   [(size[0] * width_ratio)/2, size[1]/2 ],
   [(size[0] * width_ratio)/2, size[1]/2 ],

src/shapes/sculpted_square.scad

@@ -1,18 +1,10 @@
 // rounded square shape with additional sculpting functions to better approximate
 
-// When sculpting sides, how much in should the tops come
-side_sculpting_factor = 4.5;
-// When sculpting corners, how much extra radius should be added
-corner_sculpting_factor = 1;
-// When doing more side sculpting corners, how much extra radius should be added
-more_side_sculpting_factor = 0.4;
-
-
 // side sculpting functions
 // bows the sides out on stuff like SA and DSA keycaps
-function side_sculpting(progress) = (1 - progress) * side_sculpting_factor;
+function side_sculpting(progress) = (1 - progress) * $side_sculpting_factor;
 // makes the rounded corners of the keycap grow larger as they move upwards
-function corner_sculpting(progress) = pow(progress, 2) * corner_sculpting_factor;
+function corner_sculpting(progress) = pow(progress, 2) * $corner_sculpting_factor;
 
 module sculpted_square_shape(size, delta, progress) {
   width = size[0];
@@ -37,7 +29,7 @@ module sculpted_square_shape(size, delta, progress) {
 
   offset(r = extra_corner_radius_this_slice, $fa=360/$shape_facets) {
     offset(r = -extra_corner_radius_this_slice) {
-      side_rounded_square(square_size, r = more_side_sculpting_factor * progress);
+      side_rounded_square(square_size, r = $more_side_sculpting_factor * progress);
     }
   }
 }
@@ -92,7 +84,7 @@ function skin_sculpted_square_shape(size, delta, progress, thickness_difference)
       width - extra_width_this_slice - thickness_difference,
       height - extra_height_this_slice - thickness_difference
     ]
-  ) new_side_rounded_square(square_size, more_side_sculpting_factor * progress, extra_corner_radius_this_slice);
+  ) new_side_rounded_square(square_size, $more_side_sculpting_factor * progress, extra_corner_radius_this_slice);
 
 
 module side_rounded_square(size, r) {

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) {

src/stem_supports/tines.scad

@@ -1,17 +1,20 @@
 include <../functions.scad>
 include <../stems/cherry.scad>
 
+/* NOTE: every reference to total_key_width and total_key_height
+ * is multiplied by two in order to account for offset stems
+ */ 
 module centered_tines(stem_support_height) {
   if ($key_length < 2) {
     translate([0,0,$stem_support_height / 2]) {
-      cube([total_key_width(), 0.5, $stem_support_height], center = true);
+      cube([total_key_width()*2, 0.5, $stem_support_height], center = true);
     }
   }
 
   translate([0,0,$stem_support_height / 2]) {
     cube([
       1,
-      total_key_height(),
+      total_key_height()*2,
       $stem_support_height
     ],
     center = true);
@@ -19,16 +22,13 @@ module centered_tines(stem_support_height) {
 }
 
 module tines_support(stem_type, stem_support_height, slop) {
-  extra_height = $extra_long_stem_support ? ($unit - total_key_height()) + 0.1 : -$wall_thickness/4; // fudge
-  extra_width = $extra_long_stem_support ? ($unit - total_key_width()) + 0.1 : -$wall_thickness/4;
-
   if (stem_type == "cherry" || stem_type == "costar_stabilizer") {
     difference () {
       union() {
         if ($key_length < 2) {
           translate([0,0,$stem_support_height / 2]) {
             cube([
-              total_key_width() + extra_width*2,
+              total_key_width()*2,
               0.5,
               $stem_support_height
             ], center = true);
@@ -40,14 +40,14 @@ module tines_support(stem_type, stem_support_height, slop) {
           translate([x,0,$stem_support_height / 2]) {
             cube([
               0.5,
-              total_key_height() + extra_height*2, // this is to extend past
+              total_key_height()*2, // this is to extend past
               $stem_support_height
             ], center = true);
           }
         }
       }
 
-      inside_cherry_cross(slop);
+      inside_cherry_cross($stem_inner_slop);
     }
   } else if (stem_type == "cherry_stabilizer") {
     difference () {
@@ -55,7 +55,7 @@ module tines_support(stem_type, stem_support_height, slop) {
         translate([x,0,$stem_support_height / 2]) {
           cube([
             1,
-            total_key_height($wall_thickness),
+            total_key_height()*2,
             $stem_support_height
           ], center = true);
         }
@@ -67,19 +67,19 @@ 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);
   } else if (stem_type == "choc"){
-    if ($key_length < 2) translate([0,0,$stem_support_height / 2]) cube([total_key_width($wall_thickness)+$wall_thickness/4, 0.42, $stem_support_height], center = true);
-    /* translate([-5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height($wall_thickness), $stem_support_height], center = true); */
-    /* translate([5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height($wall_thickness), $stem_support_height], center = true); */
+    if ($key_length < 2) translate([0,0,$stem_support_height / 2]) cube([total_key_width(), 0.42, $stem_support_height], center = true);
+    /* translate([-5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height(), $stem_support_height], center = true); */
+    /* translate([5.7/2,0,$stem_support_height / 2]) cube([0.5, total_key_height(), $stem_support_height], center = true); */
   }
 }

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);
   }
 }

src/stems/rounded_cherry.scad

@@ -7,6 +7,6 @@ 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);
   }
 }

yarn.lock

@@ -445,12 +445,12 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-props@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.4.tgz#93bb1cadfafd31da5bb8a9d4b41f471ec3a72dfe"
-  integrity sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2"
+  integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==
   dependencies:
-    each-props "^1.3.0"
-    is-plain-object "^2.0.1"
+    each-props "^1.3.2"
+    is-plain-object "^5.0.0"
 
 core-util-is@~1.0.0:
   version "1.0.2"
@@ -538,7 +538,7 @@ duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-each-props@^1.3.0:
+each-props@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
   integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
@@ -1013,9 +1013,9 @@ homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -1178,6 +1178,11 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
@@ -1624,9 +1629,9 @@ path-is-absolute@^1.0.0:
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
@@ -2348,9 +2353,9 @@ xtend@~4.0.0, xtend@~4.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 yargs-parser@^5.0.0:
   version "5.0.1"