Merge branch 'martinbudden-print_search_path'

length calculations.

.gitattributes

@@ -0,0 +1,16 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto eol=lf
+
+# Declare text files that are normalized and converted on checkout.
+*.scad text
+*.py   text
+*.md   text
+
+# Handle Windows batch and command files 
+*.{bat,[bB][aA][tT]} text eol=crlf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+
+# Denote files that are binary and should not be modified.
+*.png binary
+*.jpg binary
+

.gitignore

@@ -7,6 +7,7 @@ tests/bom/
 *.log
 *.html
 bounds.json
+options.json
 times.txt
 *_diff.png
 *.echo

docs/usage.md

@@ -26,7 +26,7 @@ OpenSCAD has to be setup to find libraries by setting the ```OPENSCADPATH``` env
 in the directory it points to. This can be done with ```git clone https://github.com/nophead/NopSCADlib.git``` while in that directory or, if you don't want to use GIT,
 by downloading https://github.com/nophead/NopSCADlib/archive/master.zip and unzipping it to a directory called NopSCADlib.
 
-The ```NopSCADlib/scripts``` directory needs to be added to the executable search path.
+The ```NopSCADlib/scripts``` directory needs to be added to the executable search path, ```PATH``` on Windows and ```path``` on Linux and Mac.
 
 The installation can be tested by opening ```NopSCADlib/libtest.scad``` in the OpenSCAD GUI. It should render all the objects in the library in about 1 minute.
 

gallery/readme.md

@@ -6,6 +6,13 @@ Arduino thermostat to control a beer fridge to use it as an environmental chambe
 ![](ArduinoThermostat.png)
 
 
+<a name="TOP"></a>
+## FilamentDryBox
+A small fan oven with a spool holder to keep the filament warm and dry.
+
+![](FilamentDryBox.png)
+
+
 <a name="TOP"></a>
 ## HydraBot
 Current state of HydraRaptor after being modified for laser engraving.
@@ -68,6 +75,13 @@ Mains isolated and variable supply with metering.
 ![](Mains_Box.png)
 
 
+<a name="TOP"></a>
+## SunBot
+A solar tracker to keep solar powerbanks pointing at the sun.
+
+![](SunBot.png)
+
+
 <a name="TOP"></a>
 ## Turntable
 WiFi enabled remote control turntable for photography

global_defs.scad

@@ -39,6 +39,7 @@ pp2_colour      = is_undef($pp2_colour)      ? "red"  : $pp2_colour;      // pri
 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
 show_rays       = is_undef($show_rays)       ? false  : $show_rays;       // show camera sight lines and light direction
+show_threads    = is_undef($show_threads)    ? false  : $show_threads;    // show screw threads
 
 // Minimum wall is about two filaments wide but we extrude it closer to get better bonding
 squeezed_wall = $preview ? 2 * extrusion_width - layer_height * (1 - PI / 4)
@@ -59,7 +60,9 @@ grey60                          = [0.6, 0.6, 0.6];
 grey70                          = [0.7, 0.7, 0.7];
 grey80                          = [0.8, 0.8, 0.8];
 grey90                          = [0.9, 0.9, 0.9];
