Skip to content

Fixes for choc option #17

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

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

Fixes for choc option #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f04654a
Improvements for Choc (kailh V1) switches:
K-Lohse Mar 23, 2024
ed148d6
reduced keyhole size for choc switches to 13.8
K-Lohse Mar 23, 2024
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
12 changes: 6 additions & 6 deletions src/cljs/dactyl_generator/common.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
(defn keyswitch-height
"the y dimension of an mx style keyswitch, in millimeter."
[c]
(if (get c :configuration-ibnuda-edits?) 14.0 14.4))
(if (get c :configuration-ibnuda-edits?) (if (not= :choc (get c :configuration-switch-type)) 14.0 13.8) 14.4))
(defn keyswitch-width
"the x dimension of an mx style keyswitch, in millimeter."
[c]
(if (get c :configuration-ibnuda-edits?) 14.0 14.4))
(if (get c :configuration-ibnuda-edits?) (if (not= :choc (get c :configuration-switch-type)) 14.0 13.8) 14.4))

(defn keyswitch-width-c [c] (keyswitch-width c))

Expand Down Expand Up @@ -270,8 +270,8 @@
(/ (plate-thickness c) 2)]))
:choc (->> (cube (+ (keyswitch-width-c c) 3) holder-thickness (* (plate-thickness c) 0.65))
(translate [0
(+ holder-thickness (/ (keyswitch-height c) 2))
(* (plate-thickness c) 0.7)]))
(+ (/ holder-thickness 2) (/ (keyswitch-height c) 2))
( + (/ (plate-thickness c) 2) (/ (- (plate-thickness c) (* (plate-thickness c) 0.65)) 2))]))
(->> (cube (+ (keyswitch-width-c c) mx-margin) holder-thickness (plate-thickness c))
(translate [0
(+ (/ holder-thickness 2) (/ (keyswitch-height c) 2))
Expand All @@ -286,10 +286,10 @@
0
(- (plate-thickness c)
(/ alps-notch-height 2))])))
:choc (->> (cube holder-thickness (+ (keyswitch-height c) 3.3) (* (plate-thickness c) 0.65))
:choc (->> (cube holder-thickness (+ (keyswitch-height c) 3.3) 2.2) ;2.2 is the clamp-height of kailh choc V1 switches according to datasheet
(translate [(+ (/ holder-thickness 2) (/ (keyswitch-width-c c) 2))
0
(* (plate-thickness c) 0.7)]))
( + (/ (plate-thickness c) 2) (/ (- (plate-thickness c) 2.2) 2))]))
(->> (cube holder-thickness (+ (keyswitch-height c) mx-margin) (plate-thickness c))
(translate [(+ (/ holder-thickness 2) (/ (keyswitch-width-c c) 2))
0
Expand Down