diff options
| author | Joshua Shreve <j.a.shreve@gmail.com> | 2021-08-18 07:49:21 -0400 |
|---|---|---|
| committer | Joshua Shreve <j.a.shreve@gmail.com> | 2021-08-18 07:49:21 -0400 |
| commit | d8c4a98391895b59fe9e4bf1a323620903babaa4 (patch) | |
| tree | 09e06f42d7b92112ad203e4957dad5015f1a14e8 | |
| parent | 6832d68703355e6f61e4174d97c5f398797b09b0 (diff) | |
Fixed Trackball in Wall, extra rotation. Now aims forward.
| -rw-r--r-- | src/dactyl_manuform.py | 2 | ||||
| -rw-r--r-- | src/generate_configuration.py | 6 | ||||
| -rw-r--r-- | src/run_config.json | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py index fda4776..c913ced 100644 --- a/src/dactyl_manuform.py +++ b/src/dactyl_manuform.py @@ -2908,7 +2908,7 @@ def tbiw_position_rotation(): angle_x = np.arctan2(base_pt1[2] - base_pt2[2], base_pt1[1] - base_pt2[1]) angle_z = np.arctan2(base_pt1[0] - base_pt2[0], base_pt1[1] - base_pt2[1]) - tbiw_mount_rotation_xyz = (0, rad2deg(angle_x), -90) + np.array(tbiw_rotation_offset) + tbiw_mount_rotation_xyz = (0, rad2deg(angle_x), 0) + np.array(tbiw_rotation_offset) return tbiw_mount_location_xyz, tbiw_mount_rotation_xyz diff --git a/src/generate_configuration.py b/src/generate_configuration.py index fbf3eba..cb6891e 100644 --- a/src/generate_configuration.py +++ b/src/generate_configuration.py @@ -45,7 +45,7 @@ shape_config = { # THUMB PARAMETERS ############################## # 'DEFAULT' 6-key, 'MINI' 5-key, 'CARBONFET' 6-key, 'MINIDOX' 3-key, 'TRACKBALL_ORBYL', 'TRACKBALL_CJ' - 'thumb_style': 'TRACKBALL_ORBYL', + 'thumb_style': 'MINIDOX', 'default_1U_cluster': True, # only used with default, makes top right thumb cluster key 1U # Thumb key size. May need slight oversizing, check w/ caps. Additional spacing will be automatically added for larger keys. 'minidox_Usize': 1.6, @@ -60,9 +60,9 @@ shape_config = { ################################### ## Trackball in Wall ## ################################### - 'trackball_in_wall': False, # Separate trackball option, placing it in the OLED area + 'trackball_in_wall': True, # Separate trackball option, placing it in the OLED area 'tbiw_ball_center_row': 0.2, # up from cornerrow instead of down from top - 'tbiw_translational_offset': (0.0, 0.0, 3), + 'tbiw_translational_offset': (0.0, 0.0, 0.0), 'tbiw_rotation_offset': (0.0, 0.0, 0.0), 'tbiw_left_wall_x_offset_override': 50.0, 'tbiw_left_wall_z_offset_override': 0.0, 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, |