From 8fd48605a9d163aa1a22738c355d1401f6106752 Mon Sep 17 00:00:00 2001 From: Leo Lou Date: Sun, 10 Jun 2018 19:50:34 +0900 Subject: [PATCH 1/5] Reduce hole size --- 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 78cbcb9..23849ee 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -66,8 +66,8 @@ ;; Switch Hole ;; ;;;;;;;;;;;;;;;;; -(def keyswitch-height 14.4) ;; Was 14.1, then 14.25 -(def keyswitch-width 14.4) +(def keyswitch-height 14.1) ;; Was 14.1, then 14.25 +(def keyswitch-width 14.1) (def sa-profile-key-height 12.7) From 4a4726de371be746dff993853562bb448aff0bbc Mon Sep 17 00:00:00 2001 From: Leo Lou Date: Sun, 10 Jun 2018 21:11:56 +0900 Subject: [PATCH 2/5] Reduce the number of thumb keys --- src/dactyl_keyboard/dactyl.clj | 51 ++++++++-------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 23849ee..5748f79 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -357,8 +357,6 @@ (def thumb (union - (thumb-1x-layout single-plate) - (thumb-15x-layout single-plate) (thumb-15x-layout single-plate))) (def thumb-post-tr (translate [(- (/ mount-width 2) post-adj) (- (/ mount-height 2) post-adj) 0] web-post)) @@ -373,35 +371,7 @@ (thumb-tl-place thumb-post-br) (thumb-tr-place thumb-post-tl) (thumb-tr-place thumb-post-bl)) - (triangle-hulls ; bottom two on the right - (thumb-br-place web-post-tr) - (thumb-br-place web-post-br) - (thumb-mr-place web-post-tl) - (thumb-mr-place web-post-bl)) - (triangle-hulls ; tr, mr and wall - (thumb-mr-place web-post-tr) - (thumb-mr-place web-post-br) - (thumb-tr-place thumb-post-br)) - - (triangle-hulls ; centers of the bottom four - (thumb-br-place web-post-tl) - (thumb-bl-place web-post-bl) - (thumb-br-place web-post-tr) - (thumb-bl-place web-post-br) - (thumb-mr-place web-post-tl) - (thumb-mr-place web-post-tr) - (thumb-bl-place web-post-br)) - (triangle-hulls ; top two to the middle two, starting on the left - (thumb-tl-place thumb-post-tl) - (thumb-bl-place web-post-tr) - (thumb-tl-place thumb-post-bl) - (thumb-bl-place web-post-br) - (thumb-tl-place thumb-post-br) - (thumb-mr-place web-post-tr) - (thumb-tr-place thumb-post-bl) - ; (thumb-mr-place thumb-post-br) - (thumb-tr-place thumb-post-br)) (triangle-hulls ; top two to the main keyboard, starting on the left (thumb-tl-place thumb-post-tl) (key-place 0 cornerrow web-post-bl) @@ -513,18 +483,19 @@ (for [x (range 4 ncols)] (key-wall-brace x cornerrow 0 -1 web-post-bl x cornerrow 0 -1 web-post-br)) ; TODO fix extra wall (for [x (range 5 ncols)] (key-wall-brace x cornerrow 0 -1 web-post-bl (dec x) cornerrow 0 -1 web-post-br)) ; thumb walls - (wall-brace thumb-mr-place 0 -1 web-post-br thumb-tr-place 0 -1 thumb-post-br) - (wall-brace thumb-mr-place 0 -1 web-post-br thumb-mr-place 0 -1 web-post-bl) - (wall-brace thumb-br-place 0 -1 web-post-br thumb-br-place 0 -1 web-post-bl) - (wall-brace thumb-bl-place 0 1 web-post-tr thumb-bl-place 0 1 web-post-tl) - (wall-brace thumb-br-place -1 0 web-post-tl thumb-br-place -1 0 web-post-bl) - (wall-brace thumb-bl-place -1 0 web-post-tl thumb-bl-place -1 0 web-post-bl) + (wall-brace thumb-tr-place 0 -1 web-post-bl thumb-tr-place 0 -1 thumb-post-br) + (wall-brace thumb-tr-place 0 -1 web-post-bl thumb-tl-place 0 -1 thumb-post-br) + (wall-brace thumb-tl-place 0 -1 web-post-br thumb-tl-place 0 -1 thumb-post-bl) + + ;(wall-brace thumb-bl-place 0 1 web-post-tr thumb-bl-place 0 1 web-post-tl) + ;(wall-brace thumb-br-place -1 0 web-post-tl thumb-br-place -1 0 web-post-bl) + ;(wall-brace thumb-bl-place -1 0 web-post-tl thumb-bl-place -1 0 web-post-bl) ; thumb corners - (wall-brace thumb-br-place -1 0 web-post-bl thumb-br-place 0 -1 web-post-bl) - (wall-brace thumb-bl-place -1 0 web-post-tl thumb-bl-place 0 1 web-post-tl) + (wall-brace thumb-tl-place -1 0 web-post-bl thumb-tl-place 0 -1 web-post-bl) + (wall-brace thumb-tl-place -1 0 web-post-tl thumb-tl-place 0 1 web-post-tl) ; thumb tweeners - (wall-brace thumb-mr-place 0 -1 web-post-bl thumb-br-place 0 -1 web-post-br) - (wall-brace thumb-bl-place -1 0 web-post-bl thumb-br-place -1 0 web-post-tl) + ;(wall-brace thumb-mr-place 0 -1 web-post-bl thumb-br-place 0 -1 web-post-br) + (wall-brace thumb-tl-place -1 0 web-post-tl thumb-tl-place -1 0 web-post-bl) (wall-brace thumb-tr-place 0 -1 thumb-post-br (partial key-place 3 lastrow) 0 -1 web-post-bl) ; clunky bit on the top left thumb connection (normal connectors don't work well) (bottom-hull From 118552c9bcecef56b58b6bc6978b44f794ad3d70 Mon Sep 17 00:00:00 2001 From: Leo Lou Date: Sun, 10 Jun 2018 21:22:59 +0900 Subject: [PATCH 3/5] Remove screw --- src/dactyl_keyboard/dactyl.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 5748f79..894e071 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -591,7 +591,7 @@ (screw-insert 0 lastrow bottom-radius top-radius height [0 8 0]) (screw-insert 3 lastrow bottom-radius top-radius height [9 4 0]) (screw-insert 3 0 bottom-radius top-radius height [6 -3 0]) - (screw-insert 1 lastrow bottom-radius top-radius height [0 -16 0]))) + )) ; Hole Depth Y: 4.4 (def screw-insert-height 4) From 84e010318c51e4da334dc3d00b15a86116557ae5 Mon Sep 17 00:00:00 2001 From: Leo Lou Date: Sun, 10 Jun 2018 21:35:57 +0900 Subject: [PATCH 4/5] Fix thumb walls --- src/dactyl_keyboard/dactyl.clj | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 894e071..636323e 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -501,13 +501,13 @@ (bottom-hull (left-key-place cornerrow -1 (translate (wall-locate2 -1 0) web-post)) (left-key-place cornerrow -1 (translate (wall-locate3 -1 0) web-post)) - (thumb-bl-place (translate (wall-locate2 -0.3 1) web-post-tr)) - (thumb-bl-place (translate (wall-locate3 -0.3 1) web-post-tr))) + (thumb-tl-place (translate (wall-locate2 0 1) web-post-tl)) + (thumb-tl-place (translate (wall-locate3 0 1) web-post-tl))) (hull (left-key-place cornerrow -1 (translate (wall-locate2 -1 0) web-post)) (left-key-place cornerrow -1 (translate (wall-locate3 -1 0) web-post)) - (thumb-bl-place (translate (wall-locate2 -0.3 1) web-post-tr)) - (thumb-bl-place (translate (wall-locate3 -0.3 1) web-post-tr)) + (thumb-tl-place (translate (wall-locate2 0 1) web-post-tl)) + (thumb-tl-place (translate (wall-locate3 0 1) web-post-tl)) (thumb-tl-place thumb-post-tl)) (hull (left-key-place cornerrow -1 web-post) @@ -520,12 +520,6 @@ (left-key-place cornerrow -1 (translate (wall-locate1 -1 0) web-post)) (key-place 0 cornerrow web-post-bl) (key-place 0 cornerrow (translate (wall-locate1 -1 0) web-post-bl)) - (thumb-tl-place thumb-post-tl)) - (hull - (thumb-bl-place web-post-tr) - (thumb-bl-place (translate (wall-locate1 -0.3 1) web-post-tr)) - (thumb-bl-place (translate (wall-locate2 -0.3 1) web-post-tr)) - (thumb-bl-place (translate (wall-locate3 -0.3 1) web-post-tr)) (thumb-tl-place thumb-post-tl)))) (def usb-holder-ref (key-position 0 0 (map - (wall-locate2 0 -1) [0 (/ mount-height 2) 0]))) @@ -590,8 +584,7 @@ (union (screw-insert 0 0 bottom-radius top-radius height [9 10 0]) (screw-insert 0 lastrow bottom-radius top-radius height [0 8 0]) (screw-insert 3 lastrow bottom-radius top-radius height [9 4 0]) - (screw-insert 3 0 bottom-radius top-radius height [6 -3 0]) - )) + (screw-insert 3 0 bottom-radius top-radius height [6 -3 0]))) ; Hole Depth Y: 4.4 (def screw-insert-height 4) From 58a95b8a56622dd710b0bac059ec97f965a391df Mon Sep 17 00:00:00 2001 From: Leo Lou Date: Mon, 11 Jun 2018 11:00:30 +0900 Subject: [PATCH 5/5] Update thumb in tests --- src/dactyl_keyboard/dactyl.clj | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 636323e..ca5ccd3 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -352,7 +352,6 @@ (def thumbcaps (union - (thumb-1x-layout (sa-cap 1)) (thumb-15x-layout (rotate (/ π 2) [0 0 1] (sa-cap 1))))) (def thumb @@ -624,14 +623,17 @@ (spit "things/right-test.scad" (write-scad - (union - key-holes - connectors - thumb - thumb-connectors - case-walls - thumbcaps - caps))) + (difference + (union + key-holes + connectors + thumb + thumb-connectors + case-walls + thumbcaps + caps) + + (translate [0 0 -20] (cube 350 350 40))))) (spit "things/right-plate.scad" (write-scad