From 507a4b22b238689bda96380df7bf38e1f0e7ee3a Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Thu, 5 Aug 2021 07:50:27 -0400 Subject: Interim commit with partially functioning trackball. trackball in wall is mostly working (still WIP), trackball cluster has layout but no webs or walls. --- src/run_config.json | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 8 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 627b536..9901a31 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -1,10 +1,10 @@ { "ENGINE": "solid", - "save_dir": "DM_4x5_NOTCHPLT_DEFTMB_NOLED_EXTCTRL", - "config_name": "DM_4x5_NOTCHPLT_DEFTMB_NOLED_EXTCTRL", - "show_caps": false, - "nrows": 4, - "ncols": 5, + "save_dir": ".", + "config_name": "DM", + "show_caps": true, + "nrows": 5, + "ncols": 6, "alpha": 0.26179916666666664, "beta": 0.08726638888888888, "centercol": 3, @@ -19,8 +19,8 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "DEFAULT", - "default_1U_cluster": true, + "thumb_style": "MINIDOX", + "default_1U_cluster": false, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, "thumb_plate_tl_rotation": 0.0, @@ -28,6 +28,41 @@ "thumb_plate_ml_rotation": 0.0, "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, + "trackball_in_wall": true, + "tbiw_hole_diameter": 40, + "tbiw_hole_height": 40, + "tbiw_ball_center_row": 0.2, + "tbiw_translational_offset": [ + -2.0, + 0.0, + 3 + ], + "tbiw_rotation_offset": [ + 0.0, + 0.0, + 0.0 + ], + "tbiw_left_wall_x_offset_override": 46.0, + "tbiw_left_wall_z_offset_override": 0.0, + "tbiw_left_wall_lower_y_offset": 0.0, + "tbiw_left_wall_lower_z_offset": 0.0, + "tbiw_oled_center_row": 0.75, + "tbiw_oled_translation_offset": [ + -2.5, + 0, + 0 + ], + "tbiw_oled_rotation_offset": [ + 0, + 0, + 0 + ], + "trackball_Usize": 1.5, + "trackball_rotation": 0.0, + "ball_side": "right", + "ball_diameter": 34.0, + "ball_wall_thickness": 3.0, + "ball_z_offset": -3.75, "pinky_1_5U": false, "first_1_5U_row": 0, "last_1_5U_row": 5, @@ -90,7 +125,7 @@ "undercut_transition": 0.2, "plate_file": null, "plate_offset": 0.0, - "oled_mount_type": "NONE", + "oled_mount_type": "CLIP", "oled_center_row": 1.25, "oled_translation_offset": [ 0, -- cgit v1.2.3 From b09b92f639477ca8264118fcc728c6e8094b1cd8 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Thu, 5 Aug 2021 22:13:28 -0400 Subject: Adding CAD geometry. Debugging minor issues. --- src/run_config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 9901a31..7525c1d 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -1,8 +1,8 @@ { - "ENGINE": "solid", + "ENGINE": "cadquery", "save_dir": ".", "config_name": "DM", - "show_caps": true, + "show_caps": false, "nrows": 5, "ncols": 6, "alpha": 0.26179916666666664, @@ -29,7 +29,7 @@ "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, "trackball_in_wall": true, - "tbiw_hole_diameter": 40, + "tbiw_hole_diameter": 36, "tbiw_hole_height": 40, "tbiw_ball_center_row": 0.2, "tbiw_translational_offset": [ @@ -62,7 +62,7 @@ "ball_side": "right", "ball_diameter": 34.0, "ball_wall_thickness": 3.0, - "ball_z_offset": -3.75, + "ball_z_offset": -3.25, "pinky_1_5U": false, "first_1_5U_row": 0, "last_1_5U_row": 5, -- cgit v1.2.3 From ca9783df5dc645a027743902f7f3b2e0348fd716 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Wed, 11 Aug 2021 20:55:08 -0400 Subject: Interim checkin. Initial version of trackball webs/walls in, still working on component cut/union order. Fixed base plates and walls to be identical in caquery and solid. Fixed if/elif/else structure that misplaced the MINI cluster screw mount. Added intial pass at add on PCB as option to add with caps for interference checks. Moved bottom_hull to helper libraries as they are specific to engine. Fixed bottom_hull functions to correct minor discrepency between the engines. Fixed solid intersect function. --- src/run_config.json | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 7525c1d..6465ff3 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -3,6 +3,7 @@ "save_dir": ".", "config_name": "DM", "show_caps": false, + "show_pcbs": false, "nrows": 5, "ncols": 6, "alpha": 0.26179916666666664, @@ -19,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "MINIDOX", + "thumb_style": "MINI", "default_1U_cluster": false, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, @@ -28,12 +29,12 @@ "thumb_plate_ml_rotation": 0.0, "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, - "trackball_in_wall": true, + "trackball_in_wall": false, "tbiw_hole_diameter": 36, "tbiw_hole_height": 40, "tbiw_ball_center_row": 0.2, "tbiw_translational_offset": [ - -2.0, + 0.0, 0.0, 3 ], @@ -42,15 +43,15 @@ 0.0, 0.0 ], - "tbiw_left_wall_x_offset_override": 46.0, + "tbiw_left_wall_x_offset_override": 50.0, "tbiw_left_wall_z_offset_override": 0.0, "tbiw_left_wall_lower_y_offset": 0.0, "tbiw_left_wall_lower_z_offset": 0.0, "tbiw_oled_center_row": 0.75, "tbiw_oled_translation_offset": [ - -2.5, + -3.5, 0, - 0 + 1.5 ], "tbiw_oled_rotation_offset": [ 0, @@ -62,7 +63,8 @@ "ball_side": "right", "ball_diameter": 34.0, "ball_wall_thickness": 3.0, - "ball_z_offset": -3.25, + "ball_gap": 1.0, + "ball_z_offset": -3.0, "pinky_1_5U": false, "first_1_5U_row": 0, "last_1_5U_row": 5, @@ -246,7 +248,7 @@ "base_rim_thickness": 5.0, "screw_cbore_diameter": 4.0, "screw_cbore_depth": 2.0, - "plate_holes": false, + "plate_holes": true, "plate_holes_xy_offset": [ 0.0, 0.0 @@ -255,6 +257,12 @@ "plate_holes_height": 14.3, "plate_holes_diameter": 1.7, "plate_holes_depth": 20.0, + "pcb_width": 18.0, + "pcb_height": 18.0, + "pcb_thickness": 1.5, + "pcb_hole_diameter": 2, + "pcb_hole_pattern_width": 14.3, + "pcb_hole_pattern_height": 14.3, "column_offsets": [ [ 0, -- cgit v1.2.3 From adac76f4e7d119dd12fa9612387ac8ba609124fb Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Wed, 11 Aug 2021 21:11:22 -0400 Subject: Added undercut for tray. Discovered why people had an issue with the tray. The cadquery had interference and solid did not. After fixing the unintentional difference, I found both had intereference. Added an undercut to locally thin the wall for tray engagement. --- src/run_config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 6465ff3..a712c6f 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -1,5 +1,5 @@ { - "ENGINE": "cadquery", + "ENGINE": "solid", "save_dir": ".", "config_name": "DM", "show_caps": false, @@ -242,6 +242,7 @@ "external_holder_height": 12.5, "external_holder_width": 28.75, "external_holder_xoffset": -5.0, + "external_holder_yoffset": -4.5, "screw_hole_diameter": 2, "base_thickness": 3.0, "base_offset": 3.0, -- cgit v1.2.3 From d24e5b2847300e24149156146c7212ca9aebee2d Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Fri, 13 Aug 2021 17:11:44 -0400 Subject: very interim commit to check tbiw issues. --- src/run_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index a712c6f..4d637c8 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -1,5 +1,5 @@ { - "ENGINE": "solid", + "ENGINE": "cadquery", "save_dir": ".", "config_name": "DM", "show_caps": false, @@ -29,7 +29,7 @@ "thumb_plate_ml_rotation": 0.0, "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, - "trackball_in_wall": false, + "trackball_in_wall": true, "tbiw_hole_diameter": 36, "tbiw_hole_height": 40, "tbiw_ball_center_row": 0.2, -- cgit v1.2.3 From 206391e59865281b8d8e7db499c30dd36d27b7c7 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Fri, 13 Aug 2021 21:12:36 -0400 Subject: Fixed non-ball side rendering for trackball thumb. Still WIP. --- src/run_config.json | 54 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 4d637c8..56d78cf 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -1,5 +1,5 @@ { - "ENGINE": "cadquery", + "ENGINE": "solid", "save_dir": ".", "config_name": "DM", "show_caps": false, @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "MINI", + "thumb_style": "TRACKBALL", "default_1U_cluster": false, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, @@ -29,7 +29,7 @@ "thumb_plate_ml_rotation": 0.0, "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, - "trackball_in_wall": true, + "trackball_in_wall": false, "tbiw_hole_diameter": 36, "tbiw_hole_height": 40, "tbiw_ball_center_row": 0.2, @@ -58,11 +58,57 @@ 0, 0 ], + "other_thumb": "DEFAULT", + "tbjs_key_diameter": 64, + "tbjs_translational_offsets": [ + [ + 0.0, + 0.0, + -3.0 + ], + [ + 0.0, + 0.0, + -3.0 + ], + [ + 0.0, + 0.0, + -3.0 + ], + [ + 0.0, + 0.0, + -3.0 + ] + ], + "tbjs_rotation_offsets": [ + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ], + [ + 0.0, + 0.0, + 0.0 + ] + ], "trackball_Usize": 1.5, "trackball_rotation": 0.0, "ball_side": "right", "ball_diameter": 34.0, - "ball_wall_thickness": 3.0, + "ball_wall_thickness": 5.0, "ball_gap": 1.0, "ball_z_offset": -3.0, "pinky_1_5U": false, -- cgit v1.2.3 From 9dff5864b671133e350a14dd80246baed8f3fa59 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Sun, 15 Aug 2021 20:21:13 -0400 Subject: Trackball updates. Still need to refresh geometry. Optical distance is too long. --- src/run_config.json | 61 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 16 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 56d78cf..0930207 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -20,8 +20,8 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "TRACKBALL", - "default_1U_cluster": false, + "thumb_style": "TRACKBALL_ORBISSYL", + "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, "thumb_plate_tl_rotation": 0.0, @@ -30,8 +30,6 @@ "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, "trackball_in_wall": false, - "tbiw_hole_diameter": 36, - "tbiw_hole_height": 40, "tbiw_ball_center_row": 0.2, "tbiw_translational_offset": [ 0.0, @@ -59,30 +57,40 @@ 0 ], "other_thumb": "DEFAULT", - "tbjs_key_diameter": 64, - "tbjs_translational_offsets": [ + "tbjs_key_diameter": 70, + "tbjs_translation_offset": [ + 0, + 0, + 10 + ], + "tbjs_rotation_offset": [ + 0, + 0, + 0 + ], + "tbjs_key_translation_offsets": [ [ 0.0, 0.0, - -3.0 + -8.0 ], [ 0.0, 0.0, - -3.0 + -8.0 ], [ 0.0, 0.0, - -3.0 + -8.0 ], [ 0.0, 0.0, - -3.0 + -8.0 ] ], - "tbjs_rotation_offsets": [ + "tbjs_key_rotation_offsets": [ [ 0.0, 0.0, @@ -104,13 +112,34 @@ 0.0 ] ], + "trackball_modular": false, "trackball_Usize": 1.5, - "trackball_rotation": 0.0, - "ball_side": "right", + "ball_side": "both", "ball_diameter": 34.0, - "ball_wall_thickness": 5.0, + "ball_wall_thickness": 3, "ball_gap": 1.0, - "ball_z_offset": -3.0, + "trackball_hole_diameter": 35, + "trackball_hole_height": 40, + "tb_socket_translation_offset": [ + 0, + 0, + 2.0 + ], + "tb_socket_rotation_offset": [ + 0, + 0, + -90 + ], + "tb_sensor_translation_offset": [ + 0, + 0, + 0 + ], + "tb_sensor_rotation_offset": [ + 0, + 0, + 0 + ], "pinky_1_5U": false, "first_1_5U_row": 0, "last_1_5U_row": 5, @@ -295,7 +324,7 @@ "base_rim_thickness": 5.0, "screw_cbore_diameter": 4.0, "screw_cbore_depth": 2.0, - "plate_holes": true, + "plate_holes": false, "plate_holes_xy_offset": [ 0.0, 0.0 -- cgit v1.2.3 From 29a89e462800f26f70f22cbe05211e153339e928 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Tue, 17 Aug 2021 20:39:54 -0400 Subject: File cleanup. --- src/run_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 0930207..b3eadc4 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -118,7 +118,7 @@ "ball_diameter": 34.0, "ball_wall_thickness": 3, "ball_gap": 1.0, - "trackball_hole_diameter": 35, + "trackball_hole_diameter": 36.5, "trackball_hole_height": 40, "tb_socket_translation_offset": [ 0, @@ -128,7 +128,7 @@ "tb_socket_rotation_offset": [ 0, 0, - -90 + 0 ], "tb_sensor_translation_offset": [ 0, -- cgit v1.2.3 From 6832d68703355e6f61e4174d97c5f398797b09b0 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Tue, 17 Aug 2021 21:21:10 -0400 Subject: Name change. --- src/run_config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index b3eadc4..115ddd5 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -2,7 +2,7 @@ "ENGINE": "solid", "save_dir": ".", "config_name": "DM", - "show_caps": false, + "show_caps": true, "show_pcbs": false, "nrows": 5, "ncols": 6, @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "TRACKBALL_ORBISSYL", + "thumb_style": "TRACKBALL_ORBYL", "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, @@ -114,7 +114,7 @@ ], "trackball_modular": false, "trackball_Usize": 1.5, - "ball_side": "both", + "ball_side": "right", "ball_diameter": 34.0, "ball_wall_thickness": 3, "ball_gap": 1.0, -- cgit v1.2.3 From d8c4a98391895b59fe9e4bf1a323620903babaa4 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Wed, 18 Aug 2021 07:49:21 -0400 Subject: Fixed Trackball in Wall, extra rotation. Now aims forward. --- src/run_config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 115ddd5..d2b1ef6 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "TRACKBALL_ORBYL", + "thumb_style": "MINIDOX", "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, @@ -29,12 +29,12 @@ "thumb_plate_ml_rotation": 0.0, "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, - "trackball_in_wall": false, + "trackball_in_wall": true, "tbiw_ball_center_row": 0.2, "tbiw_translational_offset": [ 0.0, 0.0, - 3 + 0.0 ], "tbiw_rotation_offset": [ 0.0, -- cgit v1.2.3 From b9c0013ea9dd83aaa83c994b0a572ace64d75c72 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Fri, 20 Aug 2021 16:56:35 -0400 Subject: Now supports trackball in wall and in a cluster. An unlikely config, but it simplifies construction by removing the setting interdependency. --- src/run_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index d2b1ef6..4e94e39 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "MINIDOX", + "thumb_style": "TRACKBALL_ORBYL", "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, -- cgit v1.2.3 From c9df94ec88a1465bc900bc75dc9c1288056c26cf Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Fri, 20 Aug 2021 17:57:30 -0400 Subject: Adapted Trackball from Cjen1 to match newer structure. Appears to work as intended. --- src/run_config.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 4e94e39..cd7db76 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "TRACKBALL_ORBYL", + "thumb_style": "TRACKBALL_CJ", "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, @@ -29,7 +29,7 @@ "thumb_plate_ml_rotation": 0.0, "thumb_plate_br_rotation": 0.0, "thumb_plate_bl_rotation": 0.0, - "trackball_in_wall": true, + "trackball_in_wall": false, "tbiw_ball_center_row": 0.2, "tbiw_translational_offset": [ 0.0, @@ -112,6 +112,9 @@ 0.0 ] ], + "tbcj_inner_diameter": 42, + "tbcj_thickness": 2, + "tbcj_outer_diameter": 53, "trackball_modular": false, "trackball_Usize": 1.5, "ball_side": "right", @@ -120,6 +123,8 @@ "ball_gap": 1.0, "trackball_hole_diameter": 36.5, "trackball_hole_height": 40, + "trackball_plate_thickness": 2, + "trackball_plate_width": 2, "tb_socket_translation_offset": [ 0, 0, -- cgit v1.2.3 From 9e2c0c3b72eb0bb27210bf19d76e7e4b6f5ce295 Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Sat, 21 Aug 2021 20:31:07 -0400 Subject: Added config update to add new parameters to config. Retained ability to run the run_config.json file if there are no CLI arguments. Retained ability to run the run_config.json file if there are no CLI arguments. Will eventually deprecate run_config in favor of the configs directory, but don't want to mess up existing configs until they have time to migrate. Un-ignored configs. Would like to build a set of user configs through PRs to see variety. Add gallery directory for those with submit configs for people to see examples. All PRs for configs are expected to have identically named files (with some suffix for multiple) to show example images. --- src/run_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index cd7db76..3679941 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "TRACKBALL_CJ", + "thumb_style": "DEFAULT", "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, -- cgit v1.2.3 From f94209c3a0c065eb3af5ff0a75f8ffc6dbd0223f Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Sun, 22 Aug 2021 11:35:37 -0400 Subject: Fixed docker directories in batch file. Added note for when run_config is used vs. configuration argument. --- src/run_config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 3679941..2b68e88 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -4,8 +4,8 @@ "config_name": "DM", "show_caps": true, "show_pcbs": false, - "nrows": 5, - "ncols": 6, + "nrows": 4, + "ncols": 5, "alpha": 0.26179916666666664, "beta": 0.08726638888888888, "centercol": 3, @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "DEFAULT", + "thumb_style": "TRACKBALL_CJ", "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, -- cgit v1.2.3 From 27f491bda62c18e314380ddc6456962a2417b84b Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Mon, 23 Aug 2021 19:59:18 -0400 Subject: generate_config.py once again defaulting to original behavior. --- src/run_config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/run_config.json') diff --git a/src/run_config.json b/src/run_config.json index 2b68e88..48bde38 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -4,8 +4,8 @@ "config_name": "DM", "show_caps": true, "show_pcbs": false, - "nrows": 4, - "ncols": 5, + "nrows": 5, + "ncols": 6, "alpha": 0.26179916666666664, "beta": 0.08726638888888888, "centercol": 3, @@ -20,7 +20,7 @@ 7 ], "keyboard_z_offset": 11, - "thumb_style": "TRACKBALL_CJ", + "thumb_style": "TRACKBALL_ORBYL", "default_1U_cluster": true, "minidox_Usize": 1.6, "thumb_plate_tr_rotation": 0.0, -- cgit v1.2.3