jasmine/dactyl-manuform
1
0
Fork 0
Code Issues Pull requests Packages Projects 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
Show stats Download patch file Download diff file Expand all files Collapse all files

21
create-models.sh
View file

@ -2,6 +2,21 @@ lein run src/dactyl_keyboard/dactyl.clj
cp things/right.scad things/right-4x5.scad cp things/right.scad things/right-4x5.scad
cp things/left.scad things/left-4x5.scad cp things/left.scad things/left-4x5.scad
cp things/right-plate.scad things/right-4x5-plate.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/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/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 & 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

8
src/dactyl_keyboard/dactyl.clj
View file

@ -645,7 +645,7 @@
(let [shift-right (= column lastcol) (let [shift-right (= column lastcol)
shift-left (= column 0) shift-left (= column 0)
shift-up (and (not (or shift-right shift-left)) (= row 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])) 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-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)) (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] (defn screw-insert-all-shapes [bottom-radius top-radius height]
(union ; (screw-insert 0 0 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 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 3 0 bottom-radius top-radius height)
(screw-insert lastcol 1 bottom-radius top-radius height) (screw-insert lastcol 1 bottom-radius top-radius height)
)) ))