diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 4406063..14a6295 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -44,7 +44,7 @@ (def thumb-offsets [6 -3 7]) -(def keyboard-z-offset 11) ; controls overall height; original=9 with centercol=3; use 16 for centercol=2 +(def keyboard-z-offset 10) ; controls overall height; original=9 with centercol=3; use 16 for centercol=2 (def extra-width 2.5) ; extra space between the base of keys; original= 2 (def extra-height 1.0) ; original= 0.5 @@ -1062,7 +1062,7 @@ (union ; thumb walls (wall-brace newthumb-mr-place 0 -1 web-post-br newthumb-tr-place 0 -1 web-post-br) - (wall-brace newthumb-mr-place 0 -1 web-post-br newthumb-mr-place 0 -1 web-post-bl) + (wall-brace newthumb-mr-place 0 -1 web-post-br newthumb-mr-place 0 -1.15 web-post-bl) (wall-brace newthumb-br-place 0 -1 web-post-br newthumb-br-place 0 -1 web-post-bl) (wall-brace newthumb-bl-place -0.3 1 thumb-post-tr newthumb-bl-place 0 1 thumb-post-tl) (wall-brace newthumb-br-place -1 0 web-post-tl newthumb-br-place -1 0 web-post-bl) @@ -1318,8 +1318,7 @@ (defn screw-insert-shape [bottom-radius top-radius height] (union (->> (binding [*fn* 30] - (cylinder [bottom-radius top-radius] height))) - (translate [0 0 (/ height 2)] (->> (binding [*fn* 30] (sphere top-radius)))))) + (cylinder [bottom-radius top-radius] height))))) (defn screw-insert [column row bottom-radius top-radius height offset] (let [shift-right (= column lastcol) @@ -1341,7 +1340,7 @@ (screw-insert (+ 1 innercol-offset) lastrow bottom-radius top-radius height [13 -7 0]))) ; Hole Depth Y: 4.4 -(def screw-insert-height 4) +(def screw-insert-height 6) ; Hole Diameter C: 4.1-4.4 (def screw-insert-bottom-radius (/ 4.0 2)) @@ -1349,7 +1348,7 @@ (def screw-insert-holes (screw-insert-all-shapes screw-insert-bottom-radius screw-insert-top-radius screw-insert-height)) ; Wall Thickness W:\t1.65 -(def screw-insert-outers (screw-insert-all-shapes (+ screw-insert-bottom-radius 1.65) (+ screw-insert-top-radius 1.65) (+ screw-insert-height 1.5))) +(def screw-insert-outers (screw-insert-all-shapes (+ screw-insert-bottom-radius 1.65) (+ screw-insert-top-radius 1.65) (+ screw-insert-height 1))) (def screw-insert-screw-holes (screw-insert-all-shapes 1.7 1.7 350)) ; Connectors between outer column and right wall when 1.5u keys are used