Name change.

joshreve · Aug 18, 2021 · 6832d68 · 6832d68
1 parent 99eee74
commit 6832d68
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py
@@ -761,7 +761,7 @@ def thumbcaps(side='right', style_override=None):
         return carbonfet_thumbcaps()
     elif "TRACKBALL" in _thumb_style:
         if (side == ball_side or ball_side == 'both'):
-            if _thumb_style == "TRACKBALL_ORBISSYL":
+            if _thumb_style == "TRACKBALL_ORBYL":
                 return tbjs_thumbcaps()
         else:
             return thumbcaps(side, style_override=other_thumb)
@@ -783,7 +783,7 @@ def thumb(side="right", style_override=None):
         return carbonfet_thumb(side)
     elif "TRACKBALL" in _thumb_style:
         if (side == ball_side or ball_side == 'both'):
-            if _thumb_style == "TRACKBALL_ORBISSYL":
+            if _thumb_style == "TRACKBALL_ORBYL":
                 return tbjs_thumb(side)
         else:
             return thumb(side, style_override=other_thumb)
@@ -805,7 +805,7 @@ def thumb_connectors(side='right', style_override=None):
         return carbonfet_thumb_connectors()
     elif "TRACKBALL" in _thumb_style:
         if (side == ball_side or ball_side == 'both'):
-            if _thumb_style == "TRACKBALL_ORBISSYL":
+            if _thumb_style == "TRACKBALL_ORBYL":
                 return tbjs_thumb_connectors()
         else:
             return thumb_connectors(side, style_override=other_thumb)
@@ -2297,7 +2297,7 @@ def thumb_walls(side='right', style_override=None):
         return carbonfet_thumb_walls()
     elif "TRACKBALL" in _thumb_style:
         if (side == ball_side or ball_side == 'both'):
-            if _thumb_style == "TRACKBALL_ORBISSYL" :
+            if _thumb_style == "TRACKBALL_ORBYL" :
                 return tbjs_thumb_walls()
         else:
             return thumb_walls(side, style_override=other_thumb)
@@ -2318,7 +2318,7 @@ def thumb_connection(side='right', style_override=None):
         return carbonfet_thumb_connection(side=side)
     elif "TRACKBALL" in _thumb_style:
         if (side == ball_side or ball_side == 'both'):
-            if _thumb_style == "TRACKBALL_ORBISSYL":
+            if _thumb_style == "TRACKBALL_ORBYL":
                 return tbjs_thumb_connection(side=side)
         else:
             return thumb_connection(side, style_override=other_thumb)
@@ -2881,7 +2881,7 @@ def generate_trackball(pos, rot):
     return precut, shape, cutout, sensor, ball
 
 def generate_trackball_in_cluster():
-    if thumb_style == 'TRACKBALL_ORBISSYL':
+    if thumb_style == 'TRACKBALL_ORBYL':
         pos, rot = tbjs_thumb_position_rotation()
     return generate_trackball(pos, rot)
 

diff --git a/src/generate_configuration.py b/src/generate_configuration.py
@@ -18,7 +18,7 @@
     'save_dir': '.',
     'config_name':  "DM",
 
-    'show_caps': False,
+    'show_caps': True,
     'show_pcbs': False, #only runs if caps are shown, easist place to initially inject geometry
 
     'nrows':  5, #5,  # key rows
@@ -44,8 +44,8 @@
     ##############################
     # THUMB PARAMETERS
     ##############################
-    # 'DEFAULT' 6-key, 'MINI' 5-key, 'CARBONFET' 6-key, 'MINIDOX' 3-key, 'TRACKBALL_ORBISSYL', 'TRACKBALL_CJ'
-    'thumb_style': 'TRACKBALL_ORBISSYL',
+    # 'DEFAULT' 6-key, 'MINI' 5-key, 'CARBONFET' 6-key, 'MINIDOX' 3-key, 'TRACKBALL_ORBYL', 'TRACKBALL_CJ'
+    '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,
@@ -102,7 +102,7 @@
     # END EXPERIMENTAL
 
     'trackball_Usize': 1.5,  # size for inner key near trackball
-    'ball_side': 'both',
+    'ball_side': 'right', #'left', 'right', or 'both'
     'ball_diameter': 34.0,
     'ball_wall_thickness': 3,  # should not be changed unless the import models are changed.
     'ball_gap': 1.0,

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