From 463f8124c71e6d11c54e6914f38567741d13a42c Mon Sep 17 00:00:00 2001 From: Leo Lou Date: Sun, 20 May 2018 08:19:45 +0900 Subject: [PATCH] Update trrs and usb position and size --- src/dactyl_keyboard/dactyl.clj | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 2e837e9..5781677 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -545,11 +545,12 @@ (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]))) -(def usb-holder-position (map + [12.5 -6 0] [(first usb-holder-ref) (second usb-holder-ref) 4.5])) -(def usb-holder-cube (cube 15 10 9)) -(def usb-holder-space (translate (map + usb-holder-position [0 0 2]) usb-holder-cube)) -(def usb-holder-holder (translate usb-holder-position (cube 19 10 9))) +(def usb-holder-ref (key-position 0 0 (map - (wall-locate2 0 -1) [0 (/ mount-height 2) 0]))) + +(def usb-holder-position (map + [16.5 23.2 0] [(first usb-holder-ref) (second usb-holder-ref) 4])) +(def usb-holder-cube (cube 15 10 6)) +(def usb-holder-space (translate (map + usb-holder-position [0 (* -1 wall-thickness) 1]) usb-holder-cube)) +(def usb-holder-holder (translate usb-holder-position (cube 19 10 8))) (def usb-jack (translate (map + usb-holder-position [0 10 1.5]) (cube 8 20 3))) @@ -564,9 +565,9 @@ (->> (cube (first pro-micro-space-size) (second pro-micro-space-size) (last pro-micro-space-size)) (translate [(- (first pro-micro-position) (/ pro-micro-wall-thickness 2)) (+ (/ pro-micro-wall-thickness 2) (second pro-micro-position)) (last pro-micro-position)]))) -(def trrs-holder-size [6.2 13 6]) ; trrs jack PJ-320A -(def trrs-holder-position (map + usb-holder-position [-13.6 -4 0])) -(def trrs-holder-thickness 3) +(def trrs-holder-size [6.2 14.1 6]) ; trrs jack PJ-320A +(def trrs-holder-position (map + usb-holder-position [-13.6 -6 0])) +(def trrs-holder-thickness 2) (def trrs-holder-thickness-2x (* 2 trrs-holder-thickness)) (def trrs-holder (union @@ -577,7 +578,7 @@ ; circle trrs hole (->> - (->> (binding [*fn* 30] (cylinder 2.5 20))) ; 5mm trrs jack + (->> (binding [*fn* 30] (cylinder 2.55 20))) ; 5mm trrs jack (rotate (deg2rad 90) [1 0 0]) (translate [(first trrs-holder-position) (+ (second trrs-holder-position) (+ wall-thickness (/ (+ (second trrs-holder-size) trrs-holder-thickness) 2))) (+ 1.5 (/ (+ (last trrs-holder-size) trrs-holder-thickness) 2))])) ;1.5 padding