From db1cad5635b68945830e4c02447299fb89306750 Mon Sep 17 00:00:00 2001 From: Tom Short Date: Sun, 2 Apr 2017 14:21:35 -0400 Subject: Add another screw insert --- src/dactyl_keyboard/dactyl.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 816bff8..8f84fb6 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -656,8 +656,8 @@ ))) (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) + (union (screw-insert 0 0 bottom-radius top-radius height) + (screw-insert 0 lastrow bottom-radius top-radius height) (screw-insert 3 lastrow bottom-radius top-radius height) (screw-insert 3 0 bottom-radius top-radius height) (screw-insert lastcol 1 bottom-radius top-radius height) -- cgit v1.2.3 From d5083932246789a4857b0e61eafe1273801399ee Mon Sep 17 00:00:00 2001 From: Tom Short Date: Sun, 2 Apr 2017 14:48:37 -0400 Subject: Adjust screw inserts --- src/dactyl_keyboard/dactyl.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 8f84fb6..fdb499e 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)) @@ -658,7 +658,7 @@ (defn screw-insert-all-shapes [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 3 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) )) -- cgit v1.2.3