resin settings, some tines support tweaks

Fix preonic_default example

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

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'
@@ -835,7 +831,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,7 +919,7 @@ 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; */
@@ -1134,7 +1130,7 @@ module upside_down() {
 module sideways() {
   $key_shape_type = "flat_sided_square";
   $dish_overdraw_width = abs(extra_keytop_length_for_flat_sides());
-  extra_y_rotation = atan2($width_difference/2,$total_depth);
+  extra_y_rotation = atan2($width_difference/2,$total_depth); // TODO assumes centered top
   translate([0,0,cos(extra_y_rotation) * total_key_width()/2])
   rotate([0,90 + extra_y_rotation ,0]) children();
 }
@@ -1162,7 +1158,14 @@ module auto_place() {
     translate_u(x,-y) children(child_index);
   }
 }
-module arrows(profile, rows = [4,4,4,3]) {
+
+// suggested settings for resin prints
+module resin() {
+  $stem_slop = 0;
+  $stem_inner_slop = 0;
+  $stem_support_type = "disable";
+  children();
+}module arrows(profile, rows = [4,4,4,3]) {
   positions = [[0, 0], [1, 0], [2, 0], [1, 1]];
   legends = ["←", "↓", "→", "↑"];
 
@@ -1236,7 +1239,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
@@ -1315,7 +1318,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
@@ -2077,12 +2080,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 ],
@@ -2258,7 +2261,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
@@ -3082,7 +3085,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
@@ -3272,7 +3275,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
@@ -3312,7 +3315,7 @@ function unit_length(length) = $unit * (length - 1) + 18.16;
 
 // extra length to the vertical tine of the inside cherry cross
 // splits the stem into halves - allows easier fitment
-extra_vertical = 0.6;
+extra_vertical = 100;
 
 module inside_cherry_cross(slop) {
   // inside cross
@@ -3383,7 +3386,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
@@ -3458,7 +3461,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
@@ -3498,7 +3501,7 @@ function unit_length(length) = $unit * (length - 1) + 18.16;
 
 // extra length to the vertical tine of the inside cherry cross
 // splits the stem into halves - allows easier fitment
-extra_vertical = 0.6;
+extra_vertical = 100;
 
 module inside_cherry_cross(slop) {
   // inside cross
@@ -3538,7 +3541,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
@@ -3579,7 +3582,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
@@ -3654,7 +3657,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
@@ -3694,7 +3697,7 @@ function unit_length(length) = $unit * (length - 1) + 18.16;
 
 // extra length to the vertical tine of the inside cherry cross
 // splits the stem into halves - allows easier fitment
-extra_vertical = 0.6;
+extra_vertical = 100;
 
 module inside_cherry_cross(slop) {
   // inside cross
@@ -3738,7 +3741,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){
@@ -3793,7 +3796,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
@@ -3938,7 +3941,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
@@ -4013,7 +4016,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
@@ -4053,7 +4056,7 @@ function unit_length(length) = $unit * (length - 1) + 18.16;
 
 // extra length to the vertical tine of the inside cherry cross
 // splits the stem into halves - allows easier fitment
-extra_vertical = 0.6;
+extra_vertical = 100;
 
 module inside_cherry_cross(slop) {
   // inside cross
@@ -4102,12 +4105,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() {
@@ -4117,7 +4120,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() {
@@ -4127,7 +4130,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) {
@@ -4181,7 +4184,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
@@ -4256,7 +4259,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
@@ -4296,7 +4299,7 @@ function unit_length(length) = $unit * (length - 1) + 18.16;
 
 // extra length to the vertical tine of the inside cherry cross
 // splits the stem into halves - allows easier fitment
-extra_vertical = 0.6;
+extra_vertical = 100;
 
 module inside_cherry_cross(slop) {
   // inside cross
@@ -4330,17 +4333,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);
@@ -4348,16 +4354,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);
@@ -4365,18 +4368,18 @@ module tines_support(stem_type, stem_support_height, slop) {
         }
 
         // 2 vertical tines holding either side of the cruciform
-        for (x = [1.15, -1.15]) {
+        for (x = [2, -2]) {
           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 () {
@@ -4384,7 +4387,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);
         }
@@ -4396,20 +4399,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); */
   }
 }
 
@@ -4662,7 +4665,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
@@ -4852,7 +4855,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
@@ -6404,10 +6407,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'

keys.scad

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

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/key_transformations.scad

@@ -195,7 +195,7 @@ module upside_down() {
 module sideways() {
   $key_shape_type = "flat_sided_square";
   $dish_overdraw_width = abs(extra_keytop_length_for_flat_sides());
-  extra_y_rotation = atan2($width_difference/2,$total_depth);
+  extra_y_rotation = atan2($width_difference/2,$total_depth); // TODO assumes centered top
   translate([0,0,cos(extra_y_rotation) * total_key_width()/2])
   rotate([0,90 + extra_y_rotation ,0]) children();
 }
@@ -223,3 +223,11 @@ module auto_place() {
     translate_u(x,-y) children(child_index);
   }
 }
+
+// suggested settings for resin prints
+module resin() {
+  $stem_slop = 0;
+  $stem_inner_slop = 0;
+  $stem_support_type = "disable";
+  children();
+}

src/key_types.scad

@@ -50,7 +50,7 @@ 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; */

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'

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/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);
@@ -36,18 +36,18 @@ module tines_support(stem_type, stem_support_height, slop) {
         }
 
         // 2 vertical tines holding either side of the cruciform
-        for (x = [1.15, -1.15]) {
+        for (x = [2, -2]) {
           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/cherry.scad

@@ -2,7 +2,7 @@ include <../functions.scad>
 
 // extra length to the vertical tine of the inside cherry cross
 // splits the stem into halves - allows easier fitment
-extra_vertical = 0.6;
+extra_vertical = 100;
 
 module inside_cherry_cross(slop) {
   // inside cross

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"