summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdward <ed@itsed.com>2021-08-19 18:41:33 -0400
committerEdward <ed@itsed.com>2021-08-19 18:41:33 -0400
commit5281fb752d0d9728191775faef527d0fffd3d7b8 (patch)
tree7f1e271d5b4512667e62da63b4e4e62f522bd165 /src
parentd8c4a98391895b59fe9e4bf1a323620903babaa4 (diff)
moved parts to their own directory
also fixed bug that would not correctly inlcude parts for configs with a `save_dir` set to a subdirectory of the things directory
Diffstat (limited to 'src')
-rw-r--r--src/dactyl_manuform.py16
-rw-r--r--src/parts/hot_swap_plate.step (renamed from src/hot_swap_plate.step)0
-rw-r--r--src/parts/hot_swap_plate.stl (renamed from src/hot_swap_plate.stl)bin70584 -> 70584 bytes
-rw-r--r--src/parts/sensor_holder.step (renamed from src/sensor_holder.step)0
-rw-r--r--src/parts/sensor_holder.stl (renamed from src/sensor_holder.stl)bin136384 -> 136384 bytes
-rw-r--r--src/parts/trackball_fused_34mm.step (renamed from src/trackball_fused_34mm.step)0
-rw-r--r--src/parts/trackball_fused_34mm.stl (renamed from src/trackball_fused_34mm.stl)bin727684 -> 727684 bytes
-rw-r--r--src/parts/trackball_sensor_cutter.step (renamed from src/trackball_sensor_cutter.step)0
-rw-r--r--src/parts/trackball_sensor_cutter.stl (renamed from src/trackball_sensor_cutter.stl)bin58284 -> 58284 bytes
-rw-r--r--src/parts/trackball_sensor_mount.step (renamed from src/trackball_sensor_mount.step)0
-rw-r--r--src/parts/trackball_sensor_mount.stl (renamed from src/trackball_sensor_mount.stl)bin307684 -> 307684 bytes
-rw-r--r--src/parts/trackball_socket_body_34mm.step (renamed from src/trackball_socket_body_34mm.step)0
-rw-r--r--src/parts/trackball_socket_body_34mm.stl (renamed from src/trackball_socket_body_34mm.stl)bin1273284 -> 1273284 bytes
-rw-r--r--src/parts/trackball_socket_cutter_34mm.step (renamed from src/trackball_socket_cutter_34mm.step)0
-rw-r--r--src/parts/trackball_socket_cutter_34mm.stl (renamed from src/trackball_socket_cutter_34mm.stl)bin632784 -> 632784 bytes
15 files changed, 9 insertions, 7 deletions
diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py
index c913ced..22cf2f5 100644
--- a/src/dactyl_manuform.py
+++ b/src/dactyl_manuform.py
@@ -39,9 +39,11 @@ except Exception:
print('Setting Current Engine = {}'.format(ENGINE))
if save_dir in ['', None, '.']:
- save_path = os.path.join(r"..", "things")
+ save_path = path.join(r"..", "things")
+ parts_path = path.join(r"..", "src", "parts")
else:
- save_path = os.path.join(r"..", "things", save_dir)
+ save_path = path.join(r"..", "things", save_dir)
+ parts_path = path.join(r"..", r"..", "src", "parts")
###############################################
# END EXTREMELY UGLY BOOTSTRAP
@@ -96,7 +98,7 @@ else:
if 'HS_' in plate_style:
symmetry = "asymmetric"
- plate_file = path.join("..", "src", r"hot_swap_plate")
+ plate_file = path.join(parts_path, r"hot_swap_plate")
plate_offset = 0.0
if (trackball_in_wall or ('TRACKBALL' in thumb_style)) and not ball_side == 'both':
@@ -277,10 +279,10 @@ def trackball_socket(segments=100, side="right"):
# cyl = translate(cyl, (0, 0, -8))
# shape = union([shape, cyl])
- tb_file = path.join("..", "src", r"trackball_socket_body_34mm")
- tbcut_file = path.join("..", "src", r"trackball_socket_cutter_34mm")
- sens_file = path.join("..", "src", r"trackball_sensor_mount")
- senscut_file = path.join("..", "src", r"trackball_sensor_cutter")
+ tb_file = path.join(parts_path, r"trackball_socket_body_34mm")
+ tbcut_file = path.join(parts_path, r"trackball_socket_cutter_34mm")
+ sens_file = path.join(parts_path, r"trackball_sensor_mount")
+ senscut_file = path.join(parts_path, r"trackball_sensor_cutter")
# shape = import_file(tb_file)
diff --git a/src/hot_swap_plate.step b/src/parts/hot_swap_plate.step
index fb793d0..fb793d0 100644
--- a/src/hot_swap_plate.step
+++ b/src/parts/hot_swap_plate.step
diff --git a/src/hot_swap_plate.stl b/src/parts/hot_swap_plate.stl
index 5b56f19..5b56f19 100644
--- a/src/hot_swap_plate.stl
+++ b/src/parts/hot_swap_plate.stl
Binary files differ
diff --git a/src/sensor_holder.step b/src/parts/sensor_holder.step
index 5f78418..5f78418 100644
--- a/src/sensor_holder.step
+++ b/src/parts/sensor_holder.step
diff --git a/src/sensor_holder.stl b/src/parts/sensor_holder.stl
index 71ab0a8..71ab0a8 100644
--- a/src/sensor_holder.stl
+++ b/src/parts/sensor_holder.stl
Binary files differ
diff --git a/src/trackball_fused_34mm.step b/src/parts/trackball_fused_34mm.step
index 851ae14..851ae14 100644
--- a/src/trackball_fused_34mm.step
+++ b/src/parts/trackball_fused_34mm.step
diff --git a/src/trackball_fused_34mm.stl b/src/parts/trackball_fused_34mm.stl
index 83aca37..83aca37 100644
--- a/src/trackball_fused_34mm.stl
+++ b/src/parts/trackball_fused_34mm.stl
Binary files differ
diff --git a/src/trackball_sensor_cutter.step b/src/parts/trackball_sensor_cutter.step
index 7dcdf81..7dcdf81 100644
--- a/src/trackball_sensor_cutter.step
+++ b/src/parts/trackball_sensor_cutter.step
diff --git a/src/trackball_sensor_cutter.stl b/src/parts/trackball_sensor_cutter.stl
index 8e7fdc5..8e7fdc5 100644
--- a/src/trackball_sensor_cutter.stl
+++ b/src/parts/trackball_sensor_cutter.stl
Binary files differ
diff --git a/src/trackball_sensor_mount.step b/src/parts/trackball_sensor_mount.step
index 3b015a0..3b015a0 100644
--- a/src/trackball_sensor_mount.step
+++ b/src/parts/trackball_sensor_mount.step
diff --git a/src/trackball_sensor_mount.stl b/src/parts/trackball_sensor_mount.stl
index b3e1afa..b3e1afa 100644
--- a/src/trackball_sensor_mount.stl
+++ b/src/parts/trackball_sensor_mount.stl
Binary files differ
diff --git a/src/trackball_socket_body_34mm.step b/src/parts/trackball_socket_body_34mm.step
index 79e88ba..79e88ba 100644
--- a/src/trackball_socket_body_34mm.step
+++ b/src/parts/trackball_socket_body_34mm.step
diff --git a/src/trackball_socket_body_34mm.stl b/src/parts/trackball_socket_body_34mm.stl
index c1320ca..c1320ca 100644
--- a/src/trackball_socket_body_34mm.stl
+++ b/src/parts/trackball_socket_body_34mm.stl
Binary files differ
diff --git a/src/trackball_socket_cutter_34mm.step b/src/parts/trackball_socket_cutter_34mm.step
index caf7a6f..caf7a6f 100644
--- a/src/trackball_socket_cutter_34mm.step
+++ b/src/parts/trackball_socket_cutter_34mm.step
diff --git a/src/trackball_socket_cutter_34mm.stl b/src/parts/trackball_socket_cutter_34mm.stl
index 4bfe4cb..4bfe4cb 100644
--- a/src/trackball_socket_cutter_34mm.stl
+++ b/src/parts/trackball_socket_cutter_34mm.stl
Binary files differ