From a7b61565b0b02b1af41e4c8ad20bd91ae5144d97 Mon Sep 17 00:00:00 2001 From: Leo Lou Date: Tue, 22 May 2018 16:24:46 +0900 Subject: [PATCH] Adjust usb and trrs holder --- src/dactyl_keyboard/dactyl.clj | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 1797b6c..09a002e 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -559,12 +559,12 @@ (def usb-holder-ref (key-position 0 0 (map - (wall-locate2 0 -1) [0 (/ mount-height 2) 0]))) -(def usb-holder-position (map + [15 22.4 0] [(first usb-holder-ref) (second usb-holder-ref) 2.5])) -(def usb-holder-cube (cube 15 12 3)) +(def usb-holder-position (map + [15 22.4 0] [(first usb-holder-ref) (second usb-holder-ref) 2])) +(def usb-holder-cube (cube 15 12 2)) (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 12 5))) +(def usb-holder-holder (translate usb-holder-position (cube 19 12 4))) -(def usb-jack (translate (map + usb-holder-position [0 10 1.5]) (cube 8 20 3))) +(def usb-jack (translate (map + usb-holder-position [0 10 3]) (cube 8 20 3))) (def pro-micro-position (map + (key-position 0 2 (wall-locate3 -1 0)) [-6 0 -20])) (def pro-micro-space-size [4 18 12]) ; z has no wall; @@ -577,7 +577,7 @@ (->> (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 3]) ; trrs jack PJ-320A +(def trrs-holder-size [6.2 13 2]) ; trrs jack PJ-320A (def trrs-holder-position (map + usb-holder-position [-13.6 -4.5 0])) (def trrs-holder-thickness 2) (def trrs-holder-thickness-2x (* 2 trrs-holder-thickness)) @@ -590,9 +590,9 @@ ; circle trrs hole (->> - (->> (binding [*fn* 30] (cylinder 2.55 20))) ; 5mm trrs jack + (->> (binding [*fn* 30] (cylinder 2.5 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 + (translate [(first trrs-holder-position) (+ (second trrs-holder-position) (+ wall-thickness (/ (+ (second trrs-holder-size) trrs-holder-thickness) 2))) (+ 3 (/ (+ (last trrs-holder-size) trrs-holder-thickness) 2))])) ;1.5 padding ; rectangular trrs holder (->> (apply cube trrs-holder-size) (translate [(first trrs-holder-position) (+ (/ wall-thickness 2) (second trrs-holder-position) (/ trrs-holder-thickness 2)) (+ (/ (last trrs-holder-size) 2) trrs-holder-thickness)]))))