jasmine/dactyl-manuform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactor pinky connectors

Browse source
This commit is contained in:
Leo Lou 2018-06-13 16:22:52 +09:00
parent bb24129763
commit 6f1f6b7776
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/dactyl_keyboard/dactyl.clj
View file

@ -274,27 +274,6 @@
(map (partial apply hull) (map (partial apply hull)
(partition 3 1 shapes)))) (partition 3 1 shapes))))
(def pinky-connectors
(apply union
(concat
;; Row connections
(for [row (range 0 lastrow)]
(triangle-hulls
(key-place lastcol row web-post-tr)
(key-place lastcol row wide-post-tr)
(key-place lastcol row web-post-br)
(key-place lastcol row wide-post-br)))
;; Column connections
(for [row (range 0 cornerrow)]
(triangle-hulls
(key-place lastcol row web-post-br)
(key-place lastcol row wide-post-br)
(key-place lastcol (inc row) web-post-tr)
(key-place lastcol (inc row) wide-post-tr)))
)))
(def connectors (def connectors
(apply union (apply union
(concat (concat
@ -323,8 +302,7 @@
(key-place column row web-post-br) (key-place column row web-post-br)
(key-place column (inc row) web-post-tr) (key-place column (inc row) web-post-tr)
(key-place (inc column) row web-post-bl) (key-place (inc column) row web-post-bl)
(key-place (inc column) (inc row) web-post-tl))) (key-place (inc column) (inc row) web-post-tl))))))
)))
;;;;;;;;;;;; ;;;;;;;;;;;;
;; Thumbs ;; ;; Thumbs ;;
@ -683,6 +661,28 @@
(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.5)))
(def screw-insert-screw-holes (screw-insert-all-shapes 1.7 1.7 350)) (def screw-insert-screw-holes (screw-insert-all-shapes 1.7 1.7 350))
(def pinky-connectors
(apply union
(concat
;; Row connections
(for [row (range 0 lastrow)]
(triangle-hulls
(key-place lastcol row web-post-tr)
(key-place lastcol row wide-post-tr)
(key-place lastcol row web-post-br)
(key-place lastcol row wide-post-br)))
;; Column connections
(for [row (range 0 cornerrow)]
(triangle-hulls
(key-place lastcol row web-post-br)
(key-place lastcol row wide-post-br)
(key-place lastcol (inc row) web-post-tr)
(key-place lastcol (inc row) wide-post-tr)))
;; wall
;;
)))
(def model-right (difference (def model-right (difference
(union (union
key-holes key-holes