diff options
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | build_docker.bat | 2 | ||||
| -rw-r--r-- | src/generate_configuration.py | 8 | ||||
| -rw-r--r-- | src/run_config.json | 4 |
4 files changed, 21 insertions, 7 deletions
@@ -13,7 +13,21 @@ As part of the effort to create a new engine I converted the code to cadquery/Op ## Added Features +### Docker Autobuild + +At the excellent suggestion of [martint17r](https://github.com/joshreve/dactyl-keyboard/issues?q=is%3Apr+author%3Amartint17r) +I have added docker configurations with an Windows batch file to assist with getting setup. +If there is sufficient interest I can add a .sh file as well. If you have +[docker desktop](https://www.docker.com/products/docker-desktop) installed, the batch file will create the +dactyl-keyboard image and 3 containers: DM-run: runs the dactyl_manuform.py, DM-config: runs generate_configuration.py, +and DM-shell: just starts an interactive session to manually run from shell (tip: run bash after entering to get the better +shell environment). All apps bindmount the src and things directory to allow editing in the host and running in the +container. While not exactly hard drive space efficient, this hopefully this helps those having issue getting +cadquery running and prevents local Python conflicts. It works well on my computer, but I don't use +docker often, so please let me know if you find any issues with the approach. + ### Refactored + Your settings are now created by `generate_configuration.py` or by direct modification fo the `run_config.json` file. This allows you to save `run_config.json` to share your configuration. diff --git a/build_docker.bat b/build_docker.bat index dbf14c7..9bdffdf 100644 --- a/build_docker.bat +++ b/build_docker.bat @@ -1,4 +1,4 @@ docker build -t dactyl-keyboard -f docker/Dockerfile . docker run --name DM-run -d -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" dactyl-keyboard python3 -i dactyl_manuform.py docker run --name DM-config -d -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" dactyl-keyboard python3 -i generate_configuration.py -docker run --name DM-bash -d -ti -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" dactyl-keyboard +docker run --name DM-shell -d -ti -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" dactyl-keyboard diff --git a/src/generate_configuration.py b/src/generate_configuration.py index b8f86ad..c8d9fb1 100644 --- a/src/generate_configuration.py +++ b/src/generate_configuration.py @@ -37,7 +37,7 @@ shape_config = { 'thumb_offsets': [6, -3, 7], 'keyboard_z_offset': ( - 13 # controls overall height# original=9 with centercol=3# use 16 for centercol=2 + 11 # controls overall height# original=9 with centercol=3# use 16 for centercol=2 ), ############################## @@ -100,7 +100,7 @@ shape_config = { # 'HS_NUB' = hot swap underside with nubs. # 'HS_UNDERCUT' = hot swap underside with undercut. Does not generate properly. Hot swap step needs to be modified. # 'HS_NOTCH' = hot swap underside with notch. Does not generate properly. Hot swap step needs to be modified. - 'plate_style': 'HS_NOTCH', + 'plate_style': 'NOTCH', 'hole_keyswitch_height': 14.0, 'hole_keyswitch_width': 14.0, @@ -298,5 +298,5 @@ def update_config(fname, fname_out=None): if __name__ == '__main__': save_config() - # from dactyl_manuform import * - # run()
\ No newline at end of file + from dactyl_manuform import * + run()
\ No newline at end of file diff --git a/src/run_config.json b/src/run_config.json index 82583b6..1017d26 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -18,7 +18,7 @@ -3, 7 ], - "keyboard_z_offset": 13, + "keyboard_z_offset": 11, "thumb_style": "DEFAULT", "thumb_plate_tr_rotation": 0.0, "thumb_plate_tl_rotation": 0.0, @@ -68,7 +68,7 @@ 17.5 ], "fixed_tenting": 0.0, - "plate_style": "HS_NOTCH", + "plate_style": "NOTCH", "hole_keyswitch_height": 14.0, "hole_keyswitch_width": 14.0, "nub_keyswitch_height": 14.4, |