From 9dd0a043e06399e9e87d6024494ea41650a82b0e Mon Sep 17 00:00:00 2001 From: Tom Short Date: Sun, 2 Apr 2017 14:18:26 -0400 Subject: [PATCH 1/5] Edits --- create-models.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/create-models.sh b/create-models.sh index a01b632..f44a31c 100644 --- a/create-models.sh +++ b/create-models.sh @@ -2,6 +2,19 @@ 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 & +openscad -o things/left-4x5.stl things/left-4x5.scad & +openscad -o things/right-4x5-plate.dxf things/right-4x5-plate.scad & +# 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 \ No newline at end of file From a8184af44016f9a8c5b05a8c68a5ef3939f5d34c Mon Sep 17 00:00:00 2001 From: Tom Short Date: Sun, 2 Apr 2017 14:20:12 -0400 Subject: [PATCH 2/5] Try... --- create-models.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/create-models.sh b/create-models.sh index f44a31c..8cf8e0e 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 From db1cad5635b68945830e4c02447299fb89306750 Mon Sep 17 00:00:00 2001 From: Tom Short Date: Sun, 2 Apr 2017 14:21:35 -0400 Subject: [PATCH 3/5] Add another screw insert --- src/dactyl_keyboard/dactyl.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From d5083932246789a4857b0e61eafe1273801399ee Mon Sep 17 00:00:00 2001 From: Tom Short Date: Sun, 2 Apr 2017 14:48:37 -0400 Subject: [PATCH 4/5] Adjust screw inserts --- create-models.sh | 18 +++++++++--------- 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) )) From a688347efb4b0d968bdc477385cb1b77e1f648ef Mon Sep 17 00:00:00 2001 From: Tom Short Date: Sun, 2 Apr 2017 15:00:42 -0400 Subject: [PATCH 5/5] Hide output --- create-models.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/create-models.sh b/create-models.sh index f44a31c..0c911fa 100644 --- a/create-models.sh +++ b/create-models.sh @@ -2,9 +2,9 @@ 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 & -openscad -o things/left-4x5.stl things/left-4x5.scad & -openscad -o things/right-4x5-plate.dxf 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 & # git add things/*-4x5.stl # git add things/right-4x5-plate.dxf # git commit -m "Add CAD files" @@ -17,4 +17,6 @@ openscad -o things/right-4x5-plate.dxf things/right-4x5-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 mine/master + +wait \ No newline at end of file