diff --git a/rack-mount/frontBoxHolder.scad b/rack-mount/frontBoxHolder.scad index 0a40f65..78ad777 100644 --- a/rack-mount/frontBoxHolder.scad +++ b/rack-mount/frontBoxHolder.scad @@ -2,9 +2,54 @@ include <../config/common.scad> include <../helper/common.scad> +include <./common.scad> use <./plateBase.scad> -module frontBoxHolder(plateThickness=3, plate) { + +frontBoxHolder(u=2, plateThickness=3, cutoutOffsetX=20, cutoutOffsetY=2, cutoutX=147, cutoutY=26, + support=true, supportedZ = 27.5, supportWidth=120, supportDepth=5, supportRailBaseThickness=1.25); + + +module frontBoxHolder(u, plateThickness=3, cutoutOffsetX, cutoutOffsetY, cutoutX, cutoutY, support=false, supportedZ, supportWidth, supportDepth, bottomSupportThickness = 2, supportRailBaseThickness = 2) { + + plateScrewToXEdge = 4.5; // wow these are named poorly + plateScrewToYEdge = 5; + + if (support) { + //assert(supportedZ + 2*supportThickness <= plateScrewToYEdge*2 + u*uDiff); + //assert(supportWidth < rackMountScrewWidth); // not tight, need to include screw radii + } + + difference() { + union() { + plateBase(U=u, plateThickness=plateThickness, screwToXEdge=plateScrewToXEdge, screwToYEdge=plateScrewToYEdge, screwType=mainRailScrewType, filletR=2); + + if (support) { + + bottomSuportThickness = supportRailBaseThickness; + + translate(v=[(rackMountScrewWidth-supportWidth)/2, -plateScrewToYEdge,0]) + cube(size=[supportWidth, bottomSuportThickness, supportDepth]); + + translate(v=[(rackMountScrewWidth-supportWidth)/2, (-plateScrewToYEdge+bottomSuportThickness) + supportedZ,0]) + cube(size=[supportWidth, bottomSuportThickness, supportDepth]); + } + } + + union() { + translate(v=[cutoutOffsetX, cutoutOffsetY-plateScrewToYEdge,-inf/2]) + minkowski() { + r=2; + cylinder(r=r,h=inf); + translate(v=[r, r, 0]) + cube(size = [cutoutX-2*r, cutoutY-2*r, inf]); + } + + } + } + + + } diff --git a/rack-mount/print/boxHolderHelper_P.scad b/rack-mount/print/boxHolderHelper_P.scad new file mode 100644 index 0000000..b9ee7a5 --- /dev/null +++ b/rack-mount/print/boxHolderHelper_P.scad @@ -0,0 +1 @@ +// test test \ No newline at end of file diff --git a/rack-mount/print/frontBoxHolder_P.scad b/rack-mount/print/frontBoxHolder_P.scad new file mode 100644 index 0000000..2bfeddc --- /dev/null +++ b/rack-mount/print/frontBoxHolder_P.scad @@ -0,0 +1,16 @@ +include <../../rack/sharedVariables.scad> +use <../frontBoxHolder.scad> + +frontBoxHolder( + u=2, + plateThickness=3, + cutoutOffsetX=(rackMountScrewWidth-147)/2, + cutoutOffsetY=2, + cutoutX=147, + cutoutY=26, + support=true, + supportedZ = 27.5, + supportWidth=120, + supportDepth=5, + supportRailBaseThickness=1.25 +); diff --git a/rbuild.py b/rbuild.py index 1eb9667..1999198 100644 --- a/rbuild.py +++ b/rbuild.py @@ -4,7 +4,12 @@ import argparse import subprocess import os +<<<<<<< HEAD PATH_TO_OPENSCAD = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD' +======= +PATH_TO_OPENSCAD = 'openscad' +PATH_TO_OPENSCAD_NIGHTLY = 'path/to/nightly/build' +>>>>>>> 380dcb9 (update) # For actual dimensions, please see profiles.scad. class BuildSizeConfig: @@ -179,7 +184,11 @@ def run_openscad(options, nightly): except FileNotFoundError: print('OpenSCAD command not found! ' +<<<<<<< HEAD 'Please make sure that you have OpenSCAD installed and can run OpenSCAD CLI commands. ' +======= + 'Please make sure that you have the OpenSCAD binary configured in rbuild.py.' +>>>>>>> 380dcb9 (update) '(Currently needs Linux/Mac for this)') def assertOpenscadExists(): return os.path.exists(PATH_TO_OPENSCAD) diff --git a/stl/mini/rack/eval_P.stl b/stl/mini/rack/eval_P.stl deleted file mode 100644 index cd74df8..0000000 Binary files a/stl/mini/rack/eval_P.stl and /dev/null differ diff --git a/stl/mini/rack/hingeModule_P1.stl b/stl/mini/rack/hingeModule_P1.stl deleted file mode 100644 index 9f13ce0..0000000 Binary files a/stl/mini/rack/hingeModule_P1.stl and /dev/null differ diff --git a/stl/mini/rack/magnetModule_P1.stl b/stl/mini/rack/magnetModule_P1.stl deleted file mode 100644 index 3d1e29c..0000000 Binary files a/stl/mini/rack/magnetModule_P1.stl and /dev/null differ diff --git a/stl/mini/rack/magnetModule_P2.stl b/stl/mini/rack/magnetModule_P2.stl deleted file mode 100644 index f06b99a..0000000 Binary files a/stl/mini/rack/magnetModule_P2.stl and /dev/null differ diff --git a/stl/mini/rack/mainRail_P.stl b/stl/mini/rack/mainRail_P.stl deleted file mode 100644 index ffd0d82..0000000 Binary files a/stl/mini/rack/mainRail_P.stl and /dev/null differ diff --git a/stl/mini/rack/sideWallLeft_P.stl b/stl/mini/rack/sideWallLeft_P.stl deleted file mode 100644 index 2b601e8..0000000 Binary files a/stl/mini/rack/sideWallLeft_P.stl and /dev/null differ diff --git a/stl/mini/rack/sideWallRight_P.stl b/stl/mini/rack/sideWallRight_P.stl deleted file mode 100644 index f7673dc..0000000 Binary files a/stl/mini/rack/sideWallRight_P.stl and /dev/null differ diff --git a/stl/mini/rack/stackConnectorBottom_P.stl b/stl/mini/rack/stackConnectorBottom_P.stl deleted file mode 100644 index 771e41d..0000000 Binary files a/stl/mini/rack/stackConnectorBottom_P.stl and /dev/null differ diff --git a/stl/mini/rack/stackConnectorDual_P.stl b/stl/mini/rack/stackConnectorDual_P.stl deleted file mode 100644 index dcf1730..0000000 Binary files a/stl/mini/rack/stackConnectorDual_P.stl and /dev/null differ diff --git a/stl/mini/rack/xBar_P.stl b/stl/mini/rack/xBar_P.stl deleted file mode 100644 index d642e47..0000000 Binary files a/stl/mini/rack/xBar_P.stl and /dev/null differ diff --git a/stl/mini/rack/xyPlate_P.stl b/stl/mini/rack/xyPlate_P.stl deleted file mode 100644 index 9b3e34d..0000000 Binary files a/stl/mini/rack/xyPlate_P.stl and /dev/null differ diff --git a/stl/mini/rack/yBar_P.stl b/stl/mini/rack/yBar_P.stl deleted file mode 100644 index 07fad01..0000000 Binary files a/stl/mini/rack/yBar_P.stl and /dev/null differ diff --git a/stl/nano/rack/eval_P.stl b/stl/nano/rack/eval_P.stl deleted file mode 100644 index ebfc377..0000000 Binary files a/stl/nano/rack/eval_P.stl and /dev/null differ diff --git a/stl/nano/rack/hingeModule_P1.stl b/stl/nano/rack/hingeModule_P1.stl deleted file mode 100644 index 9f13ce0..0000000 Binary files a/stl/nano/rack/hingeModule_P1.stl and /dev/null differ diff --git a/stl/nano/rack/magnetModule_P1.stl b/stl/nano/rack/magnetModule_P1.stl deleted file mode 100644 index 3d1e29c..0000000 Binary files a/stl/nano/rack/magnetModule_P1.stl and /dev/null differ diff --git a/stl/nano/rack/magnetModule_P2.stl b/stl/nano/rack/magnetModule_P2.stl deleted file mode 100644 index f06b99a..0000000 Binary files a/stl/nano/rack/magnetModule_P2.stl and /dev/null differ diff --git a/stl/nano/rack/mainRail_P.stl b/stl/nano/rack/mainRail_P.stl deleted file mode 100644 index f43bfdf..0000000 Binary files a/stl/nano/rack/mainRail_P.stl and /dev/null differ diff --git a/stl/nano/rack/sideWallLeft_P.stl b/stl/nano/rack/sideWallLeft_P.stl deleted file mode 100644 index 7c65d1d..0000000 Binary files a/stl/nano/rack/sideWallLeft_P.stl and /dev/null differ diff --git a/stl/nano/rack/sideWallRight_P.stl b/stl/nano/rack/sideWallRight_P.stl deleted file mode 100644 index 3576a52..0000000 Binary files a/stl/nano/rack/sideWallRight_P.stl and /dev/null differ diff --git a/stl/nano/rack/stackConnectorBottom_P.stl b/stl/nano/rack/stackConnectorBottom_P.stl deleted file mode 100644 index 771e41d..0000000 Binary files a/stl/nano/rack/stackConnectorBottom_P.stl and /dev/null differ diff --git a/stl/nano/rack/stackConnectorDual_P.stl b/stl/nano/rack/stackConnectorDual_P.stl deleted file mode 100644 index dcf1730..0000000 Binary files a/stl/nano/rack/stackConnectorDual_P.stl and /dev/null differ diff --git a/stl/nano/rack/xBar_P.stl b/stl/nano/rack/xBar_P.stl deleted file mode 100644 index 10d27c2..0000000 Binary files a/stl/nano/rack/xBar_P.stl and /dev/null differ diff --git a/stl/nano/rack/xyPlate_P.stl b/stl/nano/rack/xyPlate_P.stl deleted file mode 100644 index 6ec74de..0000000 Binary files a/stl/nano/rack/xyPlate_P.stl and /dev/null differ diff --git a/stl/nano/rack/yBar_P.stl b/stl/nano/rack/yBar_P.stl deleted file mode 100644 index 988a42e..0000000 Binary files a/stl/nano/rack/yBar_P.stl and /dev/null differ