summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoshua Shreve <j.a.shreve@gmail.com>2021-08-20 16:56:35 -0400
committerJoshua Shreve <j.a.shreve@gmail.com>2021-08-20 16:56:35 -0400
commitb9c0013ea9dd83aaa83c994b0a572ace64d75c72 (patch)
treefac728afa63bc76be35456afd0153091ed03750f /src
parent338510f9857da2f1949550c28209af280c13965e (diff)
Now supports trackball in wall and in a cluster. An unlikely config, but it simplifies construction by removing the setting interdependency.
Diffstat (limited to 'src')
-rw-r--r--src/dactyl_manuform.py20
-rw-r--r--src/generate_configuration.py2
-rw-r--r--src/run_config.json2
3 files changed, 18 insertions, 6 deletions
diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py
index 27e74c6..079ef6f 100644
--- 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
index cb6891e..373c3eb 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': '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
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,