diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 6690d43..4952aa9 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -612,14 +612,13 @@ (def trrs-holder-size [6.2 10 2]) ; trrs jack PJ-320A (def trrs-holder-hole-size [6.2 10 6]) ; trrs jack PJ-320A -(def trrs-holder-size-alt-height 6) ; trrs jack PJ-320A -(def trrs-holder-position (map + usb-holder-position [-13.6 -2 0])) +(def trrs-holder-position (map + usb-holder-position [-13.6 0 0])) (def trrs-holder-thickness 2) (def trrs-holder-thickness-2x (* 2 trrs-holder-thickness)) (def trrs-holder (union - (->> (cube (+ (first trrs-holder-size) trrs-holder-thickness-2x) (+ wall-thickness (second trrs-holder-size)) (+ (last trrs-holder-size) trrs-holder-thickness)) - (translate [(first trrs-holder-position) (+ wall-thickness (second trrs-holder-position)) (/ (+ (last trrs-holder-size) trrs-holder-thickness) 2)])))) + (->> (cube (+ (first trrs-holder-size) trrs-holder-thickness-2x) (+ trrs-holder-thickness (second trrs-holder-size)) (+ (last trrs-holder-size) trrs-holder-thickness)) + (translate [(first trrs-holder-position) (second trrs-holder-position) (/ (+ (last trrs-holder-size) trrs-holder-thickness) 2)])))) (def trrs-holder-hole (union @@ -630,7 +629,7 @@ (translate [(first trrs-holder-position) (+ (second trrs-holder-position) (/ (+ (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-hole-size) (translate [(first trrs-holder-position) (second trrs-holder-position) (+ (/ (last trrs-holder-hole-size) 2) trrs-holder-thickness)])))) + (->> (apply cube trrs-holder-hole-size) (translate [(first trrs-holder-position) (+ (/ trrs-holder-thickness -2) (second trrs-holder-position)) (+ (/ (last trrs-holder-hole-size) 2) trrs-holder-thickness)])))) (defn screw-insert-shape [bottom-radius top-radius height] (union