diff options
| author | Tom Short <tshort.rlists@gmail.com> | 2017-04-02 14:48:37 -0400 |
|---|---|---|
| committer | Tom Short <tshort.rlists@gmail.com> | 2017-04-02 14:48:37 -0400 |
| commit | d5083932246789a4857b0e61eafe1273801399ee (patch) | |
| tree | 9effef5a33ed9e87bfd424be601819d93ec9d9b1 | |
| parent | db1cad5635b68945830e4c02447299fb89306750 (diff) | |
Adjust screw inserts
| -rw-r--r-- | create-models.sh | 18 | ||||
| -rw-r--r-- | src/dactyl_keyboard/dactyl.clj | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/create-models.sh b/create-models.sh index 8cf8e0e..f44a31c 100644 --- a/create-models.sh +++ b/create-models.sh @@ -9,12 +9,12 @@ openscad -o things/right-4x5-plate.dxf things/right-4x5-plate.scad & # git add things/right-4x5-plate.dxf # git commit -m "Add CAD files" -git checkout 5x6 -lein run src/dactyl_keyboard/dactyl.clj -cp things/right.scad things/right-5x6.scad -cp things/left.scad things/left-5x6.scad -cp things/right-plate.scad things/right-5x6-plate.scad -openscad -o things/right-5x6.stl things/right-5x6.scad & -openscad -o things/left-5x6.stl things/left-5x6.scad & -openscad -o things/right-5x6-plate.dxf things/right-5x6-plate.scad & -git checkout mine/master
\ No newline at end of file +# git checkout 5x6 +# lein run src/dactyl_keyboard/dactyl.clj +# cp things/right.scad things/right-5x6.scad +# cp things/left.scad things/left-5x6.scad +# cp things/right-plate.scad things/right-5x6-plate.scad +# openscad -o things/right-5x6.stl things/right-5x6.scad & +# openscad -o things/left-5x6.stl things/left-5x6.scad & +# openscad -o things/right-5x6-plate.dxf things/right-5x6-plate.scad & +# git checkout mine/master
\ No newline at end of file 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) )) |