josh/dactyl-keyboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 5x6

Browse Source
This commit is contained in:
Tom Short
2017-04-02 15:01:16 -04:00
parent cf28ce0da5 a688347efb
commit 7171cab46e
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dactyl_keyboard/dactyl.clj
View File

@@ -645,7 +645,7 @@
(let [shift-right (= column lastcol)
shift-left (= column 0)
shift-up (and (not (or shift-right shift-left)) (= row 0))
shift-down (and (not (or shift-right shift-left)) (= row lastrow))
shift-down (and (not (or shift-right shift-left)) (>= row lastrow))
position (if shift-up (key-position column row (map + (wall-locate2 0 1) [0 (/ mount-height 2) 0]))
(if shift-down (key-position column row (map - (wall-locate2 0 -1) [0 (/ mount-height 2) 0]))
(if shift-left (map + (left-key-position row 0) (wall-locate3 -1 0))
@@ -656,9 +656,9 @@
)))
(defn screw-insert-all-shapes [bottom-radius top-radius height]
(union ; (screw-insert 0 0 bottom-radius top-radius height)
(screw-insert 0 1 bottom-radius top-radius height)
(screw-insert 3 lastrow bottom-radius top-radius height)
(union (screw-insert 0 0 bottom-radius top-radius height)
(screw-insert 0 lastrow bottom-radius top-radius height)
(screw-insert 2 (+ lastrow 0.3) bottom-radius top-radius height)
(screw-insert 3 0 bottom-radius top-radius height)
(screw-insert lastcol 1 bottom-radius top-radius height)
))