From 6d0fb10224ea8b1c215b2175ee1db3405f7e19b9 Mon Sep 17 00:00:00 2001
From: Luke Hubmayer-Werner <mongoose41@gmail.com>
Date: Tue, 18 Feb 2025 12:07:05 +1030
Subject: [PATCH] Tolerance adjustments

---
 CFTubes.scad | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/CFTubes.scad b/CFTubes.scad
index c6f9f47..191ef29 100644
--- a/CFTubes.scad
+++ b/CFTubes.scad
@@ -20,18 +20,24 @@ shumbucker_w2 = 82.9;  // 1.6mm in, a 2.0mm hole on each side
 relay_coil_housing_w = 15.2;
 relay_coil_housing_l = 18.8;
 relay_coil_housing_h = 15.5;
+relay_coil_housing_uncapped_w = 14.3;
+relay_coil_housing_uncapped_l = 18.0;
+relay_coil_housing_uncapped_h = 15.0;  // Closer to 14.5 without magnet
 // relay_coil_leg_cavity_h = 5;
 relay_coil_leg_cavity_l = 5;
 
-module relay_coil_placeholder(top_clearance=0, bottom_leg_clearance=5) {
-	translate([-relay_coil_housing_w/2, -relay_coil_housing_l/2]) cube([relay_coil_housing_w, relay_coil_housing_l, relay_coil_housing_h+top_clearance]);
-	translate([-relay_coil_housing_w/2, -relay_coil_housing_l/2, -bottom_leg_clearance]) cube([relay_coil_housing_w, relay_coil_leg_cavity_l, bottom_leg_clearance]);
+module relay_coil_placeholder(top_clearance=0, bottom_leg_clearance=5, capped=true, tolerance=0.2) {
+	housing_w = capped ? relay_coil_housing_w : relay_coil_housing_uncapped_w;
+	housing_l = capped ? relay_coil_housing_l : relay_coil_housing_uncapped_l;
+	housing_h = capped ? relay_coil_housing_h : relay_coil_housing_uncapped_h;
+	translate([-housing_w/2, -housing_l/2]) cube([housing_w, housing_l, housing_h+top_clearance]);
+	translate([-housing_w/2, -housing_l/2, -bottom_leg_clearance]) cube([housing_w, relay_coil_leg_cavity_l, bottom_leg_clearance]);
 }
 
 output_socket_plate_thickness = 3;  // The bit with the hole to screw onto
 output_socket_cutout_d = 10.4 + 0.5;
 output_socket_washer_d = 17.0 + 0.5;
-output_socket_l = 25;
+output_socket_l = 26;
 output_socket_w = 20;
 output_socket_h = 15.7 + 0.3;
 output_socket_protrude = 9.5;
@@ -59,7 +65,7 @@ module chromatic_tuner_eq(extra_depth=10, tolerance=0.5) {
 }
 module chromatic_tuner_battery_jack(extra_depth=10, tolerance=0.5) {
 	w = 38.1 + tolerance;
-	h = 47.0 + tolerance;
+	h = 48.0 + tolerance;
 	d = 58 + extra_depth;
 	corner_bevel = 6;
 	translate([0,0,-d/2]) hull() {
@@ -1122,17 +1128,17 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) {
 	}
 
 	module Pickup() {
-		module Cavities() translate([0, 16, 2]) {
-			for (i=[0,1]) translate([string_x(i, pickup_y), 0, 1]) relay_coil_placeholder(bottom_leg_clearance=2.5);
+		module Cavities() translate([0, 16, 0.8]) {
+			for (i=[0,1]) translate([string_x(i, pickup_y), 0, 1]) relay_coil_placeholder(bottom_leg_clearance=1, capped=false);
 			translate([output_socket_l/2, -30, 0]) rotate([0, 0, 90]) output_socket_placeholder();
 			translate([-12, -23, 0]) cube([24, 18, 10]);
 		}
-		h = 20;
+		h = 17.8;
 		w = neck_width(pickup_y);
 		l = 60;
 		module Box() {
 			difference() {
-				translate([-w/2, -l/2]) round_cube([w, l, h], r=2);
+				translate([-w/2, -l/2]) round_cube([w, l, h], r=0.6);
 				Cavities();
 			}
 		}
@@ -1148,7 +1154,7 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) {
 		slot_h = 3;
 		slot_d = 2;
 		tongue_h = slot_h-0.4;
-		tongue_d = slot_d-0.2;
+		tongue_d = slot_d-0.15;
 		// Bottom
 		$fn=72;
 		difference() {