From 258d4e88aeca6fb069e421c9049e5b5d18ed0cb2 Mon Sep 17 00:00:00 2001 From: Chris Palmer Date: Tue, 11 Jun 2019 23:20:28 +0100 Subject: [PATCH] Moved printed parts to their own directory. --- docs/usage.md | 53 +++++++++++++++++++ examples/MainsBreakOutBox/scad/bob_main.scad | 2 +- box.scad => printed/box.scad | 12 ++--- .../box_assembly.scad | 0 butt_box.scad => printed/butt_box.scad | 2 +- .../cable_grommets.scad | 4 +- carriers.scad => printed/carriers.scad | 2 +- .../corner_block.scad | 10 ++-- door_hinge.scad => printed/door_hinge.scad | 4 +- door_latch.scad => printed/door_latch.scad | 6 +-- fan_guard.scad => printed/fan_guard.scad | 2 +- .../fixing_block.scad | 8 +-- foot.scad => printed/foot.scad | 6 +-- handle.scad => printed/handle.scad | 6 +-- .../ribbon_clamp.scad | 8 +-- screw_knob.scad => printed/screw_knob.scad | 6 +-- socket_box.scad => printed/socket_box.scad | 10 ++-- .../strap_handle.scad | 6 +-- readme.md | 32 +++++------ scripts/doc_scripts.py | 2 +- scripts/readme.md | 2 +- scripts/tests.py | 4 +- tests/box.scad | 4 +- tests/butt_box.scad | 2 +- tests/cable_grommets.scad | 2 +- tests/carriers.scad | 2 +- tests/corner_block.scad | 2 +- tests/door_hinge.scad | 2 +- tests/door_latch.scad | 2 +- tests/fan_guard.scad | 2 +- tests/fans.scad | 2 +- tests/fixing_block.scad | 2 +- tests/foot.scad | 2 +- tests/handle.scad | 2 +- tests/ribbon_clamp.scad | 2 +- tests/screw_knob.scad | 2 +- tests/socket_box.scad | 4 +- vitamins/psu.scad | 2 +- 38 files changed, 141 insertions(+), 82 deletions(-) create mode 100644 docs/usage.md rename box.scad => printed/box.scad (99%) rename box_assembly.scad => printed/box_assembly.scad (100%) rename butt_box.scad => printed/butt_box.scad (99%) rename cable_grommets.scad => printed/cable_grommets.scad (99%) rename carriers.scad => printed/carriers.scad (98%) rename corner_block.scad => printed/corner_block.scad (97%) rename door_hinge.scad => printed/door_hinge.scad (99%) rename door_latch.scad => printed/door_latch.scad (96%) rename fan_guard.scad => printed/fan_guard.scad (99%) rename fixing_block.scad => printed/fixing_block.scad (98%) rename foot.scad => printed/foot.scad (98%) rename handle.scad => printed/handle.scad (97%) rename ribbon_clamp.scad => printed/ribbon_clamp.scad (96%) rename screw_knob.scad => printed/screw_knob.scad (96%) rename socket_box.scad => printed/socket_box.scad (95%) rename strap_handle.scad => printed/strap_handle.scad (98%) diff --git a/docs/usage.md b/docs/usage.md new file mode 100644 index 0000000..e7086d7 --- /dev/null +++ b/docs/usage.md @@ -0,0 +1,53 @@ +# NopSCADlib usage + +## Requirements +1. OpenSCAD 2019.05 or later, download it from here: https://www.openscad.org/downloads.html +1. Python 2.7+ or 3.6+ from https://www.python.org/downloads/ +1. ImageMagick www.imagemagick.org + +These are all cross platform tools so NopSCADlib should work on any platform that supports them. +They all need to be added to the executable search path so that they work from the command line. + +### Python packages + +The following Python modules are used and can be installed with pip: + +``` +pip install colorama + +``` + +## Installation + +OpenSCAD it has to be setup to find libraries by setting the ```OPENSCADPATH``` environment variable to where you want to file your libaries and NopSCADlib needs to be installed +in the directory it points to. This can be done with ```git clone https://github.com/nophead/NopSCADlib.git``` while in that directory or by downloading +https://github.com/nophead/NopSCADlib/archive/master.zip and unzipping it to a directory called NopSCADlib if you don't want to use GIT. + +The ```NopSCADlib/scripts``` directory needs to be added to the executable search path. + +The installation can be tested by opening ```NopSCADlib/libtest.scad``` in the GUI. It should render all the objects in the library in about 1 minute. + +Running ```tests``` from the command line will run all the tests in the ```tests``` directory and build the ```readme.md``` catalog. + +## Directory structure + +| Path | Usage | +|:-----|:------| +| ```NopSCADlib``` | Top level scad files and printed parts | +| ```NopSCADlib/doc``` | Documentation like this that is not automatically generated | +| ```NopSCADlib/examples``` | Example projects | +| ```NopSCADlib/gallery``` | Pictures of items that have been made with the library | +| ```NopSCADlib/scripts``` | Python scripts | +| ```NopSCADlib/tests``` | A stand alone test for each type of vitamin and most of the utilities | +| ```NopSCADlib/utils``` | Utilitity scad files | +| ```NopSCADlib/utils/core``` | Core utilities used by nearly everything | +| ```NopSCADlib/vitamins``` | Generally a pair of .scad files for each type of vitamin | + + +## Making a project + +Each project has its own directory and that is used to derive the project's name. There should be a main scad file which contains the main assembly. A skeleton looks like this: - + +```OpenSCAD +//! +include diff --git a/examples/MainsBreakOutBox/scad/bob_main.scad b/examples/MainsBreakOutBox/scad/bob_main.scad index cb42361..c82af26 100644 --- a/examples/MainsBreakOutBox/scad/bob_main.scad +++ b/examples/MainsBreakOutBox/scad/bob_main.scad @@ -36,7 +36,7 @@ $pp1_colour = "dimgrey"; $pp2_colour = [0.9, 0.9, 0.9]; include -use +use echo(extrusion_width = extrusion_width, layer_height = layer_height); wall = 2.5; diff --git a/box.scad b/printed/box.scad similarity index 99% rename from box.scad rename to printed/box.scad index 48b8def..bd287e6 100644 --- a/box.scad +++ b/printed/box.scad @@ -31,13 +31,13 @@ //! //! Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness. // -include -use -use -use +include <../core.scad> +use <../vitamins/sheet.scad> +use <../vitamins/screw.scad> +use <../vitamins/washer.scad> -include -use +include <../vitamins/inserts.scad> +use <../utils/quadrant.scad> bezel_clearance = 0.2; sheet_end_clearance = 1; diff --git a/box_assembly.scad b/printed/box_assembly.scad similarity index 100% rename from box_assembly.scad rename to printed/box_assembly.scad diff --git a/butt_box.scad b/printed/butt_box.scad similarity index 99% rename from butt_box.scad rename to printed/butt_box.scad index d473b73..b2a6173 100644 --- a/butt_box.scad +++ b/printed/butt_box.scad @@ -32,7 +32,7 @@ use use -use +use <../utils/maths.scad> function bbox_screw(type) = type[0]; //! Screw type for corner blocks function bbox_sheets(type) = type[1]; //! Sheet type for the sides diff --git a/cable_grommets.scad b/printed/cable_grommets.scad similarity index 99% rename from cable_grommets.scad rename to printed/cable_grommets.scad index ac2366c..0dc961a 100644 --- a/cable_grommets.scad +++ b/printed/cable_grommets.scad @@ -21,8 +21,8 @@ //! Printed cable grommets for passing cables through panels avoiding sharp edges and in the case //! of conductive panels, an extra layer of insulation. // -include -use +include <../core.scad> +use <../vitamins/cable_strip.scad> base = 1.25; slot_height = round_to_layer(1.27) + layer_height; diff --git a/carriers.scad b/printed/carriers.scad similarity index 98% rename from carriers.scad rename to printed/carriers.scad index f0c914a..6a390bb 100644 --- a/carriers.scad +++ b/printed/carriers.scad @@ -22,7 +22,7 @@ // $extrusion_width = 0.5; -include +include <../core.scad> module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier stl("ESP12F_carrier"); diff --git a/corner_block.scad b/printed/corner_block.scad similarity index 97% rename from corner_block.scad rename to printed/corner_block.scad index ffb1808..396666e 100644 --- a/corner_block.scad +++ b/printed/corner_block.scad @@ -25,11 +25,11 @@ //! //! Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly. // -include -include -include -use -use +include <../core.scad> +include <../vitamins/screws.scad> +include <../vitamins/inserts.scad> +use <../utils/rounded_cylinder.scad> +use <../utils/maths.scad> def_screw = M3_cap_screw; wall = 3; diff --git a/door_hinge.scad b/printed/door_hinge.scad similarity index 99% rename from door_hinge.scad rename to printed/door_hinge.scad index 060a22e..c4e0370 100644 --- a/door_hinge.scad +++ b/printed/door_hinge.scad @@ -23,8 +23,8 @@ //! The screws are tapped into the acrylic. //! Rubber door [sealing strip](#sealing_strip) is used to make it airtight and a [door_latch](#door_latch) holds it closed. // -include -include +include <../core.scad> +include <../vitamins/screws.scad> width = 18; thickness = 4; diff --git a/door_latch.scad b/printed/door_latch.scad similarity index 96% rename from door_latch.scad rename to printed/door_latch.scad index 79e43d4..130b52f 100644 --- a/door_latch.scad +++ b/printed/door_latch.scad @@ -20,9 +20,9 @@ // //! Door latch for 6mm acrylic door for 3D printer. See [door_hinge](#door_hinge). // -include -use -include +include <../core.scad> +use <../utils/hanging_hole.scad> +include <../vitamins/screws.scad> length = 35; width = 12; diff --git a/fan_guard.scad b/printed/fan_guard.scad similarity index 99% rename from fan_guard.scad rename to printed/fan_guard.scad index 348d8a2..7a8857d 100644 --- a/fan_guard.scad +++ b/printed/fan_guard.scad @@ -21,7 +21,7 @@ //! //! The ring spacing as well as the number of spokes can be specified, if zero a gasket is generated instead of a guard. // -use +use <../utils/tube.scad> function fan_guard_thickness() = 2; //! Default thickness diff --git a/fixing_block.scad b/printed/fixing_block.scad similarity index 98% rename from fixing_block.scad rename to printed/fixing_block.scad index 4f11d44..2e36007 100644 --- a/fixing_block.scad +++ b/printed/fixing_block.scad @@ -25,10 +25,10 @@ //! //! Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly. // -include -include -include -use +include <../core.scad> +include <../vitamins/screws.scad> +include <../vitamins/inserts.scad> +use <../utils/maths.scad> def_screw = M3_cap_screw; wall = 2.5; diff --git a/foot.scad b/printed/foot.scad similarity index 98% rename from foot.scad rename to printed/foot.scad index 536587d..2653662 100644 --- a/foot.scad +++ b/printed/foot.scad @@ -21,9 +21,9 @@ //! Customisable printed rubber feet for equipment cases. The insert variant is better for solid feet because //! inserts don't grip well in rubber. // -include -include -include +include <../core.scad> +include <../vitamins/screws.scad> +include <../vitamins/inserts.scad> foot = [25, 12, 3, 2, M4_cap_screw, 10]; insert_foot = [20, 10, 0, 2, M3_cap_screw, 10]; diff --git a/handle.scad b/printed/handle.scad similarity index 97% rename from handle.scad rename to printed/handle.scad index aa295d2..ae98856 100644 --- a/handle.scad +++ b/printed/handle.scad @@ -20,9 +20,9 @@ // //! Printed handle that can be printed without needing support material due to its truncated teardrop profile. // -include -include -include +include <../core.scad> +include <../vitamins/screws.scad> +include <../vitamins/inserts.scad> dia = 18; length = 90; // inside length diff --git a/ribbon_clamp.scad b/printed/ribbon_clamp.scad similarity index 96% rename from ribbon_clamp.scad rename to printed/ribbon_clamp.scad index e8aa642..bae1e15 100644 --- a/ribbon_clamp.scad +++ b/printed/ribbon_clamp.scad @@ -20,10 +20,10 @@ // //! Clamp for ribbon cable and polypropylene strip. // -include -include -include -use +include <../core.scad> +include <../vitamins/screws.scad> +include <../vitamins/inserts.scad> +use <../vitamins/cable_strip.scad> wall = 2; min_wall = 2 * extrusion_width; diff --git a/screw_knob.scad b/printed/screw_knob.scad similarity index 96% rename from screw_knob.scad rename to printed/screw_knob.scad index d140eb5..0dd0e9a 100644 --- a/screw_knob.scad +++ b/printed/screw_knob.scad @@ -20,9 +20,9 @@ // //! Knob with embedded hex head screw. // -include -include -use +include <../core.scad> +include <../vitamins/screws.scad> +use <../utils/hanging_hole.scad> knob_wall = 2; function knob_nut_trap_depth(screw) = round_to_layer(screw_head_height(screw)); diff --git a/socket_box.scad b/printed/socket_box.scad similarity index 95% rename from socket_box.scad rename to printed/socket_box.scad index aa02bc9..6b81d49 100644 --- a/socket_box.scad +++ b/printed/socket_box.scad @@ -20,11 +20,11 @@ // //! UK 13A socket and printed backbox with earth terminal for the panel it is mounted on. // -include -include -include -include -include +include <../core.scad> +include <../vitamins/mains_sockets.scad> +include <../vitamins/screws.scad> +include <../vitamins/inserts.scad> +include <../vitamins/ring_terminals.scad> box_height = 19; base_thickness = 2; diff --git a/strap_handle.scad b/printed/strap_handle.scad similarity index 98% rename from strap_handle.scad rename to printed/strap_handle.scad index de20184..1c0dc3c 100644 --- a/strap_handle.scad +++ b/printed/strap_handle.scad @@ -21,9 +21,9 @@ //! Retracting strap handle. Print the strap with flexible filament. Shown with default dimensions but can //! be fully customised by passing a list of properties. // -include -include -include +include <../core.scad> +include <../vitamins/screws.scad> +include <../vitamins/inserts.scad> strap = [18, 2, M3_pan_screw, 3, 25]; function strap() = strap; diff --git a/readme.md b/readme.md index 6fe3f58..adc6b66 100644 --- a/readme.md +++ b/readme.md @@ -10,6 +10,8 @@ For more examples of what it can make see the [gallery](gallery/readme.md). The license is GNU General Public License v3.0, see [COPYING](COPYING). +See [usage](docs/usage.md) for requirement, installation instructions and usage. + @@ -2796,7 +2798,7 @@ screw type and printed part wall thickness. This diagram shows how the various d Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness. -[box.scad](box.scad) Implementation. +[printed/box.scad](printed/box.scad) Implementation. [tests/box.scad](tests/box.scad) Code for this example. @@ -2901,7 +2903,7 @@ maximum spacing. Uses [fixing blocks](#fixing_block) and [corner blocks](#corner_block). -[butt_box.scad](butt_box.scad) Implementation. +[printed/butt_box.scad](printed/butt_box.scad) Implementation. [tests/butt_box.scad](tests/butt_box.scad) Code for this example. @@ -2985,7 +2987,7 @@ Printed cable grommets for passing cables through panels avoiding sharp edges an of conductive panels, an extra layer of insulation. -[cable_grommets.scad](cable_grommets.scad) Implementation. +[printed/cable_grommets.scad](printed/cable_grommets.scad) Implementation. [tests/cable_grommets.scad](tests/cable_grommets.scad) Code for this example. @@ -3019,7 +3021,7 @@ of conductive panels, an extra layer of insulation. Adapts ESP12 module to 0.1" grid. See . -[carriers.scad](carriers.scad) Implementation. +[printed/carriers.scad](printed/carriers.scad) Implementation. [tests/carriers.scad](tests/carriers.scad) Code for this example. @@ -3049,7 +3051,7 @@ See [butt_box](#Butt_box) for an example of usage. Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly. -[corner_block.scad](corner_block.scad) Implementation. +[printed/corner_block.scad](printed/corner_block.scad) Implementation. [tests/corner_block.scad](tests/corner_block.scad) Code for this example. @@ -3123,7 +3125,7 @@ The screws are tapped into the acrylic. Rubber door [sealing strip](#sealing_strip) is used to make it airtight and a [door_latch](#door_latch) holds it closed. -[door_hinge.scad](door_hinge.scad) Implementation. +[printed/door_hinge.scad](printed/door_hinge.scad) Implementation. [tests/door_hinge.scad](tests/door_hinge.scad) Code for this example. @@ -3176,7 +3178,7 @@ Rubber door [sealing strip](#sealing_strip) is used to make it airtight and a [d Door latch for 6mm acrylic door for 3D printer. See [door_hinge](#door_hinge). -[door_latch.scad](door_latch.scad) Implementation. +[printed/door_latch.scad](printed/door_latch.scad) Implementation. [tests/door_latch.scad](tests/door_latch.scad) Code for this example. @@ -3217,7 +3219,7 @@ Pintable fan finger guard to match the specified fan. To be ```include```d, not The ring spacing as well as the number of spokes can be specified, if zero a gasket is generated instead of a guard. -[fan_guard.scad](fan_guard.scad) Implementation. +[printed/fan_guard.scad](printed/fan_guard.scad) Implementation. [tests/fan_guard.scad](tests/fan_guard.scad) Code for this example. @@ -3261,7 +3263,7 @@ See [butt_box](#Butt_box) for an example of usage. Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly. -[fixing_block.scad](fixing_block.scad) Implementation. +[printed/fixing_block.scad](printed/fixing_block.scad) Implementation. [tests/fixing_block.scad](tests/fixing_block.scad) Code for this example. @@ -3335,7 +3337,7 @@ Customisable printed rubber feet for equipment cases. The insert variant is bett inserts don't grip well in rubber. -[foot.scad](foot.scad) Implementation. +[printed/foot.scad](printed/foot.scad) Implementation. [tests/foot.scad](tests/foot.scad) Code for this example. @@ -3397,7 +3399,7 @@ inserts don't grip well in rubber. Printed handle that can be printed without needing support material due to its truncated teardrop profile. -[handle.scad](handle.scad) Implementation. +[printed/handle.scad](printed/handle.scad) Implementation. [tests/handle.scad](tests/handle.scad) Code for this example. @@ -3447,7 +3449,7 @@ Printed handle that can be printed without needing support material due to its t Clamp for ribbon cable and polypropylene strip. -[ribbon_clamp.scad](ribbon_clamp.scad) Implementation. +[printed/ribbon_clamp.scad](printed/ribbon_clamp.scad) Implementation. [tests/ribbon_clamp.scad](tests/ribbon_clamp.scad) Code for this example. @@ -3499,7 +3501,7 @@ Clamp for ribbon cable and polypropylene strip. Knob with embedded hex head screw. -[screw_knob.scad](screw_knob.scad) Implementation. +[printed/screw_knob.scad](printed/screw_knob.scad) Implementation. [tests/screw_knob.scad](tests/screw_knob.scad) Code for this example. @@ -3538,7 +3540,7 @@ Knob with embedded hex head screw. UK 13A socket and printed backbox with earth terminal for the panel it is mounted on. -[socket_box.scad](socket_box.scad) Implementation. +[printed/socket_box.scad](printed/socket_box.scad) Implementation. [tests/socket_box.scad](tests/socket_box.scad) Code for this example. @@ -3590,7 +3592,7 @@ Retracting strap handle. Print the strap with flexible filament. Shown with defa be fully customised by passing a list of properties. -[strap_handle.scad](strap_handle.scad) Implementation. +[printed/strap_handle.scad](printed/strap_handle.scad) Implementation. [tests/strap_handle.scad](tests/strap_handle.scad) Code for this example. diff --git a/scripts/doc_scripts.py b/scripts/doc_scripts.py index bc30d53..8a8aabc 100644 --- a/scripts/doc_scripts.py +++ b/scripts/doc_scripts.py @@ -35,7 +35,7 @@ def doc_scripts(): print( ''' # Python scripts -These are located in the scripts subdirectory, which needs to be added to the program search path. +These are located in the ```scripts``` subdirectory, which needs to be added to the program search path. They should work with both Python 2 and Python 3. diff --git a/scripts/readme.md b/scripts/readme.md index d5acb01..7e1ecc5 100644 --- a/scripts/readme.md +++ b/scripts/readme.md @@ -1,6 +1,6 @@ # Python scripts -These are located in the scripts subdirectory, which needs to be added to the program search path. +These are located in the ```scripts``` subdirectory, which needs to be added to the program search path. They should work with both Python 2 and Python 3. diff --git a/scripts/tests.py b/scripts/tests.py index b92e0b5..74d7e6e 100644 --- a/scripts/tests.py +++ b/scripts/tests.py @@ -125,7 +125,7 @@ def tests(tests): locations = [ ('vitamins/' + depluralise(base_name) + '.scad', 'Vitamins'), - (base_name + '.scad', 'Printed'), + ('printed/' + base_name + '.scad', 'Printed'), ('utils/' + base_name + '.scad', 'Utilities'), ('utils/core/' + base_name + '.scad', 'Core Utilities'), ] @@ -239,6 +239,8 @@ For more examples of what it can make see the [gallery](gallery/readme.md). The license is GNU General Public License v3.0, see [COPYING](COPYING). +See [usage](docs/usage.md) for requirement, installation instructions and usage. + \n ''', file = doc_file) diff --git a/tests/box.scad b/tests/box.scad index 531b06e..a9698ee 100644 --- a/tests/box.scad +++ b/tests/box.scad @@ -22,11 +22,11 @@ include <../vitamins/screws.scad> include <../vitamins/sheets.scad> include <../vitamins/inserts.scad> -use <../box.scad> +use <../printed/box.scad> box = [M3_dome_screw, 3, DiBond, PMMA3, DiBond6, true, 150, 100, 70]; -include <../box_assembly.scad> +include <../printed/box_assembly.scad> module box_assembly() _box_assembly(box); diff --git a/tests/butt_box.scad b/tests/butt_box.scad index 1a8d419..1811efc 100644 --- a/tests/butt_box.scad +++ b/tests/butt_box.scad @@ -22,7 +22,7 @@ include <../vitamins/screws.scad> include <../vitamins/sheets.scad> include <../vitamins/inserts.scad> -include <../butt_box.scad> +include <../printed/butt_box.scad> $explode = 0; diff --git a/tests/cable_grommets.scad b/tests/cable_grommets.scad index e0faa28..6c0aa05 100644 --- a/tests/cable_grommets.scad +++ b/tests/cable_grommets.scad @@ -18,7 +18,7 @@ // include <../core.scad> -use <../cable_grommets.scad> +use <../printed/cable_grommets.scad> module cable_grommets() { rotate(90) diff --git a/tests/carriers.scad b/tests/carriers.scad index db4e1ce..e09937d 100644 --- a/tests/carriers.scad +++ b/tests/carriers.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../carriers.scad> +use <../printed/carriers.scad> module carriers() color(pp1_colour) ESP12F_carrier_stl(); diff --git a/tests/corner_block.scad b/tests/corner_block.scad index 6972430..cf40758 100644 --- a/tests/corner_block.scad +++ b/tests/corner_block.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../corner_block.scad> +use <../printed/corner_block.scad> include <../vitamins/screws.scad> diff --git a/tests/door_hinge.scad b/tests/door_hinge.scad index ace09fb..137b4e6 100644 --- a/tests/door_hinge.scad +++ b/tests/door_hinge.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../door_hinge.scad> +use <../printed/door_hinge.scad> include <../vitamins/sheets.scad> use <../vitamins/screw.scad> diff --git a/tests/door_latch.scad b/tests/door_latch.scad index 9ee24dc..0cdeebf 100644 --- a/tests/door_latch.scad +++ b/tests/door_latch.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../door_latch.scad> +use <../printed/door_latch.scad> module door_latches() translate([door_latch_offset(), 0]) diff --git a/tests/fan_guard.scad b/tests/fan_guard.scad index a47f7bb..c36c429 100644 --- a/tests/fan_guard.scad +++ b/tests/fan_guard.scad @@ -19,7 +19,7 @@ include <../core.scad> use <../utils/layout.scad> -include <../fan_guard.scad> +include <../printed/fan_guard.scad> include <../vitamins/fans.scad> module fan_guards() diff --git a/tests/fans.scad b/tests/fans.scad index 539beb1..524d1b6 100644 --- a/tests/fans.scad +++ b/tests/fans.scad @@ -19,7 +19,7 @@ include <../core.scad> use <../utils/layout.scad> -include <../fan_guard.scad> +include <../printed/fan_guard.scad> include <../vitamins/fans.scad> diff --git a/tests/fixing_block.scad b/tests/fixing_block.scad index 145bae6..1b67469 100644 --- a/tests/fixing_block.scad +++ b/tests/fixing_block.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../fixing_block.scad> +use <../printed/fixing_block.scad> use <../utils/layout.scad> include <../vitamins/screws.scad> diff --git a/tests/foot.scad b/tests/foot.scad index 39e8bb8..c0a19c1 100644 --- a/tests/foot.scad +++ b/tests/foot.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../foot.scad> +use <../printed/foot.scad> module feet() if($preview) { diff --git a/tests/handle.scad b/tests/handle.scad index 42edac4..2237fc4 100644 --- a/tests/handle.scad +++ b/tests/handle.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../handle.scad> +use <../printed/handle.scad> module handle() translate([handle_length() / 2, 0]) diff --git a/tests/ribbon_clamp.scad b/tests/ribbon_clamp.scad index d797965..90b7443 100644 --- a/tests/ribbon_clamp.scad +++ b/tests/ribbon_clamp.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../ribbon_clamp.scad> +use <../printed/ribbon_clamp.scad> use <../vitamins/wire.scad> ways = 20; diff --git a/tests/screw_knob.scad b/tests/screw_knob.scad index 28b3058..8b2e308 100644 --- a/tests/screw_knob.scad +++ b/tests/screw_knob.scad @@ -17,7 +17,7 @@ // If not, see . // include <../core.scad> -use <../screw_knob.scad> +use <../printed/screw_knob.scad> include <../vitamins/screws.scad> diff --git a/tests/socket_box.scad b/tests/socket_box.scad index 851b8d0..19dd756 100644 --- a/tests/socket_box.scad +++ b/tests/socket_box.scad @@ -17,10 +17,12 @@ // If not, see . // $explode = 1; + include <../core.scad> use <../utils/layout.scad> include <../vitamins/mains_sockets.scad> -use <../socket_box.scad> +use <../printed/socket_box.scad> + module socket_boxes() layout([for(s = mains_sockets) mains_socket_width(s)], 20) if($preview) diff --git a/vitamins/psu.scad b/vitamins/psu.scad index 3920cd7..3a9a196 100644 --- a/vitamins/psu.scad +++ b/vitamins/psu.scad @@ -30,7 +30,7 @@ include use use use -include <../fan_guard.scad> +include <../printed/fan_guard.scad> function psu_face_holes(type) = type[0]; //! List of screw hole positions function psu_face_thickness(type) = type[1]; //! The thickness