diff options
| -rw-r--r-- | build_docker.bat | 8 | ||||
| -rw-r--r-- | src/dactyl_manuform.py | 4 | ||||
| -rw-r--r-- | src/generate_configuration.py | 6 | ||||
| -rw-r--r-- | src/run_config.json | 6 |
4 files changed, 13 insertions, 11 deletions
diff --git a/build_docker.bat b/build_docker.bat index e2cfc1b..6df8be6 100644 --- a/build_docker.bat +++ b/build_docker.bat @@ -1,5 +1,5 @@ docker build -t dactyl-keyboard -f docker/Dockerfile . -docker run --name DM-run -d -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" -v "%cd%/things:/app/configs" dactyl-keyboard python3 -i dactyl_manuform.py -docker run --name DM-config -d -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" -v "%cd%/things:/app/configs" dactyl-keyboard python3 -i generate_configuration.py -docker run --name DM-release-build -d -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" -v "%cd%/things:/app/configs" dactyl-keyboard python3 -i model_builder.py -docker run --name DM-shell -d -ti -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" -v "%cd%/things:/app/configs" dactyl-keyboard +docker run --name DM-run -d -v "%cd%/:/app" dactyl-keyboard python3 -i dactyl_manuform.py +docker run --name DM-config -d -v "%cd%/:/app" dactyl-keyboard python3 -i generate_configuration.py +docker run --name DM-release-build -d -v "%cd%/:/app" dactyl-keyboard python3 -i model_builder.py +docker run --name DM-shell -d -ti -v "%cd%/:/app" dactyl-keyboard diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py index cc44b5b..72135e7 100644 --- a/src/dactyl_manuform.py +++ b/src/dactyl_manuform.py @@ -988,7 +988,8 @@ def default_thumb(side="right"): shape = union([shape, default_thumb_15x_layout(double_plate(), plate=False)]) #shape = add([shape, default_thumb_15x_layout(rotate(single_plate(side=side), (0, 0, -90)))]) #shape = add([shape, default_thumb_15x_layout(double_plate(), plate=False)]) - shape = difference(shape, [default_thumb_pcb_plate_cutouts()]) + # if plate_pcb_clear: + # shape = difference(shape, [default_thumb_pcb_plate_cutouts()]) return shape @@ -1172,6 +1173,7 @@ def default_thumb_connectors(): key_place(web_post_bl(), 2, lastrow), default_thumb_tr_place(thumb_post_br()), key_place(web_post_br(), 2, lastrow), + key_place(web_post_bl(), 3, lastrow), ] ) ) diff --git a/src/generate_configuration.py b/src/generate_configuration.py index 9a1a698..c6ed586 100644 --- a/src/generate_configuration.py +++ b/src/generate_configuration.py @@ -21,11 +21,11 @@ shape_config = { 'save_dir': '.', 'config_name': "DM", - 'show_caps': False, + 'show_caps': 'MX', 'show_pcbs': False, #only runs if caps are shown, easist place to initially inject geometry - 'nrows': 4, #5, # key rows - 'ncols': 5, #6, # key columns + 'nrows': 5, #5, # key rows + 'ncols': 6, #6, # key columns 'alpha': pi / 12.0, # curvature of the columns 'beta': pi / 36.0, # curvature of the rows diff --git a/src/run_config.json b/src/run_config.json index 5b96f42..8337c8e 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -2,10 +2,10 @@ "ENGINE": "solid", "save_dir": ".", "config_name": "DM", - "show_caps": false, + "show_caps": "MX", "show_pcbs": false, - "nrows": 4, - "ncols": 5, + "nrows": 5, + "ncols": 6, "alpha": 0.26179916666666664, "beta": 0.08726638888888888, "centercol": 3, |