From 717d323264d9cfce354a29295623936bb5dbbf4f Mon Sep 17 00:00:00 2001
From: zhao <jazhawang@gmail.com>
Date: Thu, 17 Aug 2023 23:54:58 -0400
Subject: [PATCH] some more cleanup

---
 .../assembly/slideHexNutsIntoYBarXYPlate.scad |  2 +-
 rack/connector/basePlateYBarConnectors.scad   | 30 +++++++++----------
 rack/xyPlate.scad                             |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/rack/assembly/slideHexNutsIntoYBarXYPlate.scad b/rack/assembly/slideHexNutsIntoYBarXYPlate.scad
index 7456fce..4d1ac4d 100644
--- a/rack/assembly/slideHexNutsIntoYBarXYPlate.scad
+++ b/rack/assembly/slideHexNutsIntoYBarXYPlate.scad
@@ -21,7 +21,7 @@ module slideHexNutsIntoYBarXYPlate(at=0) {
 
   module plateHexNut(t) {
     multmatrix(yBarBasePlateConnectorTrans)
-      translate(v=[_heatSetX+t, _heatSetY, 4 + _baseConnRecession]) // TODO gotta rename these
+      translate(v=[basePlateYBarSlideNutDx+t, basePlateYBarSlideNutDy, 4 + _baseConnRecession]) // TODO gotta rename these
         hexNut(rackFrameScrewType);
   }
 
diff --git a/rack/connector/basePlateYBarConnectors.scad b/rack/connector/basePlateYBarConnectors.scad
index 0e5dd30..11f6a16 100644
--- a/rack/connector/basePlateYBarConnectors.scad
+++ b/rack/connector/basePlateYBarConnectors.scad
@@ -2,48 +2,48 @@ include <../../helper/common.scad>
 include <../../config/common.scad>
 include <../sharedVariables.scad>
 
-_mountX = 12;
-_mountY = 14;
-_mountZ = 10;
+// Dimensions for the connector block, applied to y-bar
+yBarXYPlateBlockX = 12;
+yBarXYPlateBlockY = 14;
+yBarXYPlateBlockZ = 10;
 
-// Needed for yBar to align this connector to its inner Y edge
-yBarBasePlateConnectorWidth = _mountX;
+// Needed for y bar to align this connector to its inner Y edge
+yBarBasePlateConnectorWidth = yBarXYPlateBlockX;
 
 // x and y faces of the yBarBasePlateMount_P block
 _innerXFaceToScrew = 6;
 _innerYFaceToScrew = 8;
-
 _baseConnRecession = 3;
 _baseConnY = 8;
 _baseConnOuterXFaceToScrew = 2;
 
-_heatSetX = _mountX - _innerXFaceToScrew;
-_heatSetY = _mountY - _innerYFaceToScrew;
+basePlateYBarSlideNutDx = yBarXYPlateBlockX - _innerXFaceToScrew;
+basePlateYBarSlideNutDy = yBarXYPlateBlockY - _innerYFaceToScrew;
 
 // TODO refactor this entire file
-basePlateScrewMountToYBarXZFace = _heatSetY + joinCornerDepth; // Distance to the nearest YBar XZ face
-basePlateScrewMountToYBarYZFace =  (yBarWidth+_heatSetX) - yBarBasePlateConnectorWidth;
+basePlateScrewMountToYBarXZFace = basePlateYBarSlideNutDy + joinCornerDepth; // Distance to the nearest YBar XZ face
+basePlateScrewMountToYBarYZFace =  (yBarWidth+basePlateYBarSlideNutDx) - yBarBasePlateConnectorWidth;
 
 module onYBarBasePlateConnectorPositive() {
   translate(v=[0,0,yBarWallThickness])
   intersection() {
-    cube(size = [_mountX, _mountY, _mountZ]);
-    halfspace(vpos=[0, -1, -1], p=[0, _mountY-1, _mountZ-1]);
+    cube(size = [yBarXYPlateBlockX, yBarXYPlateBlockY, yBarXYPlateBlockZ]);
+    halfspace(vpos=[0, -1, -1], p=[0, yBarXYPlateBlockY-1, yBarXYPlateBlockZ-1]);
   }
 }
 
 module onYBarBasePlateConnectorNegative() {
 
-  translate(v=[_heatSetX, _heatSetY, 4 + _baseConnRecession])
+  translate(v=[basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, 4 + _baseConnRecession])
   mirror(v=[0,0,1])
   hexNutPocket_N("m3", openSide=false, backSpace=5, bridgeBack=true);
 
   hull() {
     // This has always been a pretty annoying to fit part. Increasing slack to 2*radiusXYSlack to compensate. TODO fix
-    translate(v = [_heatSetX, _heatSetY, _baseConnRecession+overhangSlack])
+    translate(v = [basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, _baseConnRecession+overhangSlack])
     roundCutSlice(radius = heatSetInsertSlotRadiusSlacked(rackFrameScrewType)+2*radiusXYSlack);
 
-    translate(v = [_heatSetX, _heatSetY, 0])
+    translate(v = [basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, 0])
     roundCutSlice(radius = _baseConnY/2 + 2*radiusXYSlack);
   }
 
diff --git a/rack/xyPlate.scad b/rack/xyPlate.scad
index eab9b58..ed8a98c 100644
--- a/rack/xyPlate.scad
+++ b/rack/xyPlate.scad
@@ -3,7 +3,7 @@ include <./connector/connectors.scad>
 
 *xyPlate();
 
-xyPlateConnDx = xBarX + 2*_heatSetX; // X distance between connectors
+xyPlateConnDx = xBarX + 2*basePlateYBarSlideNutDx; // X distance between connectors
 xyPlateConnDy = yBarDepth - 2*basePlateScrewMountToYBarXZFace; // Y distance between connectors
 
 module xyPlate() {