diff --git a/src/dishes.scad b/src/dishes.scad index a8bfba7..32f5519 100644 --- a/src/dishes.scad +++ b/src/dishes.scad @@ -4,6 +4,8 @@ include include include include +include +include include include @@ -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"); } diff --git a/src/dishes/squared_scoop.scad b/src/dishes/squared_scoop.scad new file mode 100644 index 0000000..366f2a9 --- /dev/null +++ b/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 "hipro2_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() { + cube([height,width,0.001],center=true); + for(i=[0:len(points)-1]) { + translate(points[i]) + sphere(r=r,$fn=64); + } + } +} diff --git a/src/dishes/squared_spherical.scad b/src/dishes/squared_spherical.scad new file mode 100644 index 0000000..68a5d04 --- /dev/null +++ b/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); + } + } +} diff --git a/src/key_profiles.scad b/src/key_profiles.scad index 83ff5e1..623bddb 100644 --- a/src/key_profiles.scad +++ b/src/key_profiles.scad @@ -8,6 +8,8 @@ include include include include +include +include include include include @@ -37,6 +39,10 @@ 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 == "hipro2") { + hipro2_row(row, column) children(); + } else if (key_profile_type == "matty3") { + matty3_row(row, column) children(); } else if (key_profile_type == "disable") { children(); } else { diff --git a/src/key_profiles/hipro2.scad b/src/key_profiles/hipro2.scad new file mode 100644 index 0000000..bcf75c5 --- /dev/null +++ b/src/key_profiles/hipro2.scad @@ -0,0 +1,43 @@ +// Takes rsheldiii's hipro profile and adds the "squared scoop" +// dish that appears to be what true HiPros are using up top +// Not perfect as it slightly clips the corners of keys +module hipro2_row(row=3, column=0) { + $key_shape_type = "sculpted_square"; + + $bottom_key_width = 18.35; + $bottom_key_height = 18.17; + + $width_difference = ($bottom_key_width - 12.3); + $height_difference = ($bottom_key_height - 12.65); + $dish_type = "squared scoop"; + $dish_depth = 0.75; + $dish_skew_x = 0; + $dish_skew_y = 0; + $top_skew = 0; + $height_slices = 10; + $corner_radius = 1; + + $top_tilt_y = side_tilt(column); + extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0; + + if (row <= 1){ + $total_depth = 13.7 + extra_height; + // TODO I didn't change these yet + $top_tilt = -13; + children(); + } else if (row == 2) { + $total_depth = 11.1 + extra_height; + $top_tilt = -7; + children(); + } else if (row == 3) { + $total_depth = 11.1 + extra_height; + $top_tilt = 7; + children(); + } else if (row == 4 || row == 5){ + $total_depth = 12.25 + extra_height; + $top_tilt = 13; + children(); + } else { + children(); + } +} diff --git a/src/key_profiles/matty3.scad b/src/key_profiles/matty3.scad new file mode 100644 index 0000000..d3e2843 --- /dev/null +++ b/src/key_profiles/matty3.scad @@ -0,0 +1,52 @@ +// This is an imperfect attempt to clone the MT3 profile +// I'm unsure if "MT3" is copyrighted or anything, but +// Since my name is "Matt" and "Matty3" sounds like "MT3," +// that's what I'm going with for now +module matty3_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 : 0.75; + $dish_skew_x = 0; + $dish_skew_y = 0; + $top_skew = 0; + $height_slices = 10; + $corner_radius = 1; + + $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.6 + extra_height; + $top_tilt = -12; + 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(); + } +} diff --git a/src/layouts/60_percent/default.scad b/src/layouts/60_percent/default.scad index 0280b30..8d43e5a 100644 --- a/src/layouts/60_percent/default.scad +++ b/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(); }