Small optimisation to views.py

anywhere else. utils/core/core.scad is the old version without fasteners to
be used internally in the library.

core.scad

@@ -18,22 +18,10 @@
 //
 
 //
-// Include this file to use the miniumum library
+// Include this file to use the miniumum library plus screws, nuts and washers
 //
-include <global_defs.scad>
+include <utils/core/core.scad>
 //
-// Global functions and modules
+// Fasteners used by a lot of other vitamins
 //
-use <utils/core/global.scad>
-
-module use_stl(name) {               //! Import an STL to make a build platter
-    stl(name);
-
-    import(str("../stls/", name, ".stl"));
-}
-
-module use_dxf(name) {               //! Import a DXF to make a build panel
-    dxf(name);
-
-    import(str("../dxfs/", name, ".dxf"));
-}
+include <vitamins/screws.scad>

docs/usage.md

@@ -116,8 +116,8 @@ get shared if other files in the project include ```lib.scad``` as well, or if y
 
 One downside is that any change to the library will mean all the project files need regenerating.
 A more optimised approach for large projects is to include [NopSCADlib/core.scad](../core.scad) instead.
-That only has the a small set of utilities and the global settings in [global_defs.scad](../global_defs.scad). Any vitamins used need to be included explicitly.
-One can copy the include or use line from [NopSCADlib/lib.scad](../lib.scad).
+That only has the a small set of utilities and the global settings in [global_defs.scad](../global_defs.scad) plus screws, nuts and washers that are required by a lot of other vitamins.
+Any other vitamins used need to be included explicitly. One can copy the includes or use a line from [NopSCADlib/lib.scad](../lib.scad).
 
 ### Parametric parts.
 

global_defs.scad

@@ -34,7 +34,7 @@ layer_height    = is_undef($layer_height)    ? 0.25   : $layer_height;    // lay
 extrusion_width = is_undef($extrusion_width) ? 0.5    : $extrusion_width; // filament width when printing
 nozzle          = is_undef($nozzle)          ? 0.45   : $nozzle;          // 3D printer nozzle
 cnc_bit_r       = is_undef($cnc_bit_r)       ? 1.2    : $cnc_bit_r;       // miniumum tool radius when milling 2D objects
-pp1_colour      = is_undef($pp1_colour)      ? "lime" : $pp1_colour;      // printed part colour 1
+pp1_colour      = is_undef($pp1_colour)      ? [0, 146/255, 0] : $pp1_colour; // printed part colour 1, RepRap logo colour
 pp2_colour      = is_undef($pp2_colour)      ? "red"  : $pp2_colour;      // printed part colour 2
 pp3_colour      = is_undef($pp3_colour)      ? "blue" : $pp3_colour;      // printed part colour 3
 pp4_colour      = is_undef($pp4_colour)      ? "darkorange" : $pp4_colour;// printed part colour 4

lib.scad

@@ -23,43 +23,40 @@
 include <core.scad>
 
 include <vitamins/psus.scad>
+include <vitamins/pcbs.scad>
+
+include <vitamins/batteries.scad>
+include <vitamins/blowers.scad>
+include <vitamins/bulldogs.scad>
+include <vitamins/buttons.scad>
+include <vitamins/components.scad>
+include <vitamins/displays.scad>
+include <vitamins/extrusions.scad>
+include <vitamins/geared_steppers.scad>
+include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
+include <vitamins/ldrs.scad>
+include <vitamins/leadnuts.scad>
+include <vitamins/leds.scad>
+include <vitamins/light_strips.scad>
+include <vitamins/mains_sockets.scad>
+include <vitamins/modules.scad>
+include <vitamins/pillars.scad>
+include <vitamins/pulleys.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
-include <vitamins/belts.scad>
-include <vitamins/pulleys.scad>
-include <vitamins/sheets.scad>
-include <vitamins/stepper_motors.scad>
-include <vitamins/components.scad>
-include <vitamins/hot_ends.scad>
-include <vitamins/tubings.scad>
-include <vitamins/zipties.scad>
-include <vitamins/scs_bearing_blocks.scad>
 include <vitamins/rod.scad>
-include <vitamins/leadnuts.scad>
-include <vitamins/bulldogs.scad>
-include <vitamins/pillars.scad>
+include <vitamins/scs_bearing_blocks.scad>
+include <vitamins/sheets.scad>
+include <vitamins/sk_brackets.scad>
+include <vitamins/spools.scad>
 include <vitamins/ssrs.scad>
