From ca53dd20c9f45809888b3a0511c223847e97988a Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Tue, 9 Jan 2024 19:42:22 +0100
Subject: mech: pcb_case: Align connector_z and bolt length

This makes sure that the bolts inside the connectors align with them.
Thus the bolts do not stick inside the case which might lead to PCB
collisions.
---
 mech/pcb_case/conversion.scad | 3 ++-
 mech/pcb_case/pcb.scad        | 3 ++-
 mech/pcb_case/shell.scad      | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mech/pcb_case/conversion.scad b/mech/pcb_case/conversion.scad
index d6add3c..ebf2612 100644
--- a/mech/pcb_case/conversion.scad
+++ b/mech/pcb_case/conversion.scad
@@ -1,7 +1,8 @@
+include <bolt.scad>
 include <nut.scad>
 
 function dim_pcb_to_case(pcb_dim, margins, t) = [
 	pcb_dim[0]+margins[0][0]+margins[0][1]+4*t,
-	pcb_dim[1]+margins[1][0]+margins[1][1]+2*t+4*nut_h,
+	pcb_dim[1]+margins[1][0]+margins[1][1]+2*t+2*bolt_l,
 	pcb_dim[2]+margins[2][0]+margins[2][1]+4*t
 ];
diff --git a/mech/pcb_case/pcb.scad b/mech/pcb_case/pcb.scad
index e742eb5..7b24131 100644
--- a/mech/pcb_case/pcb.scad
+++ b/mech/pcb_case/pcb.scad
@@ -1,7 +1,8 @@
+include <bolt.scad>
 include <nut.scad>
 
 module pcb(dim, drillings, margins, t) {
-	translate([2*t+margins[0][0], t+2*nut_h+margins[1][0], t+margins[2][0]]) {
+	translate([2*t+margins[0][0], bolt_l+margins[1][0], t+margins[2][0]]) {
 		difference() {
 			cube([dim[0], dim[1], dim[2]]);
 			for (drilling = drillings) {
diff --git a/mech/pcb_case/shell.scad b/mech/pcb_case/shell.scad
index bb4c554..18139f6 100644
--- a/mech/pcb_case/shell.scad
+++ b/mech/pcb_case/shell.scad
@@ -51,7 +51,7 @@ module shell_connector(pcb_dim, margins, t) {
 	dim = dim_pcb_to_case(pcb_dim, margins, t);
 
 	size_x = dim[0]-6*t;
-	size_y = 2*nut_h;
+	size_y = bolt_l-t;
 	size_z = dim[2]/2+3*bolt_ds;
 
 	difference () {
@@ -68,7 +68,7 @@ module shell_connector(pcb_dim, margins, t) {
 
 		// nut holes
 		for (x = [dim[0]/4, dim[0]-dim[0]/4]) {
-			translate([x,dim[1]-t-size_y,dim[2]/2+1.5*bolt_ds])
+			translate([x, dim[1]-t-size_y, dim[2]/2+1.5*bolt_ds])
 				rotate([-90,0,0])
 					cylinder(d=nut_d+nut_d_tol, h=nut_h, $fn=30);
 		}
@@ -85,7 +85,7 @@ module pcb_case_shell(pcb_dim, drillings, margins, t) {
 			for (drilling = drillings) {
 				translate([
 					2*t+margins[0][0]+drilling[0],
-					t+2*nut_h+margins[1][0]+drilling[1],
+					bolt_l+margins[1][0]+drilling[1],
 					0
 				]) cylinder(d=nut_d+2, h=t+margins[2][0], $fn=30);
 			}
@@ -93,7 +93,7 @@ module pcb_case_shell(pcb_dim, drillings, margins, t) {
 		for (drilling = drillings) {
 			translate([
 				2*t+margins[0][0]+drilling[0],
-				t+2*nut_h+margins[1][0]+drilling[1],
+				bolt_l+margins[1][0]+drilling[1],
 				0
 			]) {
 				cylinder(d=bolt_ds+bolt_ds_tol, h=t+margins[2][0], $fn=30);
-- 
cgit v1.2.3-70-g09d2