diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..ab84eea Binary files /dev/null and b/.DS_Store differ diff --git a/README.md b/README.md index 2a5c1b2..d84359e 100644 --- a/README.md +++ b/README.md @@ -71,5 +71,5 @@ Generated stls are put into the `stl/` directories. The actual variable values f We recommend you start by printing the `eval_P.stl` file first, just to determine if the default slack/layer height configurations work for you. If parts are too tight/loose please take a look at -[config/slack.scad](config/slack.scad). Please also adjust [config/printing.scad](config/printing.scad) to match your +[config/slack.scad](config/slack.scad). Please also adjust [config/printing.scad](config/slicer.scad) to match your slicer settings. \ No newline at end of file diff --git a/config/common.scad b/config/common.scad index a83ed0e..f7438d9 100644 --- a/config/common.scad +++ b/config/common.scad @@ -3,5 +3,5 @@ include <./dowel.scad> include <./magnet.scad> include <./slack.scad> -include <./printing.scad> +include <./slicer.scad> include <./rackFrame.scad> \ No newline at end of file diff --git a/config/printing.scad b/config/slicer.scad similarity index 100% rename from config/printing.scad rename to config/slicer.scad diff --git a/rbuild.py b/rbuild.py index 6a49e9f..1eb9667 100644 --- a/rbuild.py +++ b/rbuild.py @@ -5,7 +5,6 @@ import subprocess import os PATH_TO_OPENSCAD = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD' -PATH_TO_OPENSCAD_NIGHTLY = 'path/to/nightly/build' # For actual dimensions, please see profiles.scad. class BuildSizeConfig: @@ -22,7 +21,6 @@ BUILD_PARENT_DIR = './stl' RACK_BUILD_TARGET_SUB_DIR = 'rack' RACK_MOUNT_BUILD_TARGET_SUB_DIR = 'rack-mount' - def main(): if not assertOpenscadExists(): @@ -182,7 +180,7 @@ def run_openscad(options, nightly): except FileNotFoundError: print('OpenSCAD command not found! ' 'Please make sure that you have OpenSCAD installed and can run OpenSCAD CLI commands. ' - '(Currently needs Linux for this)') + '(Currently needs Linux/Mac for this)') def assertOpenscadExists(): return os.path.exists(PATH_TO_OPENSCAD) diff --git a/stl/micro/rack-mount/dualLBracketSupportRail_P1.stl b/stl/micro/rack-mount/dualLBracketSupportRail_P1.stl deleted file mode 100644 index c92d6e1..0000000 Binary files a/stl/micro/rack-mount/dualLBracketSupportRail_P1.stl and /dev/null differ diff --git a/stl/micro/rack-mount/dualLBracketSupportRail_P2.stl b/stl/micro/rack-mount/dualLBracketSupportRail_P2.stl deleted file mode 100644 index 2d1a7d0..0000000 Binary files a/stl/micro/rack-mount/dualLBracketSupportRail_P2.stl and /dev/null differ diff --git a/stl/micro/rack-mount/patchPanel_P.stl b/stl/micro/rack-mount/patchPanel_P.stl index f36b738..23b0d22 100644 Binary files a/stl/micro/rack-mount/patchPanel_P.stl and b/stl/micro/rack-mount/patchPanel_P.stl differ diff --git a/stl/micro/rack-mount/sideSupportRail_P1.stl b/stl/micro/rack-mount/sideSupportRail_P1.stl index a2dd054..5b77e9d 100644 Binary files a/stl/micro/rack-mount/sideSupportRail_P1.stl 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 index 3533ebb..a4e8180 100644 Binary files a/stl/micro/rack-mount/sideSupportRail_P2.stl 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 index 26a90f5..ccb8ab8 100644 Binary files a/stl/micro/rack-mount/tray_P.stl 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 8faa7ee..49cc74d 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 dd8befe..ab12747 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 6ef4b64..463b46b 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 5d23b03..16b581e 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 264bf5a..4bf40ae 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 0cd18d6..6309b27 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 5f94eb9..8711e59 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/stackConnectorBottom_P.stl b/stl/micro/rack/stackConnectorBottom_P.stl index 6a029f8..c92c4c5 100644 Binary files a/stl/micro/rack/stackConnectorBottom_P.stl and b/stl/micro/rack/stackConnectorBottom_P.stl differ diff --git a/stl/micro/rack/stackConnectorDual_P.stl b/stl/micro/rack/stackConnectorDual_P.stl index b1ebeb6..cbbc1b9 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 2828f6a..1dec6ac 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 2c97337..cefbbcf 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 b065017..ab81f2f 100644 Binary files a/stl/micro/rack/yBar_P.stl and b/stl/micro/rack/yBar_P.stl differ diff --git a/stl/mini/rack-mount/dualLBracketSupportRail_P1.stl b/stl/mini/rack-mount/dualLBracketSupportRail_P1.stl deleted file mode 100644 index 7b353de..0000000 Binary files a/stl/mini/rack-mount/dualLBracketSupportRail_P1.stl and /dev/null differ diff --git a/stl/mini/rack-mount/dualLBracketSupportRail_P2.stl b/stl/mini/rack-mount/dualLBracketSupportRail_P2.stl deleted file mode 100644 index c2d7179..0000000 Binary files a/stl/mini/rack-mount/dualLBracketSupportRail_P2.stl and /dev/null differ diff --git a/stl/nano/rack-mount/dualLBracketSupportRail_P1.stl b/stl/nano/rack-mount/dualLBracketSupportRail_P1.stl deleted file mode 100644 index e12f552..0000000 Binary files a/stl/nano/rack-mount/dualLBracketSupportRail_P1.stl and /dev/null differ diff --git a/stl/nano/rack-mount/dualLBracketSupportRail_P2.stl b/stl/nano/rack-mount/dualLBracketSupportRail_P2.stl deleted file mode 100644 index a2481aa..0000000 Binary files a/stl/nano/rack-mount/dualLBracketSupportRail_P2.stl and /dev/null differ