From de9ca96063412ba6226408f3ab124991b43ab96d Mon Sep 17 00:00:00 2001
From: Luke Hubmayer-Werner <mongoose41@gmail.com>
Date: Tue, 18 Feb 2025 14:08:25 +1030
Subject: [PATCH] 20250218 Pickup casing

---
 CFTubes.scad | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/CFTubes.scad b/CFTubes.scad
index 191ef29..5e81aea 100644
--- a/CFTubes.scad
+++ b/CFTubes.scad
@@ -20,8 +20,8 @@ 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_w = 14.5;
+relay_coil_housing_uncapped_l = 18.2;
 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;
@@ -1050,7 +1050,7 @@ COLOURSCHEME_PETGHF_BLUE = [BAMBU_PETGHF_LAKE_BLUE, BAMBU_PETGHF_LAKE_BLUE, "",
 module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) {
 	$include_colours = include_colours;
 	$guitar_scale_length_mm = PBass_Scale_mm;
-	$id_lines = ["Zweisaiten", "250214-1"];
+	$id_lines = ["Zweisaiten", "250218"];
 	$fsl_mm = fret_scale_length(0);
 
 	$string_diameters_thous = [80, 105];  // Artist BST45130
@@ -1128,19 +1128,33 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) {
 	}
 
 	module Pickup() {
-		module Cavities() translate([0, 16, 0.8]) {
+		module Cavities() translate([0, 16, 0.6]) {
 			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([output_socket_l/2 + 1.0, -30, 0]) rotate([0, 0, 90]) output_socket_placeholder();
 			translate([-12, -23, 0]) cube([24, 18, 10]);
 		}
-		h = 17.8;
+		h = 17.6;
 		w = neck_width(pickup_y);
 		l = 60;
+		module Label(depth=0.2) {
+			// Horizontal Ichthys
+			// translate([0, 0, h-depth]) linear_extrude(depth) scale(1.0) import(file = "svgs/Ichthys.plain.svg", center=true);
+			// Vertical Ichthys
+			translate([0, 0, h-depth]) linear_extrude(depth) scale(1.8) rotate(90) import(file = "svgs/Ichthys.plain.svg", center=true);
+			// Bottom date
+			size = 3;
+			for (i=[0:len($id_lines)-1])
+				linear_extrude(depth) scale(1.8) rotate(90) translate([0, 0.4 - i*(size+0.4)]) mirror([1, 0]) text($id_lines[i], halign="center", size=size, font="Droid Sans");
+		}
 		module Box() {
-			difference() {
-				translate([-w/2, -l/2]) round_cube([w, l, h], r=0.6);
-				Cavities();
+			if (list_has($include_colours, 0)) {
+				difference() {
+					translate([-w/2, -l/2]) round_cube([w, l, h], r=0.6);
+					Cavities();
+					Label();
+				}
 			}
+			if (list_has($include_colours, 1)) Label();
 		}
 
 		slots = [
@@ -1155,8 +1169,9 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) {
 		slot_d = 2;
 		tongue_h = slot_h-0.4;
 		tongue_d = slot_d-0.15;
-		// Bottom
 		$fn=72;
+
+		// Bottom
 		difference() {
 			Box();
 			translate([-w/2, -l/2, split_h]) cube([w, l, 100]);
@@ -1165,9 +1180,11 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) {
 			translate([-7, 0]) cylinder_outer(d=2, h=10);
 		}
 		// Tongues
-		for (s = slots) {
-			hull() {
-				for (v=s) translate([v[0], v[1], split_h]) cylinder(d=tongue_d, h=tongue_h);
+		if (list_has($include_colours, 0)) {
+			for (s = slots) {
+				hull() {
+					for (v=s) translate([v[0], v[1], split_h]) cylinder(d=tongue_d, h=tongue_h);
+				}
 			}
 		}
 
@@ -1372,7 +1389,7 @@ colour_scheme = COLOURSCHEME_ABS_CLOWNFISH;
 // // TwoBangerMk2(preview=true);
 segment = "pickup";
 color(colour_scheme[0]) TwoBangerMk2([0], segment);
-// color(colour_scheme[1]) TwoBangerMk2([1], segment);
+color(colour_scheme[1]) TwoBangerMk2([1], segment);
 // color(colour_scheme[2]) TwoBangerMk2([2], segment);
 // color(colour_scheme[3]) TwoBangerMk2([3], segment);
 // color("red") TwoBangerMk2([4], segment);