-include <vitamins/d_connectors.scad>
-include <vitamins/buttons.scad>
-include <vitamins/pcbs.scad>
-include <vitamins/modules.scad>
-include <vitamins/displays.scad>
-include <vitamins/blowers.scad>
-include <vitamins/leds.scad>
+include <vitamins/stepper_motors.scad>
 include <vitamins/toggles.scad>
 include <vitamins/transformers.scad>
+include <vitamins/tubings.scad>
 include <vitamins/variacs.scad>
-include <vitamins/springs.scad>
-include <vitamins/batteries.scad>
-include <vitamins/ball_bearings.scad>
-include <vitamins/light_strips.scad>
-include <vitamins/spools.scad>
-include <vitamins/mains_sockets.scad>
-include <vitamins/ldrs.scad>
-include <vitamins/geared_steppers.scad>
-include <vitamins/extrusions.scad>
-include <vitamins/sk_brackets.scad>
+include <vitamins/zipties.scad>
 
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>

printed/box.scad

@@ -31,7 +31,7 @@
 //!
 //! Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/sheet.scad>
 use <../vitamins/screw.scad>
 use <../vitamins/washer.scad>

printed/cable_grommets.scad

@@ -21,7 +21,7 @@
 //! Printed cable grommets for passing cables through panels avoiding sharp edges and in the case
 //! of conductive panels, an extra layer of insulation.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/cable_strip.scad>
 
 base = 1.25;

printed/carriers.scad

@@ -22,7 +22,7 @@
 //
 $extrusion_width = 0.5;
 
-include <../core.scad>
+include <../utils/core/core.scad>
 
 module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier
     stl("ESP12F_carrier");

printed/corner_block.scad

@@ -31,7 +31,6 @@
 //! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/maths.scad>

printed/door_hinge.scad

@@ -24,7 +24,6 @@
 //! Rubber door [sealing strip](#sealing_strip) is used to make it airtight and a [door_latch](#door_latch) holds it closed.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 
 width = 18;
 thickness = 4;
