From adf28ebe11d0734e364ae8055312e9dfa6a0b6cf Mon Sep 17 00:00:00 2001
From: Luke Hubmayer-Werner <mongoose41@gmail.com>
Date: Mon, 3 Feb 2025 13:42:15 +1030
Subject: [PATCH] Playing with VLH ABS tolerances

---
 CFTubes.scad     | 38 ++++++++++++++++++++++++++++----------
 CFTubes/ABS.scad |  2 ++
 2 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 CFTubes/ABS.scad

diff --git a/CFTubes.scad b/CFTubes.scad
index af74198..df6efb1 100644
--- a/CFTubes.scad
+++ b/CFTubes.scad
@@ -5,7 +5,8 @@ include <NylonTuner.scad>
 include <CFTubes/common.scad>
 // Choose your material by only including one of the below
 // include <CFTubes/PLA.scad>
-include <CFTubes/PETG.scad>
+// include <CFTubes/PETG.scad>
+include <CFTubes/ABS.scad>
 include <EllipticalNeck.scad>
 
 // Guitar_Scale_Length_mm = 610;  // millimetres, slightly over 24inch (609.6mm) Jaguar scale, should be fine for guitar and u-bass
@@ -727,10 +728,26 @@ module Steel6String(include_colours, from_fret=0, to_fret=1, reference=false) {
 		]]);
 	echo(reinforcing_tube_positions);
 	// Through span construction
-	span_coords = CF_Span_Coords(ply=2);
-	reinforcing_square_positions = [
-		// for (i=[-1,1]) each [ for (v = span_coords) [i*10, rx0, -10] + v ]
-	];
+	rx2 = fret_scale_length(15) - CF_Tube_Len;
+	reinforcing_square_positions = flatten([
+		[
+			for (i=[-1,1]) each [
+				// Headside reinforcement
+				// [i*20.5, rx1, -4],
+				// Bridgeside reinforcement
+				[i*12, rx2, -6],
+				// [i*17.25, rx2, -10],
+				// [i*17, rx0, -12],
+				// [i*3.95, rx0, -16.5],
+			]
+		],
+		[
+			// Headside reinforcement
+			// [0, rx1, -4],
+			// [0, rx1, -11],
+			// Bridgeside reinforcement
+			// [0, rx0, -11],
+		]]);
 	echo(reinforcing_square_positions);
 
 
@@ -890,7 +907,7 @@ module Steel6String(include_colours, from_fret=0, to_fret=1, reference=false) {
 	bridge_channel_depth = 7;
 
 	if (reference) {
-		translate([0, -fsl_mm, 0]) union() {
+		/*translate([0, -fsl_mm, 0]) */union() {
 			c_cf = [0.4, 0.5, 0.5];
 			%MyNeck();
 			// CF square stacks
@@ -1064,10 +1081,11 @@ COLOURSCHEME_PETGHF_BLUE = [BAMBU_PETGHF_LAKE_BLUE, BAMBU_PETGHF_LAKE_BLUE, "",
 
 colour_scheme = COLOURSCHEME_ABSGF_CLOWNFISH;
 // colour_scheme = COLOURSCHEME_ABS_BLUE;
-color(colour_scheme[0]) Steel6String(from_fret=0, to_fret=4, include_colours=[0]);
-color(colour_scheme[1]) Steel6String(from_fret=0, to_fret=4, include_colours=[1]);
-color(colour_scheme[2]) Steel6String(from_fret=0, to_fret=4, include_colours=[2]);
-color(colour_scheme[3]) Steel6String(from_fret=0, to_fret=4, include_colours=[3]);
+color(colour_scheme[0]) rotate([90,0,0]) Steel6String(from_fret=15, to_fret=23, include_colours=[0]);
+color(colour_scheme[1]) rotate([90,0,0]) Steel6String(from_fret=15, to_fret=23, include_colours=[1]);
+color(colour_scheme[2]) rotate([90,0,0]) Steel6String(from_fret=15, to_fret=23, include_colours=[2]);
+color(colour_scheme[3]) rotate([90,0,0]) Steel6String(from_fret=15, to_fret=23, include_colours=[3]);
+// rotate([90,0,0]) Steel6String(include_colours=[0,1,2,3], reference=true);
 
 // TrussRod();
 // difference() {
diff --git a/CFTubes/ABS.scad b/CFTubes/ABS.scad
new file mode 100644
index 0000000..6e12541
--- /dev/null
+++ b/CFTubes/ABS.scad
@@ -0,0 +1,2 @@
+CF_Square_Width_tolerance = 0.24;  // Add to CF_Square_Width when making holes
+CF_Tube_OD_tolerance = 0.36;