diff options
| author | Tom Short <tshort.rlists@gmail.com> | 2017-04-02 15:01:16 -0400 |
|---|---|---|
| committer | Tom Short <tshort.rlists@gmail.com> | 2017-04-02 15:01:16 -0400 |
| commit | 7171cab46edde67fb09f7fe7a421174402b793c9 (patch) | |
| tree | 0ef773f4e6aee08593c8527bb3b38a6dc66713ac | |
| parent | cf28ce0da510b4342d2e6602ee422c13a41a46e1 (diff) | |
| parent | a688347efb4b0d968bdc477385cb1b77e1f648ef (diff) | |
Merge branch 'master' into 5x6
| -rw-r--r-- | create-models.sh | 21 | ||||
| -rw-r--r-- | src/dactyl_keyboard/dactyl.clj | 8 |
2 files changed, 22 insertions, 7 deletions
diff --git a/create-models.sh b/create-models.sh index a01b632..0c911fa 100644 --- a/create-models.sh +++ b/create-models.sh @@ -2,6 +2,21 @@ lein run src/dactyl_keyboard/dactyl.clj cp things/right.scad things/right-4x5.scad cp things/left.scad things/left-4x5.scad cp things/right-plate.scad things/right-4x5-plate.scad -openscad -o things/right-4x5.stl things/right-4x5.scad > /dev/null 2>&1 & -openscad -o things/left-4x5.stl things/left-4x5.scad > /dev/null 2>&1 & -openscad -o things/right-4x5-plate.dxf things/right-4x5-plate.scad > /dev/null 2>&1 &
\ No newline at end of file +openscad -o things/right-4x5.stl things/right-4x5.scad >/dev/null 2>&1 & +openscad -o things/left-4x5.stl things/left-4x5.scad >/dev/null 2>&1 & +openscad -o things/right-4x5-plate.dxf things/right-4x5-plate.scad >/dev/null 2>&1 & +# git add things/*-4x5.stl +# 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 + +wait
\ No newline at end of file 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) )) |