@@ -142,7 +141,7 @@ module door_hinge_assembly(top, door_thickness = 6) { //! The moving assembly th
 
     translate([0, pin_y - (thickness + door_thickness / 2), dir * width / 2]) {
         rotate([90, 0, 180])
-            color("red") door_hinge(door_thickness);
+            color(pp2_colour) door_hinge(door_thickness);
 
         rotate([90, 0, 0])
             door_hinge_hole_positions()
@@ -166,7 +165,7 @@ module door_hinge_static_assembly(top, sheet_thickness = 3) { //! The stationary
 
     translate([pin_x, 0, -dir * (stat_width / 2 + washer_thickness(screw_washer(pin_screw)))])
         rotate([90, 0, 0]) {
-            color("lime") door_hinge_stat_stl();
+            color(pp1_colour) door_hinge_stat_stl();
 
             door_hinge_stat_hole_positions() {
                 screw_and_washer(stat_screw, stat_screw_length);

printed/door_latch.scad

@@ -22,7 +22,6 @@
 //
 include <../core.scad>
 use <../utils/hanging_hole.scad>
-include <../vitamins/screws.scad>
 
 length = 35;
 width = 12;
@@ -66,7 +65,7 @@ module door_latch_assembly(sheet_thickness = 3) { //! The assembly for a specifi
 
     translate([0, -height - washer_thickness(washer)])
         rotate([-90, 0, 0]) {
-            color("lime") render() door_latch_stl();
+            color(pp1_colour) render() door_latch_stl();
 
             translate_z(nut_trap_depth)
                 vflip()

printed/fixing_block.scad

@@ -31,7 +31,6 @@
 //! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 use <../utils/maths.scad>
 

printed/flat_hinge.scad

@@ -30,7 +30,6 @@
 //! This allows the hinges and one set of screws to belong to one assembly and the other set of screws to another assembly.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 
 function hinge_width(type)       = type[1]; //! Width
 function hinge_depth(type)       = type[2]; //! Depth of each leaf

printed/foot.scad

@@ -22,7 +22,6 @@
 //! inserts don't grip well in rubber.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 foot        = [25, 12, 3, 2, M4_cap_screw, 10];

printed/handle.scad

@@ -21,7 +21,6 @@
 //! Printed handle that can be printed without needing support material due to its truncated teardrop profile.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 dia = 18;

printed/pcb_mount.scad

@@ -22,7 +22,6 @@
 //! The stl must be given a parameterless wrapper in the project that uses it.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/pcb.scad>
 
 clearance = 0.2;

printed/printed_box.scad

@@ -27,7 +27,6 @@
 //! It can also have printed feet on the base with the screws doubling up to hold the base on.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 use <foot.scad>
 

printed/psu_shroud.scad

@@ -22,7 +22,6 @@
 //! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>

printed/ribbon_clamp.scad

@@ -21,7 +21,6 @@
 //! Clamp for ribbon cable and polypropylene strip.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 use <../vitamins/cable_strip.scad>
 

printed/screw_knob.scad

@@ -21,7 +21,6 @@
 //! Knob with embedded hex head screw.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../utils/hanging_hole.scad>
 
 knob_wall = 2;

printed/socket_box.scad

@@ -22,9 +22,8 @@
 //
 include <../core.scad>
 include <../vitamins/mains_sockets.scad>
-include <../vitamins/screws.scad>
-use <../vitamins/insert.scad>
 include <../vitamins/ring_terminals.scad>
+use <../vitamins/insert.scad>
 
 box_height = 19;
 base_thickness = 2;
@@ -93,7 +92,7 @@ assembly(str("socket_box_", type[0])) {
     screw = mains_socket_screw(type);
     insert = screw_insert(screw);
 
-    color("lime") render() socket_box(type);
+    color(pp1_colour) render() socket_box(type);
 
     mains_socket_hole_positions(type)
         translate_z(height)

printed/ssr_shroud.scad

@@ -19,10 +19,9 @@
 
 //
 //! A cover to go over the mains end of an SSR to make it safe to be touched.
-//! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
+//! The STL and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>

printed/strap_handle.scad

@@ -22,7 +22,6 @@
 //! be fully customised by passing a list of properties.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 strap = [18, 2, M3_pan_screw, 3, 25];

readme.md

@@ -2171,6 +2171,7 @@ Face order is bottom, top, left, right, front, back.
 | ```psu_face_iec(type)``` | IEC connector x,y, rotation and type |
 | ```psu_face_switch(type)``` | Rocker switch x,y, rotation and type |
 | ```psu_face_thickness(type)``` | The thickness |
+| ```psu_face_vents(type)``` | Vents array position x,y, rotation, size and corner radius |
 | ```psu_faces(type)``` | List of face descriptions |
 | ```psu_height(type)``` | Height |
 | ```psu_left_bay(type)``` | Bay for terminals |
@@ -4584,7 +4585,7 @@ UK 13A socket and printed backbox with earth terminal for the panel it is mounte
 <a name="Ssr_shroud"></a>
 ## Ssr_shroud
 A cover to go over the mains end of an SSR to make it safe to be touched.
-The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
+The STL and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
 
 
 [printed/ssr_shroud.scad](printed/ssr_shroud.scad) Implementation.

scripts/exports.py

@@ -102,13 +102,6 @@ def make_parts(target, part_type, parts = None):
                                     part = base_name + '.' + part_type
                                     if part in targets:
                                         #
-                                        # make a file to use the module
-                                        #
-                                        part_maker_name = part_type + ".scad"
-                                        with open(part_maker_name, "w") as f:
-                                            f.write("use <%s/%s>\n" % (dir, filename))
-                                            f.write("%s();\n" % module);
-                                        #
                                         # Run openscad on the created file
                                         #
                                         part_file = target_dir + "/" + part
@@ -119,15 +112,21 @@ def make_parts(target, part_type, parts = None):
                                             changed = "No bounds"
                                         if changed:
                                             print(changed)
+                                            #
+                                            # make a file to use the module
+                                            #
+                                            part_maker_name = part_type + ".scad"
+                                            with open(part_maker_name, "w") as f:
+                                                f.write("use <%s/%s>\n" % (dir, filename))
+                                                f.write("%s();\n" % module);
                                             t = time.time()
                                             openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
                                             times.add_time(part, t)
                                             if part_type == 'stl':
                                                 bounds = c14n_stl.canonicalise(part_file)
                                                 bounds_map[part] = bounds
-
+                                            os.remove(part_maker_name)
                                         targets.remove(part)
-                                        os.remove(part_maker_name)
     #
     # Write new bounds file
     #

scripts/render.py

@@ -59,7 +59,7 @@ def render(target, type):
         if mtime(part_file) > mtime(png_name):
             png_maker_name = "png.scad"
             with open(png_maker_name, "w") as f:
-                f.write('color("lime") import("%s");\n' % part_file)
+                f.write('color([0, 146/255, 0]) import("%s");\n' % part_file)
             cam = "--camera=0,0,0,70,0,315,500" if type == 'stl' else "--camera=0,0,0,0,0,0,500"
             render = "--preview" if type == 'stl' else "--render"
             tmp_name = 'tmp.png'

scripts/views.py

@@ -151,13 +151,6 @@ def views(target, do_assemblies = None):
                                             break
                                     if not do_assemblies or module in do_assemblies:
                                         #
-                                        # make a file to use the module
-                                        #
-                                        png_maker_name = 'png.scad'
-                                        with open(png_maker_name, "w") as f:
-                                            f.write("use <%s/%s>\n" % (dir, filename))
-                                            f.write("%s();\n" % module);
-                                        #
                                         # Run openscad on the created file
                                         #
                                         dname = deps_name(deps_dir, filename)
@@ -171,16 +164,23 @@ def views(target, do_assemblies = None):
                                             tmp_name = 'tmp.png'
                                             if changed:
                                                 print(changed)
+                                                #
+                                                # make a file to use the module
+                                                #
+                                                png_maker_name = 'png.scad'
+                                                with open(png_maker_name, "w") as f:
+                                                    f.write("use <%s/%s>\n" % (dir, filename))
+                                                    f.write("%s();\n" % module);
                                                 t = time.time()
                                                 openscad.run_list(options.list() + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name]);
                                                 times.add_time(png_name, t)
                                                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
                                                 update_image(tmp_name, png_name)
+                                                os.remove(png_maker_name)
                                             tn_name = png_name.replace('.png', '_tn.png')
                                             if mtime(png_name) > mtime(tn_name):
                                                 do_cmd(("magick "+ png_name + " -trim -resize 280x280 -background " + background + " -gravity Center -extent 280x280 -bordercolor " + background + " -border 10 " + tmp_name).split())
                                                 update_image(tmp_name, tn_name)
-                                        os.remove(png_maker_name)
                                     done_assemblies.append(module)
                                 else:
                                     if module == 'main_assembly':

tests/annotation.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/annotation.scad>
 
 module annotations() {

tests/batteries.scad

@@ -16,10 +16,9 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/springs.scad>
 include <../vitamins/batteries.scad>
 
 module batteries()

tests/belts.scad

@@ -18,8 +18,6 @@
 //
 include <../core.scad>
 
-include <../vitamins/belts.scad>
-include <../vitamins/screws.scad>
 include <../vitamins/pulleys.scad>
 use <../vitamins/insert.scad>
 use <../utils/layout.scad>

tests/bezier.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/bezier.scad>
 use <../utils/sweep.scad>
 use <../utils/annotation.scad>

tests/blowers.scad

@@ -19,7 +19,6 @@
 include <../core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/blowers.scad>
 
 module blowers()

tests/bom.scad

@@ -21,7 +21,6 @@
 //! BOM and assembly demonstration
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
 use <../vitamins/insert.scad>
 $explode = 1; // Normally set on the command line when generating assembly views with views.py

tests/box.scad

@@ -18,7 +18,6 @@
 //
 include <../core.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
 use <../vitamins/insert.scad>
 

tests/bulldogs.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/bulldogs.scad>

tests/butt_box.scad

@@ -18,7 +18,6 @@
 //
 include <../core.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
 use <../vitamins/insert.scad>
 

tests/buttons.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/buttons.scad>

tests/cable_grommets.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 use <../printed/cable_grommets.scad>
 

tests/cable_strips.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 use <../vitamins/cable_strip.scad>
 

tests/carriers.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../printed/carriers.scad>
 
 module carriers()

tests/clip.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-include <../core.scad>
+include <../utils/core/core.scad>
 
 module clips() {
     clip(xmin = 0, ymin = 0, zmin = 0, zmax = 40) sphere(50);

tests/components.scad

@@ -19,7 +19,6 @@
 include <../core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/components.scad>
 
 module resistors()

tests/corner_block.scad

@@ -19,8 +19,6 @@
 include <../core.scad>
 use <../printed/corner_block.scad>
 
-include <../vitamins/screws.scad>
-
 screws = [M2_cap_screw, M2p5_pan_screw, M3_dome_screw, M4_dome_screw];
 
 module do_corner_block(screw)

tests/d_connectors.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/d_connectors.scad>

tests/door_hinge.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../printed/door_hinge.scad>
 
 include <../vitamins/sheets.scad>

tests/door_latch.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../printed/door_latch.scad>
 
 module door_latches()

tests/extrusion_brackets.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 include <../vitamins/extrusion_brackets.scad>
 include <../vitamins/extrusions.scad>

tests/extrusions.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/extrusions.scad>
@@ -27,4 +27,3 @@ module extrusions()
 
 if ($preview)
     extrusions();
-

tests/fan_guard.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
 include <../printed/fan_guard.scad>
 include <../vitamins/fans.scad>
 
+use <../utils/layout.scad>
+
 module fan_guards()
     layout([for(f = fans) fan_width(f)], 10)
         color(pp1_colour) fan_guard(fans[$i], spokes = fan_width(fans[$i]) > 60 ? 8 : 4);

tests/fans.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
+include <../vitamins/fans.scad>
 include <../printed/fan_guard.scad>
 
-include <../vitamins/fans.scad>
+use <../utils/layout.scad>
+
 
 module fans()
     layout([for(f = fans) fan_width(f)], 10)

tests/fixing_block.scad

@@ -20,8 +20,6 @@ include <../core.scad>
 use <../printed/fixing_block.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
-
 screws = [M2_cap_screw, M2p5_pan_screw, M3_dome_screw, M4_dome_screw];
 
 module fixing_block_test(screw)

tests/flat_hinge.scad

@@ -17,7 +17,6 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../utils/layout.scad>
 use <../printed/flat_hinge.scad>
 

tests/foot.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../printed/foot.scad>
 
 module feet()

tests/fuseholder.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 use <../vitamins/fuseholder.scad>
 

tests/global.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-include <../core.scad>
+include <../utils/core/core.scad>
 
 module globals() {
     linear_extrude(height = eps) {

tests/handle.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../printed/handle.scad>
 
 module handle()

tests/hot_ends.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/hot_ends.scad>

tests/iecs.scad

@@ -17,10 +17,10 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
 include <../vitamins/iecs.scad>
 
+use <../utils/layout.scad>
+
 module iecs()
     layout([for(i = iecs) iec_flange_h(i)], 10)
         rotate(90)

tests/inserts.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/inserts.scad>

tests/jack.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 use <../vitamins/jack.scad>
 

tests/kp_pillow_blocks.scad

@@ -17,10 +17,9 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
 include <../vitamins/kp_pillow_blocks.scad>
-include <../vitamins/nuts.scad>
+
+use <../utils/layout.scad>
 
 module kp_pillow_blocks() {
     screws = [M4_cap_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw];

tests/leadnuts.scad

@@ -19,7 +19,6 @@
 include <../core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/leadnuts.scad>
 
 module leadnuts()

tests/leds.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/leds.scad>

tests/light_strips.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/light_strips.scad>
@@ -29,7 +29,7 @@ module light_strips()
             for(end = [-1, 1])
                 translate([end * (light_strip_cut_length(light, segs) / 2 - d / 2), 0])
                     rotate([90, 0, 90])
-                        color("lime") render()
+                        color(pp1_colour) render()
                             translate_z(-d / 2)
                                 light_strip_clip(light);
         }

tests/linear_bearings.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/linear_bearings.scad>

tests/mains_sockets.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/mains_sockets.scad>

tests/maths.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/maths.scad>
 use <../utils/annotation.scad>
 

tests/meter.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 use <../vitamins/meter.scad>
 

tests/microswitches.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/microswitches.scad>

tests/modules.scad

@@ -17,10 +17,9 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
+include <../vitamins/modules.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
-include <../vitamins/modules.scad>
 
 module modules()
     layout([for(m = modules) mod_length(m)], 5)

tests/nuts.scad

@@ -19,8 +19,6 @@
 include <../core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
-
 module nuts() {
     layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) {
         for(nyloc = [false, true])

tests/offset.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/offset.scad>
 
 module shape()

tests/opengrab.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 use <../vitamins/opengrab.scad>
 

tests/pcb.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-
-use <../vitamins/pcb.scad>
 include <../vitamins/microswitches.scad>
 include <../vitamins/d_connectors.scad>
 
+use <../vitamins/pcb.scad>
+
 gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,1.5,     1,  3,   6,     0,  0,   0];
 gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,1.5,   1,2.5,   6,     0,  0,   0];
 

tests/pcb_mount.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../printed/pcb_mount.scad>
 
 PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", true, [],

tests/pcbs.scad

@@ -17,11 +17,10 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
-include <../vitamins/d_connectors.scad>
 include <../vitamins/pcbs.scad>
 
+use <../utils/layout.scad>
+
 module pcbs()
     layout([for(p = pcbs) pcb_width(p)], 10)
         translate([0, pcb_length(pcbs[$i]) / 2])

tests/pillars.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/pillars.scad>

tests/pin_headers.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/pin_headers.scad>