diff --git a/README.md b/README.md index a62d044..cab5eda 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ Please see [the assembly guide](./assembly-guide). #### Notes: -- Before printing the actual parts. It's recommended to print this evaluation part: [eval_P.scad](./rack/print/eval_P.scad) to test tolerances. If you find the fits too tight/loose, you can adjust them [here](./config/slack.scad). -- Please also adjust [this file](./config/slicer.scad) to match your slicer settings. +- Before printing the actual parts. It's recommended to print this evaluation part: [eval_P.scad](./rack/print/eval_P.scad) to test tolerances. + If you find the fits too tight/loose, you can adjust them [here](./config/print.scad). Please make sure also adjust the layer height in that file, too. - Omitted actual plastic for printing. Any conventional 3d printing plastic should do (PLA, PETG, ABS), but beware of PLA's thermal limits. Higher infill is recommended for all parts. - For joining two racks, you will need to print 4 [rackJoiners](./rack/print/rackJoiner_P.scad), as well as 8 M3 hex nuts, and 8 M3x12 FHCS. diff --git a/config/common.scad b/config/common.scad index f7438d9..452938d 100644 --- a/config/common.scad +++ b/config/common.scad @@ -1,7 +1,5 @@ -// Config aggregator - +// Config aggregator file include <./dowel.scad> include <./magnet.scad> -include <./slack.scad> -include <./slicer.scad> -include <./rackFrame.scad> \ No newline at end of file +include <./rackFrame.scad> +include <./print.scad> diff --git a/config/magnet.scad b/config/magnet.scad index d023263..6be71b0 100644 --- a/config/magnet.scad +++ b/config/magnet.scad @@ -1,4 +1,4 @@ -include <./slack.scad> +include <./print.scad> // Dimensions for small cylindrical neodymium magnets that I bought off Amazon magnetR = 3; diff --git a/config/slack.scad b/config/print.scad similarity index 66% rename from config/slack.scad rename to config/print.scad index 3ff6e3b..9615765 100644 --- a/config/slack.scad +++ b/config/print.scad @@ -1,4 +1,6 @@ -/* +// Print settings config file + +/********************************************************************************************************************** Slack config to standardize different usages of slack/tolerance values. The purpose of this config is to introduce some consistency with how slack values defined in code. E.g. Why is the @@ -12,16 +14,20 @@ - Values are signed. Positive values can be interpreted as how much to remove from the socket along some dimension. - These values depend on print orientation and it's assumed parts are printed in their recommended orientations. */ - -xySlack = 0.35; +xySlack = 0.3; radiusXYSlack = xySlack/2; zSlack = 0.0; -overhangSlack = 0.7; +overhangSlack = 0.5; -supportedOverhangSlack = 0.7; +supportedOverhangSlack = 0.5; // special slack cases, change if neccessary -xBarYBarDovetailSlack = xySlack; \ No newline at end of file +xBarYBarDovetailSlack = xySlack; + +/********************************************************************************************************************** + Printer/slicer config, mainly used for calculating some special overhangs. +*/ +defaultLayerHeight = 0.3; diff --git a/config/slicer.scad b/config/slicer.scad deleted file mode 100644 index e75b84c..0000000 --- a/config/slicer.scad +++ /dev/null @@ -1,5 +0,0 @@ -/* - Printer/slicer config -*/ - -defaultLayerHeight = 0.3; \ No newline at end of file diff --git a/helper/keystone.scad b/helper/keystone.scad index 3d69cfe..37b6ed3 100644 --- a/helper/keystone.scad +++ b/helper/keystone.scad @@ -1,5 +1,5 @@ -include <../config/slack.scad> +include <../config/common.scad> // rj45 slot-to-slot keystone jack model and negative keystoneMainBodyWidth = 15.0; diff --git a/rack-mount/one-offs/rpi/case.scad b/rack-mount/one-offs/rpi/case.scad index 82b7d3c..f11adc7 100644 --- a/rack-mount/one-offs/rpi/case.scad +++ b/rack-mount/one-offs/rpi/case.scad @@ -11,6 +11,7 @@ pcbRise = 3; caseWallThickness = 2; caseBottomThickness = 2; mountPointDiameter = 5; +// TODO use actual reference doc for this mountPoints = [[3.65,23.30,0], [3.65,pcbDimensions[1]-3.65,0], [pcbDimensions[0]-3.65,23.30,0], [pcbDimensions[0]-3.65,pcbDimensions[1]-3.65,0]]; module pcb() { diff --git a/rack/print/eval_P.scad b/rack/print/eval_P.scad index fd2e378..b80d117 100644 --- a/rack/print/eval_P.scad +++ b/rack/print/eval_P.scad @@ -3,7 +3,7 @@ use <../xBar.scad> use <../yBar.scad> use <../mainRail.scad> -// Evaluation print for slack config, please see rackstack/config/slack.scad to configure tolerances +// Evaluation print for slack config, please see rackstack/config/print.scad to configure tolerances // Too tight -> increase slacks values. Too loose -> decrease values intersection() { diff --git a/stl/micro/rack-mount/frontBoxHolder_P.stl b/stl/micro/rack-mount/frontBoxHolder_P.stl index d2eeef0..97c63b5 100644 Binary files a/stl/micro/rack-mount/frontBoxHolder_P.stl and b/stl/micro/rack-mount/frontBoxHolder_P.stl differ diff --git a/stl/micro/rack-mount/patchPanel_P.stl b/stl/micro/rack-mount/patchPanel_P.stl index 113304f..d0fcea2 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 28512a1..6942abd 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 f3e2e10..7ca7ab7 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 ebe5d29..e76fcb0 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 3b9feec..e41e891 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.stl b/stl/micro/rack/hingeModule.stl index c1d3843..04c6b05 100644 Binary files a/stl/micro/rack/hingeModule.stl and b/stl/micro/rack/hingeModule.stl differ diff --git a/stl/micro/rack/magnetModuleLeft_P.stl b/stl/micro/rack/magnetModuleLeft_P.stl index 3a17065..7a02111 100644 Binary files a/stl/micro/rack/magnetModuleLeft_P.stl and b/stl/micro/rack/magnetModuleLeft_P.stl differ diff --git a/stl/micro/rack/magnetModuleRight_P.stl b/stl/micro/rack/magnetModuleRight_P.stl index a85e0c8..378373c 100644 Binary files a/stl/micro/rack/magnetModuleRight_P.stl and b/stl/micro/rack/magnetModuleRight_P.stl differ diff --git a/stl/micro/rack/mainRail_P.stl b/stl/micro/rack/mainRail_P.stl index 955f824..d5e88ad 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/rackFeet_P.stl b/stl/micro/rack/rackFeet_P.stl index cad9453..882eae9 100644 Binary files a/stl/micro/rack/rackFeet_P.stl and b/stl/micro/rack/rackFeet_P.stl differ diff --git a/stl/micro/rack/rackJoiner_P.stl b/stl/micro/rack/rackJoiner_P.stl index a937c3e..0250ba4 100644 Binary files a/stl/micro/rack/rackJoiner_P.stl and b/stl/micro/rack/rackJoiner_P.stl differ diff --git a/stl/micro/rack/sideWallLeft_P.stl b/stl/micro/rack/sideWallLeft_P.stl index e385840..92d7c4e 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 9546db8..2eb14ef 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 7b16c9f..a82ae9f 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/xBar_P.stl b/stl/micro/rack/xBar_P.stl index e005581..5ad1023 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 2b5ad36..efb3baf 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 546336d..6b5d12b 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/frontBoxHolder_P.stl b/stl/mini/rack-mount/frontBoxHolder_P.stl index 2e49b78..e36efbe 100644 Binary files a/stl/mini/rack-mount/frontBoxHolder_P.stl and b/stl/mini/rack-mount/frontBoxHolder_P.stl differ diff --git a/stl/mini/rack-mount/patchPanel_P.stl b/stl/mini/rack-mount/patchPanel_P.stl index 447e7a5..7432e5c 100644 Binary files a/stl/mini/rack-mount/patchPanel_P.stl and b/stl/mini/rack-mount/patchPanel_P.stl differ diff --git a/stl/mini/rack-mount/sideSupportRail_P1.stl b/stl/mini/rack-mount/sideSupportRail_P1.stl index 7b4a29a..11b31e1 100644 Binary files a/stl/mini/rack-mount/sideSupportRail_P1.stl and b/stl/mini/rack-mount/sideSupportRail_P1.stl differ diff --git a/stl/mini/rack-mount/sideSupportRail_P2.stl b/stl/mini/rack-mount/sideSupportRail_P2.stl index a1d3417..cd27ed2 100644 Binary files a/stl/mini/rack-mount/sideSupportRail_P2.stl and b/stl/mini/rack-mount/sideSupportRail_P2.stl differ diff --git a/stl/mini/rack-mount/tray_P.stl b/stl/mini/rack-mount/tray_P.stl index 1c6ba51..c8c27e2 100644 Binary files a/stl/mini/rack-mount/tray_P.stl and b/stl/mini/rack-mount/tray_P.stl differ diff --git a/stl/mini/rack/eval_P.stl b/stl/mini/rack/eval_P.stl index 89abcb3..a2922c5 100644 Binary files a/stl/mini/rack/eval_P.stl and b/stl/mini/rack/eval_P.stl differ diff --git a/stl/mini/rack/hingeModule.stl b/stl/mini/rack/hingeModule.stl index 3391779..ee3b3a5 100644 Binary files a/stl/mini/rack/hingeModule.stl and b/stl/mini/rack/hingeModule.stl differ diff --git a/stl/mini/rack/magnetModuleLeft_P.stl b/stl/mini/rack/magnetModuleLeft_P.stl index 0e401d7..3e0a642 100644 Binary files a/stl/mini/rack/magnetModuleLeft_P.stl and b/stl/mini/rack/magnetModuleLeft_P.stl differ diff --git a/stl/mini/rack/magnetModuleRight_P.stl b/stl/mini/rack/magnetModuleRight_P.stl index af5d743..a6eefe5 100644 Binary files a/stl/mini/rack/magnetModuleRight_P.stl and b/stl/mini/rack/magnetModuleRight_P.stl differ diff --git a/stl/mini/rack/mainRail_P.stl b/stl/mini/rack/mainRail_P.stl index ea69803..b377d6e 100644 Binary files a/stl/mini/rack/mainRail_P.stl and b/stl/mini/rack/mainRail_P.stl differ diff --git a/stl/mini/rack/rackFeet_P.stl b/stl/mini/rack/rackFeet_P.stl index 99c9f89..d97d68a 100644 Binary files a/stl/mini/rack/rackFeet_P.stl and b/stl/mini/rack/rackFeet_P.stl differ diff --git a/stl/mini/rack/rackJoiner_P.stl b/stl/mini/rack/rackJoiner_P.stl index c55842e..d8841bc 100644 Binary files a/stl/mini/rack/rackJoiner_P.stl and b/stl/mini/rack/rackJoiner_P.stl differ diff --git a/stl/mini/rack/sideWallLeft_P.stl b/stl/mini/rack/sideWallLeft_P.stl index 0534a32..76404e6 100644 Binary files a/stl/mini/rack/sideWallLeft_P.stl and b/stl/mini/rack/sideWallLeft_P.stl differ diff --git a/stl/mini/rack/sideWallRight_P.stl b/stl/mini/rack/sideWallRight_P.stl index 6728067..63634eb 100644 Binary files a/stl/mini/rack/sideWallRight_P.stl and b/stl/mini/rack/sideWallRight_P.stl differ diff --git a/stl/mini/rack/stackConnectorBottom_P.stl b/stl/mini/rack/stackConnectorBottom_P.stl index c7ceccf..d36e24f 100644 Binary files a/stl/mini/rack/stackConnectorBottom_P.stl and b/stl/mini/rack/stackConnectorBottom_P.stl differ diff --git a/stl/mini/rack/xBar_P.stl b/stl/mini/rack/xBar_P.stl index c1211bf..fe29502 100644 Binary files a/stl/mini/rack/xBar_P.stl and b/stl/mini/rack/xBar_P.stl differ diff --git a/stl/mini/rack/xyPlate_P.stl b/stl/mini/rack/xyPlate_P.stl index 1b949e2..e5c93b1 100644 Binary files a/stl/mini/rack/xyPlate_P.stl and b/stl/mini/rack/xyPlate_P.stl differ diff --git a/stl/mini/rack/yBar_P.stl b/stl/mini/rack/yBar_P.stl index 1480e8b..b301412 100644 Binary files a/stl/mini/rack/yBar_P.stl and b/stl/mini/rack/yBar_P.stl differ diff --git a/stl/nano/rack/eval_P.stl b/stl/nano/rack/eval_P.stl index 93e7a67..39d6e84 100644 Binary files a/stl/nano/rack/eval_P.stl and b/stl/nano/rack/eval_P.stl differ diff --git a/stl/nano/rack/hingeModule.stl b/stl/nano/rack/hingeModule.stl index 700e94b..aac46c9 100644 Binary files a/stl/nano/rack/hingeModule.stl and b/stl/nano/rack/hingeModule.stl differ diff --git a/stl/nano/rack/magnetModuleLeft_P.stl b/stl/nano/rack/magnetModuleLeft_P.stl index 4fa5ec5..06adc5d 100644 Binary files a/stl/nano/rack/magnetModuleLeft_P.stl and b/stl/nano/rack/magnetModuleLeft_P.stl differ diff --git a/stl/nano/rack/magnetModuleRight_P.stl b/stl/nano/rack/magnetModuleRight_P.stl index 6a740a2..d13b53f 100644 Binary files a/stl/nano/rack/magnetModuleRight_P.stl and b/stl/nano/rack/magnetModuleRight_P.stl differ diff --git a/stl/nano/rack/mainRail_P.stl b/stl/nano/rack/mainRail_P.stl index 0f91806..3a593f4 100644 Binary files a/stl/nano/rack/mainRail_P.stl and b/stl/nano/rack/mainRail_P.stl differ diff --git a/stl/nano/rack/rackFeet_P.stl b/stl/nano/rack/rackFeet_P.stl index 6e1cb33..eabc451 100644 Binary files a/stl/nano/rack/rackFeet_P.stl and b/stl/nano/rack/rackFeet_P.stl differ diff --git a/stl/nano/rack/rackJoiner_P.stl b/stl/nano/rack/rackJoiner_P.stl index 8baebb6..d8841bc 100644 Binary files a/stl/nano/rack/rackJoiner_P.stl and b/stl/nano/rack/rackJoiner_P.stl differ diff --git a/stl/nano/rack/sideWallLeft_P.stl b/stl/nano/rack/sideWallLeft_P.stl index 2fada3a..1bac894 100644 Binary files a/stl/nano/rack/sideWallLeft_P.stl and b/stl/nano/rack/sideWallLeft_P.stl differ diff --git a/stl/nano/rack/sideWallRight_P.stl b/stl/nano/rack/sideWallRight_P.stl index 4b4682c..339d7d6 100644 Binary files a/stl/nano/rack/sideWallRight_P.stl and b/stl/nano/rack/sideWallRight_P.stl differ diff --git a/stl/nano/rack/stackConnectorBottom_P.stl b/stl/nano/rack/stackConnectorBottom_P.stl index 68ec819..2780758 100644 Binary files a/stl/nano/rack/stackConnectorBottom_P.stl and b/stl/nano/rack/stackConnectorBottom_P.stl differ diff --git a/stl/nano/rack/xBar_P.stl b/stl/nano/rack/xBar_P.stl index dcd596f..266d917 100644 Binary files a/stl/nano/rack/xBar_P.stl and b/stl/nano/rack/xBar_P.stl differ diff --git a/stl/nano/rack/xyPlate_P.stl b/stl/nano/rack/xyPlate_P.stl index 525599f..347310b 100644 Binary files a/stl/nano/rack/xyPlate_P.stl and b/stl/nano/rack/xyPlate_P.stl differ diff --git a/stl/nano/rack/yBar_P.stl b/stl/nano/rack/yBar_P.stl index ee48191..cac81ea 100644 Binary files a/stl/nano/rack/yBar_P.stl and b/stl/nano/rack/yBar_P.stl differ