From 7de5b4f23669eac7927056b5816add92150233bd Mon Sep 17 00:00:00 2001 From: Joshua Shreve Date: Tue, 27 Jul 2021 22:00:21 -0400 Subject: Auto-adjusting minidox cluster y-location based on key size. --- src/dactyl_manuform.py | 8 +++++++- src/generate_configuration.py | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py index 1ccf70a..9a8b4b4 100644 --- a/src/dactyl_manuform.py +++ b/src/dactyl_manuform.py @@ -543,8 +543,13 @@ def connectors(): def thumborigin(): # debugprint('thumborigin()') origin = key_position([mount_width / 2, -(mount_height / 2), 0], 1, cornerrow) + for i in range(len(origin)): origin[i] = origin[i] + thumb_offsets[i] + + if thumb_style == 'MINIDOX': + origin[1] = origin[1] - .4*(minidox_Usize-1)*sa_length + return origin @@ -2754,7 +2759,8 @@ def screw_insert_thumb(bottom_radius, top_radius, height): if thumb_style == 'MINIDOX': position = thumborigin() - position = list(np.array(position) + np.array([-40, -33, -16])) + position = list(np.array(position) + np.array([-37, -35, -16])) + position[1] = position[1] - .4 * (minidox_Usize - 1) * sa_length position[2] = 0 elif thumb_style == 'CARBONFET': diff --git a/src/generate_configuration.py b/src/generate_configuration.py index 56198dd..051e2dd 100644 --- a/src/generate_configuration.py +++ b/src/generate_configuration.py @@ -45,7 +45,8 @@ shape_config = { ############################## 'thumb_style': 'MINIDOX', # 'DEFAULT' 6-key, 'MINI' 5-key, 'CARBONFET' 6-key, 'MINIDOX' 3-key 'default_1U_cluster': True, # only used with default, makes top right thumb cluster key 1U - 'minidox_Usize': 1.2, # Thumb key size. May need slight oversizing, check w/ caps. If over 1.5 need to shift thumb offsets y value. + 'minidox_Usize': 2, # Thumb key size. May need slight oversizing, check w/ caps. Additional spacing will be automatically added for larger keys. + # Thumb plate rotations, anything other than 90 degree increments WILL NOT WORK. 'thumb_plate_tr_rotation': 0.0, # Top right plate rotation tweaks as thumb cluster is crowded for hot swap, etc. 'thumb_plate_tl_rotation': 0.0, # Top left plate rotation tweaks as thumb cluster is crowded for hot swap, etc. -- cgit v1.2.3