update variables

This commit is contained in:
zhao
2023-08-18 00:29:41 -04:00
parent 717d323264
commit e7ba539e90
16 changed files with 101 additions and 109 deletions

View File

@ -2,28 +2,6 @@ include <../../helper/common.scad>
include <../../config/common.scad>
include <../sharedVariables.scad>
// Dimensions for the connector block, applied to y-bar
yBarXYPlateBlockX = 12;
yBarXYPlateBlockY = 14;
yBarXYPlateBlockZ = 10;
// 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;
basePlateYBarSlideNutDx = yBarXYPlateBlockX - _innerXFaceToScrew;
basePlateYBarSlideNutDy = yBarXYPlateBlockY - _innerYFaceToScrew;
// TODO refactor this entire file
basePlateScrewMountToYBarXZFace = basePlateYBarSlideNutDy + joinCornerDepth; // Distance to the nearest YBar XZ face
basePlateScrewMountToYBarYZFace = (yBarWidth+basePlateYBarSlideNutDx) - yBarBasePlateConnectorWidth;
module onYBarBasePlateConnectorPositive() {
translate(v=[0,0,yBarWallThickness])
intersection() {
@ -34,17 +12,17 @@ module onYBarBasePlateConnectorPositive() {
module onYBarBasePlateConnectorNegative() {
translate(v=[basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, 4 + _baseConnRecession])
translate(v=[basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, 4 + plateBlockBaseConnRecession])
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 = [basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, _baseConnRecession+overhangSlack])
translate(v = [basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, plateBlockBaseConnRecession+overhangSlack])
roundCutSlice(radius = heatSetInsertSlotRadiusSlacked(rackFrameScrewType)+2*radiusXYSlack);
translate(v = [basePlateYBarSlideNutDx, basePlateYBarSlideNutDy, 0])
roundCutSlice(radius = _baseConnY/2 + 2*radiusXYSlack);
roundCutSlice(radius = plateBlockBaseConnY/2 + 2*radiusXYSlack);
}
}

View File

@ -7,11 +7,7 @@ include <./mainRailYBarConnectors.scad>
include <./sideModuleYBarConnectors.scad>
include <./stackYBarConnectors.scad>
include <./basePlateYBarConnectors.scad>
mirror(v=[1,0,0])
*connectorDebug(on="xBar", to="yBar", trans=identity);
*connectorDebug(on="yBar", to="xBar", trans=identity);
include <./transformations.scad>
// Default is to apply the positive first
module applyConnector(on, to, trans) {
@ -27,7 +23,6 @@ module applyConnector(on, to, trans) {
}
}
module connectorDebug(on, to, trans) {
color([0,1,0])
@ -37,10 +32,8 @@ module connectorDebug(on, to, trans) {
color([1,0,0])
multmatrix(trans)
connectorNegative(on=on, to=to);
}
module applyConnectorDebug(on,to,trans) {
echo("on: ", on, "-- to:", to);
@ -83,5 +76,4 @@ module connectorNegative(on, to) {
} else if (on == "mainRail" && to == "yBar") {
onMainRailYBarConnectorNegative();
}
}

View File

@ -3,22 +3,6 @@ include <../../config/common.scad>
include <../sharedVariables.scad>
connectorYEdgeToYBarYEdge = 5;
connectorXEdgeToYBarXEdge = 5;
connectorRectWidth = 10;
connectorRectDepth = 10;
connectorTotalHeight = 10;
connectorSocketMagnetExtrudeHeight = 1;
connectorTaperStartHeight = 3;
connectorTopR = 3;
connectorRectPlugSlack = -0.2;
connectorRectSocketSlack = 0.2;
connectorBottomToScrew = 6;
module stackConnectorBase(rectSlack, topSlack=0.0) {
wSlacked = connectorRectWidth + rectSlack;

View File

@ -0,0 +1,34 @@
include <../../helper/common.scad>
include <../../config/common.scad>
include <../sharedVariables.scad>
// Y-bar
yBarMirrorOtherCornerTrans = translate(v = [0, yBarDepth, 0]) * mirror(v = [0, 1, 0]);
yBarBasePlateConnectorTrans = translate(v = [yBarWidth-yBarBasePlateConnectorWidth, joinCornerDepth, 0]);
yBarStackConnectorTrans = translate(v = [connectorXEdgeToYBarXEdge, connectorYEdgeToYBarYEdge, 0]);
yBarSideModuleConnectorTrans = translate(v = [
yBarWidth-(railTotalWidth+railSlotToInnerYEdge+railSlotToSideWallSlot+sideWallConnectorSlotWidth),
sideWallSlotToXZ,
yBarHeight
]);
yBarMainRailConnectorTrans = translate(v = [
yBarWidth-(railTotalWidth+railSlotToInnerYEdge),
railSlotToXZ,
yBarHeight-railFootThickness
]);
yBarXBarConnectorTrans = translate(v = [yBarWidth+eps, 0, 0]);
// X-bar
xBarYBarConnectorTrans = rotate(a=[0,0,-90]);
xBarMirrorOtherCornerTrans = translate(v = [0, xBarX, 0]) * mirror(v = [0, 1, 0]);
// Main rail
mirrorMainRailOtherSideTrans = translate(v = [0, 0, railTotalHeight]) * mirror(v=[0,0,1]);