-brass                           = "gold";
+gold                            = [255/255, 215/255, 0/255];
+brass                           = [255/255, 220/255, 100/255];
+silver                          = [0.75, 0.75, 0.75];
 
 /*
  * Enums

lib.scad

@@ -62,10 +62,14 @@ 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/scs_bearing_blocks.scad>
 
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>
 use <vitamins/fuseholder.scad>
+use <vitamins/hygrometer.scad>
 
 use <vitamins/opengrab.scad>
 use <vitamins/wire.scad>
@@ -89,3 +93,4 @@ use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>
 use <utils/sector.scad>
+use <utils/thread.scad>

libtest.scad

@@ -32,6 +32,7 @@ use <tests/cable_strips.scad>
 use <tests/components.scad>
 use <tests/d_connectors.scad>
 use <tests/displays.scad>
+use <tests/extrusions.scad>
 use <tests/fans.scad>
 use <tests/fuseholder.scad>
 use <tests/geared_steppers.scad>
@@ -91,6 +92,7 @@ use <tests/strap_handle.scad>
 use <tests/ssr_shroud.scad>
 use <tests/psu_shroud.scad>
 use <tests/flat_hinge.scad>
+use <tests/pcb_mount.scad>
 
 x5 = 800;
 
@@ -134,13 +136,13 @@ translate([x5, cable_grommets_y + 250])
 translate([900, 600])
     box_test();
 
-translate([850, 1170])
+translate([850, 1260])
     bbox_test();
 
 x0 = 0;
 inserts_y = 0;
 nuts_y = inserts_y + 20;
-washers_y = nuts_y + 60;
+washers_y = nuts_y + 100;
 screws_y = washers_y + 120;
 o_rings_y = screws_y + 130;
 springs_y = o_rings_y + 20;
@@ -151,7 +153,7 @@ leadnuts_y = pillars_y + 40;
 pulleys_y = leadnuts_y +40;
 hot_ends_y = pulleys_y + 60;
 linear_bearings_y = hot_ends_y + 50;
-sheets_y = linear_bearings_y + 50;
+sheets_y = linear_bearings_y + 100;
 pcbs_y = sheets_y + 40;
 displays_y = pcbs_y + 150;
 fans_y = displays_y + 100;
@@ -202,6 +204,10 @@ translate([x0, linear_bearings_y]) {
     rods();
 }
 
+translate([x0+150, linear_bearings_y+30]) {
+    extrusions();
+}
+
 translate([x0 + 10, hot_ends_y])
     hot_ends();
 
@@ -248,7 +254,7 @@ buttons_y = spades_y + 40;
 jacks_y = buttons_y + 40;
 microswitches_y = jacks_y + 40;
 rockers_y = microswitches_y + 40;
-toggles_y = rockers_y + 40;
+toggles_y = rockers_y + 60;
 components_y = toggles_y + 40;
 
 translate([x2, leds_y])
@@ -304,6 +310,9 @@ translate([x3, veroboard_y])
 translate([x3 + 70, veroboard_y + 30])
     geared_steppers();
 
+translate([x3 + 140, veroboard_y + 20])
+    pcb_mounts();
+
 translate([x3, d_connectors_y])
     d_connectors();
 
@@ -313,7 +322,10 @@ translate([x3, iecs_y])
 translate([x3 + 15, modules_y])
     microview();
 
-translate([x3 + 40, modules_y])
+translate([x3 + 60, modules_y])
+    hygrometer();
+
+translate([x3 + 90, modules_y])
     modules();
 
 translate([x3, ssrs_y]) {

printed/butt_box.scad

@@ -50,6 +50,10 @@ function bbox_name(type)       = type[8] ? type[8] : "bbox"; //! Optional name i
 function bbox_skip_blocks(type)= type[9] ? type[9] : [];  //! List of fixing blocks to skip, used to allow a hinged panel for example
 function star_washers(type)    = type[10] ? type[10] : is_undef(type[10]); //! Set to false to remove star washers.
 
+function bbox_volume(type) = bbox_width(type) * bbox_depth(type) * bbox_height(type) / 1000000; //! Internal volume in litres
+function bbox_area(type) = let(w =  bbox_width(type), d = bbox_depth(type), h = bbox_height(type)) //! Internal surdface area in m^2
+    2 * (w * d + w * h + d * h) / 1000000;
+
 module bbox_shelf_blank(type) { //! 2D template for a shelf
     dxf(str(bbox_name(type), "_shelf"));
 
@@ -165,7 +169,7 @@ module bbox_right_blank(type, sheet = false) { //! 2D template for the right sid
     }
 }
 
-module bbox_front_blank(type, sheet = false) { //! 2D template for the front
+module bbox_front_blank(type, sheet = false, width = 0) { //! 2D template for the front
     dxf(str(bbox_name(type), "_front"));
 
     t = sheet_thickness(bbox_sheets(type));
@@ -174,7 +178,7 @@ module bbox_front_blank(type, sheet = false) { //! 2D template for the front
 
     difference() {
         translate([0, (bt - bb) / 2])
-            sheet_2D(subst_sheet(type, sheet), bbox_width(type) + 2 * t, bbox_height(type) + bb + bt);
+            sheet_2D(subst_sheet(type, sheet), max(bbox_width(type) + 2 * t, width), bbox_height(type) + bb + bt);
 
         drill_holes(type, rotate([-90, 0, 0]) * translate([0, bbox_depth(type) / 2]));
     }
@@ -205,7 +209,7 @@ module _bbox_assembly(type, top = true, base = true, left = true, right = true,
     width = bbox_width(type);
     depth = bbox_depth(type);
     height = bbox_height(type);
-    echo("Box:", width, depth, height);
+    echo("Box:", width, depth, height, volume = bbox_volume(type), area = bbox_area(type));
 
     t = sheet_thickness(bbox_sheets(type));
     bt = sheet_thickness(bbox_base_sheet(type));

printed/cable_grommets.scad

@@ -195,12 +195,15 @@ module mouse_grommet_assembly(r, thickness)
 module ribbon_grommet_20_3_stl() ribbon_grommet(20, 3);
 module mouse_grommet_15_3_stl() mouse_grommet(1.5, 3);
 module mouse_grommet_20_3_stl() mouse_grommet(2, 3);
+module mouse_grommet_25_3_stl() mouse_grommet(2.5, 3);
 module mouse_grommet_30_3_stl() mouse_grommet(3, 3);
 
 module round_grommet_bottom_30_stl() round_grommet_bottom(3);
 module round_grommet_bottom_40_stl() round_grommet_bottom(4);
+module round_grommet_bottom_50_stl() round_grommet_bottom(5);
 module round_grommet_bottom_60_stl() round_grommet_bottom(6);
 
 module round_grommet_top_30_3_stl() round_grommet_top(3, 3);
 module round_grommet_top_40_3_stl() round_grommet_top(4, 3);
+module round_grommet_top_50_3_stl() round_grommet_top(5, 3);
 module round_grommet_top_60_3_stl() round_grommet_top(6, 3);

printed/pcb_mount.scad

@@ -0,0 +1,124 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! A frame to mount a PCB by its corners when it has no mounting holes.
+//! 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;
+min_wall = extrusion_width * 2;
+wall = 2;
+
+overlap = 2;
+
+screw = M3_cap_screw;
+screw_clearance_r = 3.1 / 2;
+pillar_r = corrected_radius(screw_clearance_r) + wall;
+
+function pillar_x_pitch(pcb) = pcb_length(pcb) + 2 * clearance + 2 * (pillar_r - overlap) / sqrt(2); //! x pitch of screw pillars
+function pillar_y_pitch(pcb) = pcb_width(pcb)  + 2 * clearance + 2 * (pillar_r - overlap) / sqrt(2); //! y pitch of screw pillars
+
+function pcb_mount_length(pcb) = pillar_x_pitch(pcb) + 2 * pillar_r; //! Outside length of the mount
+function pcb_mount_width(pcb)  = pillar_y_pitch(pcb) + 2 * pillar_r; //! Outside width of the mount
+
+frame_w = 3;
+frame_t = 2;
+
+washer_thickness = 1.25;
+
+module pcb_mount_screw_positions(pcb) //! Positions of the screws and pillars
+    for(x = [-1, 1], y = [-1, 1])
+        translate([x * pillar_x_pitch(pcb) / 2, y * pillar_y_pitch(pcb) / 2])
+            children();
+
+module pcb_mount_holes(pcb, h = 0)          //! Drill holes for PCB mount
+    pcb_mount_screw_positions(pcb)
+        drill(screw_clearance_radius(screw), h);
+
+module pcb_mount_ring()
+    difference() {
+        circle(pillar_r);
+
+        poly_circle(screw_clearance_r);
+    }
+
+module pcb_mount_washer_stl() //! A plastic washer to clamp a PCB
+    linear_extrude(height = washer_thickness)
+        pcb_mount_ring();
+
+module pcb_mount(pcb, height = 5, washers = true) { //! Make the STL of a pcb mount for the specified PCB.
+    stl(str("pcb_mount_", pcb[0], "_", height));
+
+    y_pitch = pcb_width(pcb) > 4 * pillar_r + 4 ? pillar_r + 1
+                                                : pcb_width(pcb) / 2 + frame_w + 1 + pillar_r;
+
+    if(washers)
+        for(x = [-1, 1], y = [-1, 1])
+            translate([x * (pillar_r + 1), y * y_pitch, 0])
+                pcb_mount_washer_stl();
+
+    for(x = [-1, 1])
+        translate([x * pillar_x_pitch(pcb) / 2, 0, frame_t / 2])
+            cube([frame_w, pillar_y_pitch(pcb) - 2 * wall, frame_t], center = true);
+
+    for(y = [-1, 1])
+        translate([0, y * pillar_y_pitch(pcb) / 2, frame_t / 2])
+            cube([pillar_x_pitch(pcb) - 2 * wall, frame_w, frame_t], center = true);
+
+    pcb_mount_screw_positions(pcb)
+        linear_extrude(height = height)
+            pcb_mount_ring();
+
+    linear_extrude(height = height + pcb_thickness(pcb) - layer_height)
+        difference() {
+            pcb_mount_screw_positions(pcb)
+                pcb_mount_ring();
+
+            square([pcb_length(pcb) + 2 * clearance, pcb_width(pcb) + 2 * clearance], center = true);
+        }
+}
+
+module pcb_mount_assembly(pcb, thickness, height = 5) { //! A PCB mount assembly with fasteners
+    translate_z(height)
+        pcb(pcb);
+
+    color(pp1_colour) pcb_mount(pcb, washers = false);
+
+    washer = screw_washer(screw);
+    nut = screw_nut(screw);
+    t = pcb_thickness(pcb);
+    screw_length = screw_longer_than(height + t + washer_thickness + thickness + washer_thickness(washer) + nut_thickness(nut, true));
+
+    pcb_mount_screw_positions(pcb) {
+        translate_z(height + t) {
+            color(pp2_colour) pcb_mount_washer_stl();
+
+            translate_z(washer_thickness)
+                screw(screw, screw_length);
+        }
+
+        translate_z(-thickness)
+            vflip()
+                nut_and_washer(nut, true);
+    }
+}

printed/psu_shroud.scad

@@ -139,8 +139,8 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
     mirror([0, 1, 0])
         psu_shroud_hole_positions(type)
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
  }
 
 module psu_shroud_assembly(type, cable_d, name, cables = 1) //! The printed parts with inserts fitted

printed/screw_knob.scad

@@ -34,7 +34,7 @@ knob_waves = 5;
 knob_height = knob_stem_h + knob_thickness;
 function knob_height() = knob_height;
 
-module screw_knob(screw) { //! Generate the STL foe a knob to fit the specified hex screw
+module screw_knob(screw) { //! Generate the STL for a knob to fit the specified hex screw
     stl(str("screw_knob_M", screw_radius(screw) * 20));
 
     knob_stem_r = nut_trap_radius(screw_nut(screw)) + knob_wall;

printed/ssr_shroud.scad

@@ -103,8 +103,8 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
     ssr_shroud_hole_positions(type)
         vflip()
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
 }
 
 module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted

scripts/exports.py

@@ -85,48 +85,49 @@ def make_parts(target, part_type, parts = None):
     #
     lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
     module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename[-5:] == ".scad":
-                #
-                # find any modules ending in _<part_type>
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    for line in f.readlines():
-                        words = line.split()
-                        if(len(words) and words[0] == "module"):
-                            module = words[1].split('(')[0]
-                            if module.endswith(module_suffix):
-                                base_name = module[:-4]
-                                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
-                                    dname = deps_name(deps_dir, filename)
-                                    changed = check_deps(part_file, dname)
-                                    changed = times.check_have_time(changed, part)
-                                    if part_type == 'stl' and not changed and not part in bounds_map:
-                                        changed = "No bounds"
-                                    if changed:
-                                        print(changed)
-                                        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
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename[-5:] == ".scad":
+                    #
+                    # find any modules ending in _<part_type>
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        for line in f.readlines():
+                            words = line.split()
+                            if(len(words) and words[0] == "module"):
+                                module = words[1].split('(')[0]
+                                if module.endswith(module_suffix):
+                                    base_name = module[:-4]
+                                    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
+                                        dname = deps_name(deps_dir, filename)
+                                        changed = check_deps(part_file, dname)
+                                        changed = times.check_have_time(changed, part)
+                                        if part_type == 'stl' and not changed and not part in bounds_map:
+                                            changed = "No bounds"
+                                        if changed:
+                                            print(changed)
+                                            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
 
-                                    targets.remove(part)
-                                    os.remove(part_maker_name)
+                                        targets.remove(part)
+                                        os.remove(part_maker_name)
     #
     # Write new bounds file
     #

scripts/openscad.py

@@ -24,8 +24,8 @@ from __future__ import print_function
 
 import subprocess, sys
 
-def run(*args, silent = False):
-    cmd = ["openscad"] + list(args)
+def run_list(args, silent = False):
+    cmd = ["openscad"] + args
     if not silent:
         for arg in cmd:
             print(arg, end=" ")
@@ -37,3 +37,9 @@ def run(*args, silent = False):
             print(line[:-1])
     if rc:
         sys.exit(rc)
+
+def run(*args):
+    run_list(list(args), False)
+
+def run_silent(*args):
+    run_list(list(args), True);

scripts/options.py

@@ -0,0 +1,49 @@
+#
+# NopSCADlib Copyright Chris Palmer 2020
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Set command line options from enviroment variables and check if they have changed
+
+import json, os, deps
+
+def check_options(dir = '.'):
+    global options, options_mtime
+    options = { "show_threads": str(os.getenv("SHOW_THREADS")) }
+    options_fname = dir + '/options.json'
+    try:
+        with open(options_fname) as json_file:
+            last_options = json.load(json_file)
+    except:
+        last_options = {}
+    if last_options != options:
+        with open(options_fname, 'w') as outfile:
+            json.dump(options, outfile, indent = 4)
+    options_mtime = deps.mtime(options_fname)
+
+def have_changed(changed, target):
+    if not changed and deps.mtime(target) < options_mtime:
+        return "command line options changed"
+    return changed
+
+def list():
+    result = []
+    for name in options.keys():
+        value = options[name]
+        if value != 'None':
+            result.append('-D$' + name + '=' + value)
+    return result

scripts/plateup.py

@@ -67,7 +67,7 @@ def plateup(target, part_type):
             log_name = 'openscad.log'
         else:
             log_name = 'openscad.echo'
-            openscad.run("-D$bom=1", "-o", log_name, src_file, silent = True)
+            openscad.run_silent("-D$bom=1", "-o", log_name, src_file)
         #
         # Add the files on the BOM to the used list
         #

scripts/tests.py

@@ -27,6 +27,7 @@ import openscad
 import subprocess
 import bom
 import times
+import options
 import time
 import json
 import shutil
@@ -96,6 +97,7 @@ def tests(tests):
     index = {}
     bodies = {}
     times.read_times()
+    options.check_options(deps_dir)
     #
     # Make cover pic if does not exist as very slow. Delete it to force an update.
     #
@@ -107,7 +109,7 @@ def tests(tests):
     #
     # List of individual part files
     #
-    scads = [i for i in os.listdir(scad_dir) if i[-5:] == ".scad"]
+    scads = [i for i in sorted(os.listdir(scad_dir)) if i[-5:] == ".scad"]
 
     for scad in scads:
         base_name = scad[:-5]
@@ -138,7 +140,7 @@ def tests(tests):
                 print("Can't find implementation!")
                 continue
 
-            vsplit = "N"
+            vsplit = "M"
             vtype = locations[0][1]
             types = [vtype + ' A-' + vsplit[0], vtype + ' ' + chr(ord(vsplit) + 1) + '-Z'] + [loc[1] for loc in locations[1 :]]
             if type == vtype:
@@ -190,11 +192,12 @@ def tests(tests):
             oldest = png_name if mtime(png_name) < mtime(bom_name) else bom_name
             changed = check_deps(oldest, dname)
             changed = times.check_have_time(changed, scad_name)
+            changed = options.have_changed(changed, oldest)
             if changed:
                 print(changed)
                 t = time.time()
                 tmp_name = 'tmp.png'
-                openscad.run("-D", "$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, scad_name);
+                openscad.run_list(options.list() + ["-D$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, scad_name]);
                 times.add_time(scad_name, t)
                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name])
                 update_image(tmp_name, png_name)
@@ -257,7 +260,7 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
             print('<tr>',  file = doc_file, end = '')
             for type in types:
                 if i < len(index[type]):
-                    name = index[type][i]
+                    name = sorted(index[type])[i]
                     print('<td> <a href = "#' + name + '">' + name + '</a> </td>', file = doc_file, end = '')
                 else:
                     print('<td></td>', file = doc_file, end = '')

scripts/views.py

@@ -28,6 +28,7 @@ import openscad
 from tests import do_cmd, update_image, colour_scheme, background
 import time
 import times
+import options
 from deps import *
 import os
 import json
@@ -102,6 +103,7 @@ def views(target, do_assemblies = None):
         os.makedirs(deps_dir)
 
     times.read_times(target_dir)
+    options.check_options(deps_dir)
     bounds_fname = top_dir + 'stls/bounds.json'
     with open(bounds_fname) as json_file:
         bounds_map = json.load(json_file)
@@ -122,65 +124,67 @@ def views(target, do_assemblies = None):
     #
     main_blurb = None
     lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename.endswith('.scad'):
-                #
-                # find any modules with names ending in _assembly
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    lines = f.readlines()
-                line_no = 0
-                for line in lines:
-                    words = line.split()
-                    if len(words) and words[0] == "module":
-                        module = words[1].split('(')[0]
-                        if is_assembly(module):
-                            if module in assemblies:
-                                #
-                                # Scrape the assembly instructions
-                                #
-                                for ass in flat_bom:
-                                    if ass["name"] == module:
-                                        if not "blurb" in ass:
-                                            ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
-                                        break
-                                if not do_assemblies or module in do_assemblies:
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename.endswith('.scad'):
+                    #
+                    # find any modules with names ending in _assembly
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        lines = f.readlines()
+                    line_no = 0
+                    for line in lines:
+                        words = line.split()
+                        if len(words) and words[0] == "module":
+                            module = words[1].split('(')[0]
+                            if is_assembly(module):
+                                if module in assemblies:
                                     #
-                                    # make a file to use the module
+                                    # Scrape the assembly instructions
                                     #
-                                    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 th created file
-                                    #
-                                    dname = deps_name(deps_dir, filename)
-                                    for explode in [0, 1]:
-                                        png_name = target_dir + '/' + module + '.png'
-                                        if not explode:
-                                            png_name = png_name.replace('_assembly', '_assembled')
-                                        changed = check_deps(png_name, dname)
-                                        changed = times.check_have_time(changed, png_name)
-                                        tmp_name = 'tmp.png'
-                                        if changed:
-                                            print(changed)
-                                            t = time.time()
-                                            openscad.run("-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)
-                                        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':
-                                    main_blurb = blurb.scrape_module_blurb(lines[:line_no])
-                    line_no += 1
+                                    for ass in flat_bom:
+                                        if ass["name"] == module:
+                                            if not "blurb" in ass:
+                                                ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
+                                            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)
+                                        for explode in [0, 1]:
+                                            png_name = target_dir + '/' + module + '.png'
+                                            if not explode:
+                                                png_name = png_name.replace('_assembly', '_assembled')
+                                            changed = check_deps(png_name, dname)
+                                            changed = times.check_have_time(changed, png_name)
+                                            changed = options.have_changed(changed, png_name)
+                                            tmp_name = 'tmp.png'
+                                            if changed:
+                                                print(changed)
+                                                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)
+                                            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':
+                                        main_blurb = blurb.scrape_module_blurb(lines[:line_no])
+                        line_no += 1
     times.print_times()
     #
     # Build the document

tests/belts.scad

@@ -67,7 +67,7 @@ module belt_test() {
     translate([-25, 0])
         layout([for(b = belts) belt_width(b)], 10)
             rotate([0, 90, 0])
-                belt(belts[$i], [[0, 0, 20], [0, 1, 20]]);
+                belt(belts[$i], [[0, 0, 20], [0, 1, 20]], belt_colour = $i%2==0 ? grey90 : grey20, tooth_colour = $i%2==0 ? grey70 : grey50);
 }
 
 if($preview)

tests/d_connectors.scad

@@ -35,4 +35,5 @@ module d_connectors()
                 }
 
 if($preview)
-    d_connectors();
+    let($show_threads = true)
+        d_connectors();

tests/extrusions.scad

@@ -0,0 +1,30 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// 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>
+use <../utils/layout.scad>
+
+include <../vitamins/extrusions.scad>
+
+module extrusions()
+    layout([for(e = extrusions) extrusion_width(e)], 10)
+        extrusion(extrusions[$i], 80);
+
+if ($preview)
+    extrusions();
+

tests/hygrometer.scad

@@ -0,0 +1,22 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+use <../vitamins/hygrometer.scad>
+
+if($preview)
+    hygrometer();

tests/inserts.scad

@@ -21,10 +21,21 @@ use <../utils/layout.scad>
 
 include <../vitamins/inserts.scad>
 
-module inserts()
+module inserts() {
+
     for(i = [0: len(inserts) -1])
         translate([10 * i, 0])
             insert(inserts[i]);
 
+    color(pp1_colour)
+        translate([len(inserts) * 10, 0]) {
+            insert_lug(inserts[0], 2, 1);
+
+            translate([10, 0])
+                insert_boss(inserts[0], z = 10, wall = 2);
+        }
+}
+
 if($preview)
-    inserts();
+    let($show_threads = true)
+        inserts();

tests/leadnuts.scad

@@ -27,4 +27,5 @@ module leadnuts()
         leadnut(leadnuts[$i]);
 
 if($preview)
-    leadnuts();
+    let($show_threads = true)
+        leadnuts();

tests/linear_bearings.scad

@@ -22,8 +22,12 @@ use <../utils/layout.scad>
 include <../vitamins/linear_bearings.scad>
 
 module linear_bearings()
-    layout([for(b = linear_bearings) 2 * bearing_radius(b)])
+    layout([for(b = linear_bearings) 2 * bearing_radius(b)]) {
         linear_bearing(linear_bearings[$i]);
 
+        translate([0, 30])
+            linear_bearing(long_linear_bearings[$i]);
+    }
+
 if($preview)
     linear_bearings();

tests/maths.scad

@@ -56,7 +56,7 @@ module maths() {
     //
     z = [0, 0, 1];
     v = cross(u, z);
-    a = acos(u * z);
+    a = angle_between(u, z);
 
 
     l = 20;
@@ -64,6 +64,11 @@ module maths() {
         translate_z(l)
             vflip()
                 arrow(l);
+
+    //
+    // Test Euler
+    //
+    assert(euler(rotate(r)) == r, "euler() failed");
 }
 
 rotate(45)

tests/nuts.scad

@@ -22,13 +22,12 @@ use <../utils/layout.scad>
 include <../vitamins/screws.scad>
 
 module nuts() {
-    for(nyloc = [false, true])
-        translate([0, nyloc ? 20 : 0])
-            layout([for(n = nuts) 2 * nut_radius(n)], 5)
-                nut(nuts[$i], nyloc);
+    layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) {
+        for(nyloc = [false, true])
+            translate([0, nyloc ? 20 : 0])
+                nut(n, nyloc);
 
-    translate([0, 40])
-        layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) {
+        translate([0, 40]) {
             if(n == M3_nut)
                 nut(n, brass = true);
 
@@ -45,7 +44,28 @@ module nuts() {
             if(n == M8_nut)
                 #nut_trap(M8_cap_screw, n, h = 30);
         }
+
+        translate([0, 60]) {
+            if(n == M3_nut)
+                sliding_t_nut(M3_sliding_t_nut);
+
+            if(n == M4_nut)
+                sliding_t_nut(M4_sliding_t_nut);
+
+            if(n == M5_nut)
+                sliding_t_nut(M5_sliding_t_nut);
+        }
+
+        translate([0, 80]) {
+            if(n == M3_nut)
+                sliding_t_nut(M3_hammer_nut);
+
+            if(n == M4_nut)
+                sliding_t_nut(M4_hammer_nut);
+       }
+    }
 }
 
 if($preview)
-    nuts();
+    let($show_threads = true)
+        nuts();

tests/opengrab.scad

@@ -29,4 +29,5 @@ module opengrab_test() {
 }
 
 if($preview)
-    opengrab_test();
+    let($show_threads = true)
+        opengrab_test();

tests/pcb_mount.scad

@@ -0,0 +1,35 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// 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>
+use <../printed/pcb_mount.scad>
+
+PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", true, [],
+    [[(3.015 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.685) * 25.4, 90, "term35", 2],
+     [(3.46  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
+     [(3.91  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
+     [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "2p54socket", 13, 2],
+    ], []];
+
+module pcb_mounts()
+    if($preview)
+        pcb_mount_assembly(PI_IO, 3);
+    else
+        pcb_mount(PI_IO);
+
+pcb_mounts();

tests/pcbs.scad

@@ -23,7 +23,7 @@ include <../vitamins/d_connectors.scad>
 include <../vitamins/pcbs.scad>
 
 module pcbs()
-    layout([for(p = pcbs) pcb_width(p)], 15)
+    layout([for(p = pcbs) pcb_width(p)], 10)
         translate([0, pcb_length(pcbs[$i]) / 2])
             rotate(90)
                 pcb_assembly(pcbs[$i], 5 + $i, 3);

tests/pillars.scad

@@ -26,4 +26,5 @@ module pillars()
         pillar(pillars[$i]);
 
 if($preview)
-    pillars();
+    let($show_threads = true)
+        pillars();

tests/pin_headers.scad

@@ -28,15 +28,18 @@ module pin_headers()
         idc_transition(pin_headers[$i], 10);
 
         translate([0, 20])
-            pin_header(pin_headers[$i], 10, 2);
+            pin_header(pin_headers[$i], 10, 2, right_angle = true);
 
         translate([0, 40])
+            pin_header(pin_headers[$i], 10, 2);
+
+        translate([0, 60])
             box_header(pin_headers[$i], 10, 2);
 
-        translate([0, 65])
+        translate([0, 80])
             pin_socket(pin_headers[$i], 10, 2);
 
-        translate([0, 95])
+        translate([0, 110])
             pin_socket(pin_headers[$i], 10, 2, right_angle = true);
 
     }

tests/rails.scad

@@ -34,7 +34,7 @@ module rails()
             nut = screw_nut(screw);
             washer = screw_washer(screw);
 
-            rail_assembly(rail, length, rail_travel(rail, length) / 2);
+            rail_assembly(rail, length, rail_travel(rail, length) / 2, $i<2 ? grey20 : "green", $i<2 ? grey20 : "red");
 
             rail_screws(rail, length, sheet + nut_thickness(nut, true) + washer_thickness(washer));
 

tests/ring_terminals.scad

@@ -24,7 +24,7 @@ include <../vitamins/ring_terminals.scad>
 
 module ring_terminals()
     layout([for(t = ring_terminals) ringterm_od(t)], 5)
-        rotate(90)
+        rotate(180)
             ring_terminal_assembly(ring_terminals[$i], 3);
 
 if($preview)

tests/rockers.scad

@@ -21,9 +21,13 @@ use <../utils/layout.scad>
 
 include <../vitamins/rockers.scad>
 
-module rockers()
-    layout([for(r = rockers) rocker_flange_w(r)], 5)
+module rockers() {
+    layout([for(r = rockers) rocker_flange_w(r)], 5) {
         rocker(rockers[$i]);
+        translate([0, 25])
+            rocker(rockers[$i], $i==0 ? "red" : "green");
+    }
+}
 
 if($preview)
     rockers();