diff --git a/rack-mount/print/dualLBracketSupportRail_P1.scad b/rack-mount/print/dualLBracketSupportRail_P1.scad deleted file mode 100644 index 4d636db..0000000 --- a/rack-mount/print/dualLBracketSupportRail_P1.scad +++ /dev/null @@ -1,4 +0,0 @@ -include <../side-rail/dualMount.scad> - -// No supports required -sideSupportRailBase("lBracket"); \ No newline at end of file diff --git a/rack-mount/print/dualLBracketSupportRail_P2.scad b/rack-mount/print/dualLBracketSupportRail_P2.scad deleted file mode 100644 index 555d0eb..0000000 --- a/rack-mount/print/dualLBracketSupportRail_P2.scad +++ /dev/null @@ -1,5 +0,0 @@ -include <../side-rail/dualMount.scad> - -// No supports required -mirror(v=[1,0,0]) -sideSupportRailBase("lBracket"); \ No newline at end of file diff --git a/rack-mount/print/sideSupportRail_P1.scad b/rack-mount/print/sideSupportRail_P1.scad new file mode 100644 index 0000000..278d840 --- /dev/null +++ b/rack-mount/print/sideSupportRail_P1.scad @@ -0,0 +1,3 @@ +use <../sideRail.scad> + +sideSupportRailBase(u=2, double=true, top=true, baseThickness=1.5, sideThickness=4, backThickness=2, supportedZ=27.5, supportedY=101.5, supportedX=159); \ No newline at end of file diff --git a/rack-mount/print/sideSupportRail_P2.scad b/rack-mount/print/sideSupportRail_P2.scad new file mode 100644 index 0000000..b6df894 --- /dev/null +++ b/rack-mount/print/sideSupportRail_P2.scad @@ -0,0 +1,4 @@ +use <../sideRail.scad> + +mirror(v=[1,0,0]) +sideSupportRailBase(u=2, double=true, top=true, baseThickness=1.5, sideThickness=4, backThickness=2, supportedZ=27.5, supportedY=101.5, supportedX=159); \ No newline at end of file diff --git a/rack-mount/print/tray_P.scad b/rack-mount/print/tray_P.scad new file mode 100644 index 0000000..87541dc --- /dev/null +++ b/rack-mount/print/tray_P.scad @@ -0,0 +1,19 @@ +use <../tray.scad> + +// Config variables +trayWidth = 140; +trayDepth = 85; +trayThickness = 3; + +pointHoleRadius = screwRadiusSlacked("m3"); +pointHoleThickness = 2; +pointMountElevation = 1; +mountPoints = [ // [x,y,elevation,holeRadius,holeThickness] + [(27.5),34, pointMountElevation, pointHoleRadius, pointHoleThickness], + [(27.5)+79.5,34, pointMountElevation, pointHoleRadius, pointHoleThickness] +]; + +mountScrewType = "m3"; + +// Rack mount tray that supports screws on the bottom of the rack-mount item +bottomScrewTray(u=1, trayWidth=trayWidth, trayDepth=trayDepth, trayThickness=trayThickness, mountPoints=mountPoints, mountScrewType=mountScrewType); \ No newline at end of file diff --git a/rack-mount/side-rail/dualMount.scad b/rack-mount/sideRail.scad similarity index 96% rename from rack-mount/side-rail/dualMount.scad rename to rack-mount/sideRail.scad index 2b28508..3fd9740 100644 --- a/rack-mount/side-rail/dualMount.scad +++ b/rack-mount/sideRail.scad @@ -1,7 +1,7 @@ -include <../../helper/common.scad> -include <../../config/common.scad> -include <../../rack/sharedVariables.scad> -include <../common.scad> +include <../helper/common.scad> +include <../config/common.scad> +include <../rack/sharedVariables.scad> +include <./common.scad> sideSupportRailBase(u=2, double=true, top=true, baseThickness=1.5, sideThickness=4, backThickness=2, supportedZ=27.5, supportedY=101.5, supportedX=159); diff --git a/rack-mount/tray.scad b/rack-mount/tray.scad index afe3e40..1194231 100644 --- a/rack-mount/tray.scad +++ b/rack-mount/tray.scad @@ -1,19 +1,6 @@ include <./common.scad> use <./rackEars.scad> -// Rack mount tray that supports screws on the bottom of the rack-mount item -bottomScrewTray(u=1); - - -// Config variables -//trayAlignment = "middle"; // middle, right, left -trayWidth = 140; -trayDepth = 85; -trayThickness = 3; - -mountPoints = []; -mountScrewType = "m3"; - module bottomScrewTray(u, trayWidth, trayDepth, trayThickness, mountPoints, mountScrewType) { @@ -38,15 +25,7 @@ module bottomScrewTray(u, trayWidth, trayDepth, trayThickness, mountPoints, moun leftScrewGlobalX = -leftScrewDistToTray; rightScrewGlobalX = screwDx + leftScrewGlobalX; - pointHoleRadius = screwRadiusSlacked("m3"); - pointHoleThickness = 2; - pointMountElevation = 1; - - points = [ // [x,y,elevation,holeRadius,holeThickness] - [(27.5),34, pointMountElevation, pointHoleRadius, pointHoleThickness], - [(27.5)+79.5,34, pointMountElevation, pointHoleRadius, pointHoleThickness] - ]; - + points=mountPoints; difference() { applyMountHoles(points) diff --git a/stl/micro/rack-mount/sideSupportRail_P1.stl b/stl/micro/rack-mount/sideSupportRail_P1.stl new file mode 100644 index 0000000..c48ef16 Binary files /dev/null and b/stl/micro/rack-mount/sideSupportRail_P1.stl differ diff --git a/stl/micro/rack-mount/sideSupportRail_P2.stl b/stl/micro/rack-mount/sideSupportRail_P2.stl new file mode 100644 index 0000000..185fe52 Binary files /dev/null and b/stl/micro/rack-mount/sideSupportRail_P2.stl differ diff --git a/stl/micro/rack-mount/tray_P.stl b/stl/micro/rack-mount/tray_P.stl new file mode 100644 index 0000000..ecc00c1 Binary files /dev/null and b/stl/micro/rack-mount/tray_P.stl differ diff --git a/stl/micro/rack/eval_P.stl b/stl/micro/rack/eval_P.stl index a50a622..8cc2c6f 100644 Binary files a/stl/micro/rack/eval_P.stl and b/stl/micro/rack/eval_P.stl differ diff --git a/stl/micro/rack/hingeModule_P1.stl b/stl/micro/rack/hingeModule_P1.stl index 00dedf9..2d9f739 100644 Binary files a/stl/micro/rack/hingeModule_P1.stl and b/stl/micro/rack/hingeModule_P1.stl differ diff --git a/stl/micro/rack/magnetModule_P1.stl b/stl/micro/rack/magnetModule_P1.stl index 2eba099..b3fe8c8 100644 Binary files a/stl/micro/rack/magnetModule_P1.stl and b/stl/micro/rack/magnetModule_P1.stl differ diff --git a/stl/micro/rack/magnetModule_P2.stl b/stl/micro/rack/magnetModule_P2.stl index c3daa7a..b1ef18d 100644 Binary files a/stl/micro/rack/magnetModule_P2.stl and b/stl/micro/rack/magnetModule_P2.stl differ diff --git a/stl/micro/rack/mainRail_P.stl b/stl/micro/rack/mainRail_P.stl index 81eae87..ede2c44 100644 Binary files a/stl/micro/rack/mainRail_P.stl and b/stl/micro/rack/mainRail_P.stl differ diff --git a/stl/micro/rack/sideWallLeft_P.stl b/stl/micro/rack/sideWallLeft_P.stl index a77e572..756d487 100644 Binary files a/stl/micro/rack/sideWallLeft_P.stl and b/stl/micro/rack/sideWallLeft_P.stl differ diff --git a/stl/micro/rack/sideWallRight_P.stl b/stl/micro/rack/sideWallRight_P.stl index 7cb562b..39d46d7 100644 Binary files a/stl/micro/rack/sideWallRight_P.stl and b/stl/micro/rack/sideWallRight_P.stl differ diff --git a/stl/micro/rack/stackConnectorDual_P.stl b/stl/micro/rack/stackConnectorDual_P.stl index 87943a7..402b6af 100644 Binary files a/stl/micro/rack/stackConnectorDual_P.stl and b/stl/micro/rack/stackConnectorDual_P.stl differ diff --git a/stl/micro/rack/xBar_P.stl b/stl/micro/rack/xBar_P.stl index e4afee5..43b5035 100644 Binary files a/stl/micro/rack/xBar_P.stl and b/stl/micro/rack/xBar_P.stl differ diff --git a/stl/micro/rack/xyPlate_P.stl b/stl/micro/rack/xyPlate_P.stl index 71818f0..3ea9f0c 100644 Binary files a/stl/micro/rack/xyPlate_P.stl and b/stl/micro/rack/xyPlate_P.stl differ diff --git a/stl/micro/rack/yBar_P.stl b/stl/micro/rack/yBar_P.stl index 4e3d956..b18521b 100644 Binary files a/stl/micro/rack/yBar_P.stl and b/stl/micro/rack/yBar_P.stl differ