Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix web thickness not affecting 1.5u button plates #111

Open
wants to merge 2 commits into
base: refaktor
Choose a base branch
from
Open

Fix web thickness not affecting 1.5u button plates #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8246771
Fix web thickness not affecting 1.5u button plates
mbugert May 12, 2022
f9f120a
Fix two more spots with forgotten wall-thickness
mbugert May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/dactyl_keyboard/manuform.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,13 @@
(union (thumb-tr-place c shape)
(thumb-tl-place c shape)))))

(def larger-plate
(let [plate-height (/ (- sa-double-length mount-height) 3)
top-plate (->> (cube mount-width plate-height web-thickness)
(translate [0
(/ (+ plate-height mount-height -0.20) 2)
(- plate-thickness (/ web-thickness 2))]))]
(defn larger-plate [c]
(let [web-thickness (get c :configuration-web-thickness)
plate-height (/ (- sa-double-length mount-height) 3)
top-plate (->> (cube mount-width plate-height web-thickness)
(translate [0
(/ (+ plate-height mount-height -0.20) 2)
(- plate-thickness (/ web-thickness 2))]))]
(union top-plate (mirror [0 1 0] top-plate))))

(defn thumbcaps [c]
Expand All @@ -476,7 +477,7 @@
(union
(thumb-1x-layout c (single-plate c))
(thumb-15x-layout c (single-plate c))
(thumb-15x-layout c larger-plate)))
(thumb-15x-layout c (larger-plate c))))

(defn thumb-post-tr [web-thickness]
(translate [(- (/ mount-width 2) post-adj)
Expand Down Expand Up @@ -1391,7 +1392,8 @@
(def trrs-usb-holder-cube
(cube 17 12 2))
(defn trrs-usb-holder-space [c]
(translate (map + (trrs-usb-holder-position c) [0 (* -1 wall-thickness) 1]) trrs-usb-holder-cube))
(let [wall-thickness (get c :configuration-wall-thickness)]
(translate (map + (trrs-usb-holder-position c) [0 (* -1 wall-thickness) 1]) trrs-usb-holder-cube)))
(defn trrs-usb-holder-holder [c]
(translate (trrs-usb-holder-position c) (cube 19 12 4)))

Expand Down Expand Up @@ -1513,7 +1515,8 @@
(def external-holder-cube
(cube 29.166 30 12.6))
(defn external-holder-space [c]
(translate (map + (external-holder-position c) [-1.5 (* -1 wall-thickness) 3]) external-holder-cube))
(let [wall-thickness (get c :configuration-wall-thickness)]
(translate (map + (external-holder-position c) [-1.5 (* -1 wall-thickness) 3]) external-holder-cube)))

(defn screw-placement [c bottom-radius top-radius height]
(let [use-wide-pinky? (get c :configuration-use-wide-pinky?)
Expand Down