diff options
| -rwxr-xr-x | dactyl.sh | 4 | ||||
| -rw-r--r-- | src/generate_configuration.py | 30 | ||||
| -rw-r--r-- | src/run_config.json | 34 |
3 files changed, 35 insertions, 33 deletions
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # ******************* # # ******************* setup ******************* # @@ -284,7 +284,7 @@ function imageExists() { function buildImage() { inform "Building docker image: $imageName..." - docker build -t dactyl-keyboard -f docker/Dockerfile . + docker build --format docker -t dactyl-keyboard -f docker/Dockerfile . } function promptBuildImageIfNotExists() { diff --git a/src/generate_configuration.py b/src/generate_configuration.py index c6ed586..c38f397 100644 --- a/src/generate_configuration.py +++ b/src/generate_configuration.py @@ -10,7 +10,7 @@ r2d = 180 / pi shape_config = { - 'ENGINE': 'solid', # 'solid' = solid python / OpenSCAD, 'cadquery' = cadquery / OpenCascade + 'ENGINE': 'cadquery', # 'solid' = solid python / OpenSCAD, 'cadquery' = cadquery / OpenCascade # 'ENGINE': 'cadquery', # 'solid' = solid python / OpenSCAD, 'cadquery' = cadquery / OpenCascade @@ -21,16 +21,17 @@ shape_config = { 'save_dir': '.', 'config_name': "DM", - 'show_caps': 'MX', + 'show_caps': None, + #'show_caps': 'MX',# 'show_pcbs': False, #only runs if caps are shown, easist place to initially inject geometry - 'nrows': 5, #5, # key rows - 'ncols': 6, #6, # key columns + 'nrows': 3, #5, # key rows + 'ncols': 5, #6, # key columns 'alpha': pi / 12.0, # curvature of the columns 'beta': pi / 36.0, # curvature of the rows - 'centercol': 3, # controls left_right tilt / tenting (higher number is more tenting) - 'centerrow_offset': 3, # rows from max, controls front_back tilt + 'centercol': 4, # controls left_right tilt / tenting (higher number is more tenting) + 'centerrow_offset': 1, # rows from max, controls front_back tilt 'tenting_angle': pi / 12.0, # or, change this for more precise tenting control # symmetry states if it is a symmetric or asymmetric bui. If asymmetric it doubles the generation time. @@ -38,7 +39,7 @@ shape_config = { 'column_style_gt5': "orthographic", 'column_style': "standard", # options include :standard, :orthographic, and :fixed - 'reduced_inner_cols': 2, #currently supports 0 or 2 due to thumb cluster attachment + 'reduced_inner_cols': 0, #currently supports 0 or 2 due to thumb cluster attachment 'reduced_outer_cols': 0, @@ -62,10 +63,10 @@ shape_config = { ############################## # 'DEFAULT' 6-key, 'MINI' 5-key, 'CARBONFET' 6-key, 'MINIDOX' 3-key, 'TRACKBALL_ORBYL', 'TRACKBALL_CJ' - 'thumb_style': 'DEFAULT', + 'thumb_style': 'MINIDOX', '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, + 'minidox_Usize': 1.7, # Thumb plate rotations, anything other than 90 degree increments WILL NOT WORK. 'mini_index_key': True, @@ -273,7 +274,7 @@ shape_config = { # 'SLIDING' = Features to slide the OLED in place and use a pin or block to secure from underneath. # 'CLIP' = Features to set the OLED in a frame a snap a bezel down to hold it in place. - 'oled_mount_type': 'CLIP', + 'oled_mount_type': 'NONE', 'oled_center_row': 1.25, # if not None, this will override the oled_mount_location_xyz and oled_mount_rotation_xyz settings 'oled_translation_offset': (0, 0, 4), # Z offset tweaks are expected depending on curvature and OLED mount choice. 'oled_rotation_offset': (0, 0, 0), @@ -383,7 +384,7 @@ shape_config = { # 'USB_TEENSY' = Teensy holder, no RJ9 # 'EXTERNAL' = square cutout for a holder such as the one from lolligagger. # 'NONE' = No openings in the back. - 'controller_mount_type': 'EXTERNAL', + 'controller_mount_type': 'RJ9_USB_TEENSY', 'external_holder_height': 12.5, 'external_holder_width': 28.75, @@ -460,9 +461,10 @@ shape_config = { 'column_offsets': [ [0, 0, 0], [0, 0, 0], - [0, 2.82, -4.5], - [0, 0, 0], - [0, -6, 5],# REDUCED STAGGER + [-1.0, 2.82, -4], + [-1.0, 2.0, -2], # XXX 3rd finger adjustment + # [0, 0, 0], + [0, -6, 4],# REDUCED STAGGER [0, -6, 5],# REDUCED STAGGER [0, -6, 5],# NOT USED IN MOST FORMATS (7th column) ], diff --git a/src/run_config.json b/src/run_config.json index 8337c8e..f39c6d7 100644 --- a/src/run_config.json +++ b/src/run_config.json @@ -1,20 +1,20 @@ { - "ENGINE": "solid", + "ENGINE": "cadquery", "save_dir": ".", "config_name": "DM", - "show_caps": "MX", + "show_caps": null, "show_pcbs": false, - "nrows": 5, - "ncols": 6, + "nrows": 3, + "ncols": 5, "alpha": 0.26179916666666664, "beta": 0.08726638888888888, - "centercol": 3, - "centerrow_offset": 3, + "centercol": 4, + "centerrow_offset": 1, "tenting_angle": 0.26179916666666664, "symmetry": "symmetric", "column_style_gt5": "orthographic", "column_style": "standard", - "reduced_inner_cols": 2, + "reduced_inner_cols": 0, "reduced_outer_cols": 0, "thumb_offsets": [ 6, @@ -27,9 +27,9 @@ "web_thickness": 5.1, "post_size": 0.1, "post_adj": 0, - "thumb_style": "DEFAULT", + "thumb_style": "MINIDOX", "default_1U_cluster": true, - "minidox_Usize": 1.6, + "minidox_Usize": 1.7, "mini_index_key": true, "default_thumb_screw_xy_locations": [ [ @@ -339,7 +339,7 @@ "undercut_transition": 0.2, "plate_file": null, "plate_offset": 0.0, - "oled_mount_type": "CLIP", + "oled_mount_type": "NONE", "oled_center_row": 1.25, "oled_translation_offset": [ 0, @@ -448,7 +448,7 @@ "wire_post_height": 7, "wire_post_overhang": 3.5, "wire_post_diameter": 2.6, - "controller_mount_type": "EXTERNAL", + "controller_mount_type": "RJ9_USB_TEENSY", "external_holder_height": 12.5, "external_holder_width": 28.75, "external_holder_xoffset": -5.0, @@ -546,19 +546,19 @@ 0 ], [ - 0, + -1.0, 2.82, - -4.5 + -4 ], [ - 0, - 0, - 0 + -1.0, + 2.0, + -2 ], [ 0, -6, - 5 + 4 ], [ 0, |