Now supports trackball in wall and in a cluster. An unlikely config, …

…but it simplifies construction by removing the setting interdependency.
joshreve · Aug 20, 2021 · b9c0013 · b9c0013
1 parent 338510f
commit b9c0013
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py
@@ -3509,11 +3509,23 @@ def model_side(side="right"):
         shape = difference(shape, [hole])
         shape = union([shape, frame])
 
+    if trackball_in_wall and (side == ball_side or ball_side == 'both'):
+        tbprecut, tb, tbcutout, sensor, ball = generate_trackball_in_wall()
+
+        shape = difference(shape, [tbprecut])
+        # export_file(shape=shape, fname=path.join(save_path, config_name + r"_test_1"))
+        shape = union([shape, tb])
+        # export_file(shape=shape, fname=path.join(save_path, config_name + r"_test_2"))
+        shape = difference(shape, [tbcutout])
+        # export_file(shape=shape, fname=path.join(save_path, config_name + r"_test_3a"))
+        # export_file(shape=add([shape, sensor]), fname=path.join(save_path, config_name + r"_test_3b"))
+        shape = union([shape, sensor])
+
+        if show_caps:
+            shape = add([shape, ball])
+
     if (trackball_in_wall or ('TRACKBALL' in thumb_style)) and (side == ball_side or ball_side == 'both'):
-        if trackball_in_wall:
-            tbprecut, tb, tbcutout, sensor, ball = generate_trackball_in_wall()
-        elif 'TRACKBALL' in thumb_style:
-            tbprecut, tb, tbcutout, sensor, ball = generate_trackball_in_cluster()
+        tbprecut, tb, tbcutout, sensor, ball = generate_trackball_in_cluster()
 
         shape = difference(shape, [tbprecut])
         # export_file(shape=shape, fname=path.join(save_path, config_name + r"_test_1"))

diff --git a/src/generate_configuration.py b/src/generate_configuration.py
@@ -45,7 +45,7 @@
     # THUMB PARAMETERS
     ##############################
     # 'DEFAULT' 6-key, 'MINI' 5-key, 'CARBONFET' 6-key, 'MINIDOX' 3-key, 'TRACKBALL_ORBYL', 'TRACKBALL_CJ'
-    'thumb_style': 'MINIDOX',
+    'thumb_style': 'TRACKBALL_ORBYL',
     '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,

diff --git 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,