Fix USB_C_WALL comment

.gitignore

@@ -7,15 +7,22 @@
 .lein-*
 *.gcode
 *.scad
+*.dxf
 /target
 .idea/
+.idea
 .DS_Store
 *.FCStd1
 debug_*
 */__pycache__/*
+*.py[cod]
 *~$*
 things/
-.DS_Store
 things/*.scad
 things/*.step
 things/*.stl
+config/
+.iml
+**/*.iml
+
+/src/.ipynb_checkpoints/

README.md

@@ -1,3 +1,52 @@
+# Wylderbuilds Dactyl Manuform - Python 3 - Cadquery
+So, THIS is a fork of a fork of a fork of a... You get the idea.
+
+This one is a direct fork of [joshreve's brilliant adaptation](https://github.com/joshreve/dactyl-keyboard)  of the original Clojure-based dactyl manuform generator redone in Python 3.
+Without his work, none of this would have been nearly as easy and straightforward as it has been.  Vast kudos and thanks to him.
+
+This repo is what I've customized and use to generate the models for the prints I sell online at Wylderbuilds, my Etsy store.
+
+## Main Differences and How to Make it Go
+Eventually, joshreve and I hope to merge our changes together, but until then, here's a quick rundown on the current changes.
+
+* Wylderbuilds Trackball cluster -- A new, low-rider Trackball cluster. ("thumb_style": "TRACKBALL_WILD")
+* Wylderbuilds BTU Trackball cluster -- An even newer Trackball cluster with ball transfer unit support. ("thumb_style": TRACKBALL_BTU")
+* 1.5u pinky column support -- Outside 1.5u pinky columns can be generated ("pinky_1_5U": true, "first_1_5U_row": x, "last_1_5U_row": y)
+* Full bottom rows -- Default manuforms drop the bottom row keys on outside columns, this keeps them ("full_last_rows": true)
+* Clusters broken out into their own classes -- Making it easier to swap among them and add more.
+* Updated Kailh Hot swap holder -- If enabled, the hot swap holder is full size and stronger.
+* Cadquery builds generate STLs in addition to STEP files -- The bottom plates are (still) only generated properly when the "ENGINE": "cadquery" is set and this will now generate ready-to-print STLs (some models might need a little repair)
+* OTHER MISC BITS: OLED mount wall tweaks, tweaks to screw-sizes and some wall placements, manuform angle and heights tweaked, support for an "overrides" json config file.
+
+The main script has been reworked into a single make_dactyl() function.
+
+The setup and run instructions are still more-or-less the same, but here's some tips:
+
+* The docker file likely won't get far, it hasn't been maintained or updated in some time.
+
+* To run locally, the best route is to install Anaconda or Miniconda, start a conda shell and run the "conda.sh" script.  If you're on Windows and don't want to do the WSL Linux thing, you can do the following:
+
+1. Do the Anaconda/Miniconda bit, above.
+2. In a conda shell, run the following lines:
+
+        conda create --name=dactyl-keyboard python=3.8 -y
+
+        conda activate dactyl-keyboard
+
+        conda install -c conda-forge -c cadquery cadquery=master -y
+
+        pip install dataclasses-json numpy scipy solidpython
+
+        conda update --all -y
+
+Then, still in the shell, from the base repo directory, run:
+
+    python src/dactyl_manuform.py
+
+This will churn and pump out models into the "things" directory.  In run_config.json, "ENGINE": "solid" or "cadquery" will specify OpenSCAD or STEP/STL files, respectively.  Note that the cadquery option takes considerably longer.  Openscad is best for fast iteration.
+
+I'll update more here as things develop.
+
 # The Dactyl-ManuForm Keyboard - Python 3 - Cadquery
 This is a fork of [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) by Tom Short, which itself is a fork of [Dactyl](https://github.com/adereth/dactyl-keyboard) by Matthew Adereth, a parameterized, split-hand, concave, columnar, ergonomic keyboard.
 

conda.sh

@@ -45,13 +45,13 @@ fi
 
 inform "Creating conda environment: $envName..."
 
-conda create --name=$envName python=3.7 -y
+conda create --name=$envName python=3.8 -y
 
 conda activate $envName
 
 inform "Installing CadQuery..."
 
-conda install -c conda-forge -c cadquery cadquery=2 -y
+conda install -c conda-forge -c cadquery cadquery=master -y
 
 inform "Installing dataclasses-json..."
 

src/builder.py

@@ -0,0 +1,45 @@
+# from dactyl_manuform import *
+from clusters.default_cluster import DefaultCluster
+import numpy as np
+from numpy import pi
+import os.path as path
+import getopt, sys
+import json
+import os
+import shutil
+
+
+debug_exports = False
+debug_trace = False
+
+def deg2rad(degrees: float) -> float:
+    return degrees * pi / 180
+
+
+def rad2deg(rad: float) -> float:
+    return rad * 180 / pi
+
+
+def debugprint(info):
+    if debug_trace:
+        print(info)
+
+
+class Builder:
+    column_style = "asymetric"
+    centerrow = 3
+    lastrow = 4
+    cornerrow = 3
+    lastcol = 5
+
+
+    def __init__(self, parent_locals):
+        for item in parent_locals:
+            globals()[item] = parent_locals[item]
+        cluster = DefaultCluster(parent_locals)
+        origin = cluster.thumborigin()
+        print("Locals imported")
+        print(thumb_style)
+
+
+print("It built!")

src/bulk_build.py

@@ -0,0 +1,147 @@
+import os
+import json
+import sys
+import dactyl_manuform
+
+json_template = """
+{
+  "ENGINE": "cadquery",
+  "overrides": "",
+  "override_name": "",
+  "save_dir": "",
+  "save_name": null,
+  "show_caps": false,
+  "centerrow_offset": 3,
+  "nrows": 5,
+  "ncols": 6,
+  "plate_style": "NOTCH",
+  "full_last_rows": true,
+  "all_last_rows": false,
+  "right_side_only": true,
+  "thumb_style": "DEFAULT",
+  "other_thumb": "DEFAULT",
+  "ball_side": "right"
+}
+"""
+
+clusters = [
+    "DEFAULT", "CARBONFET", "MINI", "MINITHICC", "MINITHICC3", "MINIDOX",
+    "TRACKBALL_WILD", "TRACKBALL_THREE", "TRACKBALL_ORBYL"
+]
+
+gen_dir = sys.argv[1]
+
+try:
+    print(gen_dir)
+except NameError:
+    print("Must provide target directory for generating bulk models")
+    sys.exit(-1)
+
+out_file = os.path.join(gen_dir, "bulk_config")
+
+engine = "cadquery"
+default = "DEFAULT"
+trackball = "TRACKBALL_WILD"
+hotswap = "HS_NOTCH"
+normal = "NOTCH"
+run_config = os.path.join(r"src", 'run_config.json')
+
+
+def write_file(file_path, data):
+    if os.path.exists(file_path):
+        os.remove(file_path)
+    f = open(file_path, "a")
+    f.write(json.dumps(data, indent=2))
+    f.close()
+
+
+def set_overrides(override):
+    with open(run_config, mode='r') as fid:
+        data = json.load(fid)
+
+    previous_overrides = data["overrides"]
+    data["overrides"] = override
+    write_file(run_config, data)
+    return previous_overrides
+
+
+previous_overrides = set_overrides(out_file)
+
+def finished():
+    set_overrides(previous_overrides)
+    sys.exit(0)
+
+
+override_list = [
+    {
+        "name": "sizes",
+        "iterate": [{"ncols": col, "nrows": row} for col in [6] for row in [4]]
+    },
+    {
+        "name": "clusters",
+        "iterate": [{"thumb_style": c} for c in clusters]
+    },
+    # {
+    #     "name": "switch_holes",
+    #     "iterate": [{"switch_file": f"file:switch_holes\\{style}.json"} for style in ["notch"]]
+    # },
+    # {
+    #     "name": "row_options",
+    #     "iterate": [{"ncols": col, "nrows": row, "full_last_rows": full} for col in [6, 7] for row in [5, 6] for full in [False, True]]
+    # },
+]
+
+def write_config(top_dir, overrides):
+    config = json.loads(json_template)
+    for key in overrides:
+        config[key] = overrides[key]
+    rows = config["nrows"]
+    cols = config["ncols"]
+    if rows == 3:
+        config["centerrow_offset"] = 2
+    elif rows == 4:
+        config["centerrow_offset"] = 2.5
+    plate = config["plate_style"]
+    thumb = config["thumb_style"]
+    row_name = "standard"
+    if config["full_last_rows"]:
+        row_name = "full"
+    if config["all_last_rows"]:
+        row_name = "all"
+    name = str(rows) + "x" + str(cols) + "_" + plate + "_" + thumb + "_rows_" + row_name
+    config["save_dir"] = os.path.join(gen_dir, top_dir)
+    config["overrides"] = out_file
+    config["save_name"] = name
+    write_file(out_file + '.json', config)
+
+# def write_config(rows, cols, engine, thumb1, plate, last_rows):
+#     config = json.loads(json_template)
+#     name = str(rows) + "_x_" + str(cols) + "_" + plate  + "_" + last_rows  + "_" + thumb1
+#     config["save_dir"] = os.path.join(gen_dir, str(rows) + "_x_" + str(cols), plate, last_rows)
+#     print("Generating: ", name)
+#     config["overrides"] = out_file
+#     config["save_name"] = name
+#     config["override_name"] = thumb1
+#     config["engine"] = engine
+#     config["nrows"] = rows
+#     config["ncols"] = cols
+#     config["plate_style"] = "NUB" if plate == "normal" else "HS_NUB"
+#     config["thumb_style"] = thumb1
+#     config["other_thumb"] = thumb1
+#     config["full_last_rows"] = True if last_rows == "full" else False
+#     config["ball_side"] = "both"
+#
+#     write_file(out_file + '.json', config)
+
+
+for v in override_list:
+    name = v["name"]
+    it = v["iterate"]
+    for config in it:
+        write_config(name, config)
+        dactyl_manuform.make_dactyl()
+
+
+finished()
+
+