From f252ec2c30c75e07c00cb0ed7d5be10c6f0972c1 Mon Sep 17 00:00:00 2001
From: Bob - Home - Windows <rsheldiii@gmail.com>
Date: Sun, 10 Dec 2017 15:53:44 -0500
Subject: [PATCH] try to get some numbers closer for the iso enter

---
 key.scad    |  5 +++--
 keys.scad   | 15 +++++++--------
 shapes.scad | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/key.scad b/key.scad
index 9abaaff..444d160 100644
--- a/key.scad
+++ b/key.scad
@@ -159,7 +159,7 @@ module rounded_shape() {
 module shape_hull(thickness_difference, depth_difference, extra_slices = 0){
 	render() {
 		if ($linear_extrude_shape) {
-			linear_extrude_shape_hull(thickness_difference, depth_difference);
+				linear_extrude_shape_hull(thickness_difference, depth_difference, extra_slices);
 		} else {
 			hull_shape_hull(thickness_difference, depth_difference, extra_slices);
 		}
@@ -167,7 +167,8 @@ module shape_hull(thickness_difference, depth_difference, extra_slices = 0){
 }
 
 //corollary is shape_hull
-module linear_extrude_shape_hull(thickness_difference, depth_difference){
+// extra_slices unused, only to match argument signatures
+module linear_extrude_shape_hull(thickness_difference, depth_difference, extra_slices = 0){
 
 	height = $total_depth - depth_difference;
 	width_scale = top_total_key_width() / total_key_width();
diff --git a/keys.scad b/keys.scad
index 747cbca..636a2b0 100644
--- a/keys.scad
+++ b/keys.scad
@@ -200,14 +200,10 @@ module g20() {
 }
 
 module iso_enter() {
-	$bottom_key_width = 18.16;
-	$bottom_key_height = 18.16;
 	$key_length = 1.5;
 	$key_height = 2;
 
-	$total_depth = 7;
-	$top_tilt = 0;
-	$top_skew = 1.75;
+	$top_tilt = -3;
 	$key_shape_type = "iso_enter";
 	$linear_extrude_shape = true;
 	$linear_extrude_height_adjustment = 19.05 * 0.5;
@@ -425,7 +421,10 @@ module legend(text, inset=false) {
 	children();
 }
 
-translate_u(1.125, 0.5) iso_enter() cherry() key();
-translate_u(0, 0) sa_row(2) legend("q", inset=true) cherry() {
-	/*key();*/
+translate_u(1.125, 0.5) oem_row(2) iso_enter() cherry() {
+
+	$top_tilt = 0;
+  $width_difference = 4.35;
+	$height_difference = 3.8;
+	key();
 }
diff --git a/shapes.scad b/shapes.scad
index a14dd3d..8e916f5 100644
--- a/shapes.scad
+++ b/shapes.scad
@@ -39,15 +39,15 @@ module ISO_enter(width, height, width_difference, height_difference, corner_size
 	width_ratio = unit_length(1.25) / unit_length(1.5);
 	height_ratio = unit_length(1) / unit_length(2);
 
-	echo((unit_length(1.5) - unit_length(1.25))/ 2);
+  // height and width difference currently don't do anything - but I think I should keep them. they don't do anything because we currently use scaling in the linear_extrude to express the difference in height and width of the top of the keycap
 
   pointArray = [
-      [                      -width_difference/2,                        -height_difference/2],
-      [                      -width_difference/2,               -height + height_difference/2],
-      [-width * width_ratio + width_difference/2,               -height + height_difference/2],
-      [-width * width_ratio + width_difference/2,-height * height_ratio + height_difference/2],
-      [              -width + width_difference/2,-height * height_ratio + height_difference/2],
-      [              -width + width_difference/2,                        -height_difference/2]
+      [                      -width_difference/2,                        -height_difference/2], // top right
+      [                      -width_difference/2,               -height + height_difference/2], // bottom right
+      [-width * width_ratio + width_difference/2,               -height + height_difference/2], // bottom left
+      [-width * width_ratio + width_difference/2,-height * height_ratio + height_difference/2], // inner middle point
+      [              -width + width_difference/2,-height * height_ratio + height_difference/2], // outer middle point
+      [              -width + width_difference/2,                        -height_difference/2]  // top left
   ];
 
 	minkowski(){