Merge branch 'master' into dactyl_manuform_4x6

This commit is contained in:
IhatemyISP 2020-02-15 16:14:58 -05:00
commit 3f5ca9aa42
No known key found for this signature in database
GPG Key ID: C87915CB776E8490
2 changed files with 8 additions and 8 deletions

View File

@ -1,4 +1,4 @@
module oem_row(row=3) { module oem_row(row=3, column = 0) {
$bottom_key_width = 18.05; $bottom_key_width = 18.05;
$bottom_key_height = 18.05; $bottom_key_height = 18.05;
$width_difference = 5.8; $width_difference = 5.8;
@ -14,23 +14,23 @@ module oem_row(row=3) {
extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0; extra_height = $double_sculpted ? extra_side_tilt_height(column) : 0;
if (row == 5 || row == 0) { if (row == 5 || row == 0) {
$total_depth = 11.2; $total_depth = 11.2 + extra_height;
$top_tilt = -3; $top_tilt = -3;
children(); children();
} else if (row == 1) { } else if (row == 1) {
$total_depth = 9.45; $total_depth = 9.45 + extra_height;
$top_tilt = 1; $top_tilt = 1;
children(); children();
} else if (row == 2) { } else if (row == 2) {
$total_depth = 9; $total_depth = 9 + extra_height;
$top_tilt = 6; $top_tilt = 6;
children(); children();
} else if (row == 3) { } else if (row == 3) {
$total_depth = 9.25; $total_depth = 9.25 + extra_height;
$top_tilt = 9; $top_tilt = 9;
children(); children();
} else if (row == 4) { } else if (row == 4) {
$total_depth = 9.25; $total_depth = 9.25 + extra_height;
$top_tilt = 10; $top_tilt = 10;
children(); children();
} else { } else {

View File

@ -10,6 +10,6 @@ planck_layout_mapping = [
[1, 1, 1, 1, 1, 0, 2, 0, 1, 1, 1, 1, 1] [1, 1, 1, 1, 1, 0, 2, 0, 1, 1, 1, 1, 1]
]; ];
module planck_default(profile) { module planck_default(profile, column_sculpt_profile="2hands") {
layout(planck_layout_mapping, profile, row_sculpting_offset=1) children(); layout(planck_layout_mapping, profile, row_sculpting_offset=1, column_sculpt_profile=column_sculpt_profile) children();
} }