summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Short <tshort.rlists@gmail.com>2017-04-02 15:01:16 -0400
committerTom Short <tshort.rlists@gmail.com>2017-04-02 15:01:16 -0400
commit7171cab46edde67fb09f7fe7a421174402b793c9 (patch)
tree0ef773f4e6aee08593c8527bb3b38a6dc66713ac /src
parentcf28ce0da510b4342d2e6602ee422c13a41a46e1 (diff)
parenta688347efb4b0d968bdc477385cb1b77e1f648ef (diff)
Merge branch 'master' into 5x6
Diffstat (limited to 'src')
-rw-r--r--src/dactyl_keyboard/dactyl.clj8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj
index 0e5bd10..918cf0a 100644
--- a/src/dactyl_keyboard/dactyl.clj
+++ b/src/dactyl_keyboard/dactyl.clj
@@ -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)
))