Merge branch 'martinbudden-linear_rails'

made with asterisks.
If an image is include in the first section the default image is supressed.

core.scad

@@ -18,7 +18,7 @@
 //
 
 //
-// Include this file to use the miniumum library plus screws, nuts and washers
+// Include this file to use the minimum library plus screws, nuts and washers
 //
 include <utils/core/core.scad>
 //

docs/usage.md

@@ -22,37 +22,37 @@ The 7 SEGMENT.TTF font from the docs directory is needed for simulating 7 segmen
 
 ## Installation
 
-OpenSCAD has to be setup to find libraries by setting the ```OPENSCADPATH``` environment variable to where you want to file your libraries 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, if you don't want to use GIT,
+OpenSCAD has to be setup to find libraries by setting the `OPENSCADPATH` environment variable to where you want to file your libraries 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, 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, ```PATH``` on Windows and ```path``` on Linux and Mac.
+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.
+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.
 
-Running ```tests``` from the command line will run all the tests in the ```tests``` directory and build the ```readme.md``` catalog for GitHub and render it to ```readme.html```
+Running `tests` from the command line will run all the tests in the `tests` directory and build the `readme.md` catalog for GitHub and render it to `readme.html`
 for local preview.
 
 ## Directory structure
 
 | Path | Contents |
 |:-----|:------|
-| ```NopSCADlib``` | Top level scad files, e.g. ```lib.scad``` |
-| ```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/printed``` | Scad files for making reusable printed parts |
-| ```NopSCADlib/scripts``` | Python scripts |
-| ```NopSCADlib/tests``` | A stand alone test for each type of vitamin and most of the utilities |
-| ```NopSCADlib/utils```   | Utility scad files |
-| ```NopSCADlib/utils/core``` | Core utilities used by nearly everything |
-| ```NopSCADlib/vitamins``` | Generally a pair of .scad files for each type of vitamin. The plural version contains object definitions to be included and it uses the singular version. |
+| `NopSCADlib` | Top level scad files, e.g. `lib.scad` |
+| `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/printed` | Scad files for making reusable printed parts |
+| `NopSCADlib/scripts` | Python scripts |
+| `NopSCADlib/tests` | A stand alone test for each type of vitamin and most of the utilities |
+| `NopSCADlib/utils`   | Utility scad files |
+| `NopSCADlib/utils/core` | Core utilities used by nearly everything |
+| `NopSCADlib/vitamins` | Generally a pair of .scad files for each type of vitamin. The plural version contains object definitions to be included and it uses the singular version. |
 
 
 ## Making a project
 
 Each project has its own directory and that is used to derive the project's name.
-There should also be a subdirectory called ```scad``` with a scad file in it that contains the main assembly.
+There should also be a subdirectory called `scad` with a scad file in it that contains the main assembly.
 A skeleton project looks like this: -
 
     //! Project description in Markdown format before the first include.
@@ -72,30 +72,30 @@ A skeleton project looks like this: -
 
 Other scad files can be added to the scad directory and included or used as required.
 
-* Subassemblies can be added in the same format as ```main_assembly()```, i.e. a module called ```something_assembly()```, taking no parameters and calling ```assembly("something")```
+* Subassemblies can be added in the same format as `main_assembly()`, i.e. a module called `something_assembly()`, taking no parameters and calling `assembly("something")`
  with the rest of its contents passed as children.
-It needs to be called directly or indirectly from ```main_assembly()``` to appear in the view and on the BOM.
-Assembly instructions should be added directly before the module definition in comments marked with ```//!```.
+It needs to be called directly or indirectly from `main_assembly()` to appear in the view and on the BOM.
+Assembly instructions should be added directly before the module definition in comments marked with `//!`.
 
-* Any printed parts should be made by a module called ```something_stl()```, taking no parameters and calling ```stl("something")``` so they appear on the BOM when called from
-an assembly. Printed parts are usually ```color```ed and ```render```ed at the point they are used in the assembly.
+* Any printed parts should be made by a module called `something_stl()`, taking no parameters and calling `stl("something")` so they appear on the BOM when called from
+an assembly. Printed parts are usually `color`ed and `render`ed at the point they are used in the assembly.
 
-* Any 2D routed parts should be made by a module called ```something_dxf()```, taking no parameters and calling ```dxf("something")``` so they appear on the BOM when called from an
-assembly. They are generally made from a ```sheet_2D()``` with holes subtracted from it. That will also put the sheet material on the BOM.
-They are then expanded to 3D using ```render_2D_sheet()``` when they are placed in an assembly.
+* Any 2D routed parts should be made by a module called `something_dxf()`, taking no parameters and calling `dxf("something")` so they appear on the BOM when called from an
+assembly. They are generally made from a `sheet_2D()` with holes subtracted from it. That will also put the sheet material on the BOM.
+They are then expanded to 3D using `render_2D_sheet()` when they are placed in an assembly.
 
-When ```make_all``` is run from the top level directory of the project it will create the following sub-directories and populate them:-
+When `make_all` is run from the top level directory of the project it will create the following sub-directories and populate them:-
 
 | Directory | Contents |
 |:----------|:---------|
 | assemblies | For each assembly: an assembled view and an exploded assembly view, in large and small formats |
-| bom | A flat BOM in ```bom.txt``` for the whole project, flat BOMs in text format for each assembly and a hierarchical BOM in JSON format: ```bom.json```.|
+| bom | A flat BOM in `bom.txt` for the whole project, flat BOMs in text format for each assembly and a hierarchical BOM in JSON format: `bom.json`.|
 | deps | Dependency files for each scad file in the project, so that subsequent builds can be incremental |
 | dxfs | DXF files for all the CNC routed parts in the project and small PNG images of them |
 | stls | STL files for all the printed parts in the project and small PNG images of them |
 
-It will also make a Markdown assembly manual called ```readme.md``` suitable for GitHub, a version rendered to HTML for viewing locally called ```readme.html``` and a second
-HTML version called ```printme.html```. This has page breaks instead of horizontal rules between sections and can be converted to PDF using Chrome to make a stand alone manual.
+It will also make a Markdown assembly manual called `readme.md` suitable for GitHub, a version rendered to HTML for viewing locally called `readme.html` and a second
+HTML version called `printme.html`. This has page breaks instead of horizontal rules between sections and can be converted to PDF using Chrome to make a stand alone manual.
 
 Each time OpenSCAD is run to produce STL files, DXF files or assembly views, the time it takes is recorded and compared with the previous time.
 At the end the times are printed with the delta from the last run and coloured red or green if they have got significantly faster or slower.
@@ -112,28 +112,38 @@ All the vitamins and utilities are included if you include [NopSCADlib/lib.scad]
 Printed parts are not included and need to be used or included explicitly, their documentation states which files need to be included rather than used.
 
 This is the easiest way to use the library and is reasonably efficient because the only files included are the object list definitions, all the functions and modules are used, so
-get shared if other files in the project include ```lib.scad``` as well, or if you have multiple projects open in the same instance of OpenSCAD.
+get shared if other files in the project include `lib.scad` as well, or if you have multiple projects open in the same instance of OpenSCAD.
 
 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) 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).
 
+### Project Description
+
+A description of the project can be placed in comments in Markdown format before the first include file.
+By default this is followed by a picture of the main assembly unless the description contains any pictures.
+
+The description can be divided into two or three sections using //! ***, which is a Markdown horizontal rule in a comment.
+If there is a second section it is placed after the table of contents and a third section will be placed after the parts list.
+
+If an actual horizontal rule is desired the alternative Markdown markup //! --- can be used.
+
 ### Parametric parts.
 
 Modules that generate parts and assemblies need to take no parameters so that they can be called from the framework to make the STL files and assembly views, etc.
 Sometimes parts or asemblies need to be parametric, for example fan guards take the fan as a parameter.
-To work around this the ```fan_guard()``` module calls the ```stl()``` module with a variable name which has a suffix of the fan width, e.g. "fan_guard_60".
+To work around this the `fan_guard()` module calls the `stl()` module with a variable name which has a suffix of the fan width, e.g. "fan_guard_60".
 This ensures that if there are different sized fans in the same project the STL files have unique names.
-It is then up to the user to add a wrapper to their project called ```fan_guard_60_stl()``` that calls ```fan_guard()``` with a 60mm fan: -
+It is then up to the user to add a wrapper to their project called `fan_guard_60_stl()` that calls `fan_guard()` with a 60mm fan: -
 
     module fan_guard_60_stl() fan_guard(fan60x15);
 
-Calling ```fan_guard(fan60x15)``` draws a fan guard for a 60mm fan and puts ```fan_guard_60.stl``` on the BOM. The framework then looks for a module ```fan_guard_60_stl()``` to
+Calling `fan_guard(fan60x15)` draws a fan guard for a 60mm fan and puts `fan_guard_60.stl` on the BOM. The framework then looks for a module `fan_guard_60_stl()` to
 generate it.
 
 This is OK if the fan will always be 60mm but what if the project is parametric and the fan size can vary?
-To cater for that ```fan_guard()``` can be passed a ```name``` parameter to name the STL.
+To cater for that `fan_guard()` can be passed a `name` parameter to name the STL.
 For example a 3D printer might have a bed cooling fan and different sized machines might have different size fans.
 
     bed_fan = fan80x38;
@@ -144,7 +154,7 @@ In this case the STL file has a constant name related to its use, regardless of
 
 ### Assembly boundaries
 
-The ```assembly()``` module is used to mark assemblies that correspond to a step of construction.
+The `assembly()` module is used to mark assemblies that correspond to a step of construction.
 Each assembly named in this way gets a page in the build manual with a list of the parts and sub-assemblies that it uses, an exploded view,
 some build instructions and then the assembled view.
 This doesn't always correspond with how one would want to structure the code.
@@ -182,26 +192,26 @@ This is achieved by having a pair of modules: -
                     screw_and_washer(screw, screw_length, true);
     }
 
-Notice how the first module ```handle_assembly()``` uses ```assembly()``` and has a build instruction. It isn't used directly in a project though, ```handle_fastened_assembly()``` is
+Notice how the first module `handle_assembly()` uses `assembly()` and has a build instruction. It isn't used directly in a project though, `handle_fastened_assembly()` is
 what is actually called from the parent assembly.
-Because it doesn't have a call to ```assembly()```, the fasteners are added to the parent but the STL and the inserts become a sub-assembly.
+Because it doesn't have a call to `assembly()`, the fasteners are added to the parent but the STL and the inserts become a sub-assembly.
 
 When the parent assembly is shown exploded the handle's screws will be exploded but the inserts won't. They only explode when the sub-assembly is shown exloded.
 
-Note also the ```pose([225, 0, 150], [0, 0, 14])``` call before the ```assembly()``` call. This allows the sub-assembly to be posed differently in its build step but doesn't
+Note also the `pose([225, 0, 150], [0, 0, 14])` call before the `assembly()` call. This allows the sub-assembly to be posed differently in its build step but doesn't
 affect its orientation in the parent assembly. The pose parameters are the rotation and the translation taken from the GUI.
 
 ### Exploded diagrams
 
-A lot of vitamins explode themselves when ```$explode=1```. This is done with module ```explode()``` that can be passed a Z offset, or a 3D vector that gives the displacement
-and it draws a line from the origial position to the exploded position. The line can be offset from the origin of the component by specifying an offset vector.
+A lot of vitamins explode themselves when `$explode=1`. This is done with module `explode()` that can be passed a Z offset, or a 3D vector that gives the displacement
+and it draws a line from the original position to the exploded position. The line can be offset from the origin of the component by specifying an offset vector.
 
-Often user assemblies need to add ```explode()``` in various places to explode printed parts, for example.
+Often user assemblies need to add `explode()` in various places to explode printed parts, for example.
 
 ### Creating vitamins
 
 Most vitamins are parametric and use a named list of properties to describe them is a pseudo OO style.
-These lists are passed to every function or module related to the vitamin as the first parameter called ```type```.
+These lists are passed to every function or module related to the vitamin as the first parameter called `type`.
 They need to be included in the user code, so that the list names are visible. The functions and modules however only need to be used, not included.
 
 This leads to a pair of files for each vitamin. One with a plural name that defines the objects and then uses the file with a singular name
@@ -216,50 +226,50 @@ These functions take a particular form, so they can be scraped out and added to
 
     function spring_od(type)     = type[1]; //! Outside diameter
 
-Other functions and modules with ```//!``` comments will be added to the documentation as functions and modules.
+Other functions and modules with `//!` comments will be added to the documentation as functions and modules.
 Functions and modules without these special comments are considered private and do not appear in the documentation.
 
-A vitamin announces itself to the BOM by calling the ```vitamin()``` module with a string description composed of two parts separated by a colon.
+A vitamin announces itself to the BOM by calling the `vitamin()` module with a string description composed of two parts separated by a colon.
 The first part is a string representation of the module instantiation.
 This is used in the documentation to show how to instantiate every part available.
-To facilitate this the first element in the type list is the name of the list as a string and is simply accessed as ```type[0]```.
+To facilitate this the first element in the type list is the name of the list as a string and is simply accessed as `type[0]`.
 
 The part of the description after the colon is free format text that appears on the BOM. Since vitamins are listed alphabetically starting the description with the broad
 category of the part and leaving the more refined description to the end generates tidier parts lists.
-For example ```Screw M3 pan x 30mm``` ensures all the screws appear together and are ordered by their diameter before length, although ```M3 x 30mm pan screw``` would be
+For example `Screw M3 pan x 30mm` ensures all the screws appear together and are ordered by their diameter before length, although `M3 x 30mm pan screw` would be
 more natural.
 
 Vitamins are only ever previewed, so they are optimised to draw quickly in F5 and don't need to worry about being manifold.
 In OpenCSG 3D difference and intersection are relatively slow and the negative volumes interfere with nearby objects when they are composed into assemblies. For this reason as much
-as possible is done by unioning primitives and extruded 2D shapes. Any 3D differences or intersections are wrapped in ```render()``` so that CGAL will compute a polyhedron
+as possible is done by unioning primitives and extruded 2D shapes. Any 3D differences or intersections are wrapped in `render()` so that CGAL will compute a polyhedron
 that is cached and reused. This will be very slow the first time it renders but very fast afterwards.
 
 ### Panels and Platters
 
-The ```stls``` and ```dxfs``` scripts produce a file for each part but often it is desirable to print or route collections of parts laid out together.
-This can be done by adding scad files to folders called ```platters``` for STL files and ```panels``` for DXF files.
-These can aggregate and lay out parts by including ```NopSCADlib/core.scad``` and using modules ```use_stl(name)``` and ```use_dxf(name)```.
+The `stls` and `dxfs` scripts produce a file for each part but often it is desirable to print or route collections of parts laid out together.
+This can be done by adding scad files to folders called `platters` for STL files and `panels` for DXF files.
+These can aggregate and lay out parts by including `NopSCADlib/core.scad` and using modules `use_stl(name)` and `use_dxf(name)`.
 These modules import the already generated singular STL and DXF files, so they are relatively fast. The name does not include the suffix.
 The scad files typically also need to include other files from the project to get the dimensions of the parts to calculate their positions.
 
-The composite part files have the same name as the scad file that generates them, with the suffix changed to ```.stl``` or ```.dxf```.
+The composite part files have the same name as the scad file that generates them, with the suffix changed to `.stl` or `.dxf`.
 
-The generated files are placed in ```stls/printed``` and ```dxfs/routed```.
-Any parts that are not covered by the platters / panels are copied into the ```printed``` / ```routed``` directories, so that they contain everything to be made.
+The generated files are placed in `stls/printed` and `dxfs/routed`.
+Any parts that are not covered by the platters / panels are copied into the `printed` / `routed` directories, so that they contain everything to be made.
 
 ### Multiple configurations
 
 Some parametric designs might have several configurations, for example a 3D printer with different size options. If several configurations need to be supported at the
  same time multiple sets of BOMS, STLS and DXFs need to be generated in separate diectories. NopSCADlib supports this by having multiple configuration files named
-```config_<target_name>.scad```. All the scripts take an optional first parameter that selects one of these config files by specifying ```target_name```.
+`config_<target_name>.scad`. All the scripts take an optional first parameter that selects one of these config files by specifying `target_name`.
 
-The target config file is selected by generating ```target.scad``` that includes ```config_<target_name>.scad```.
-The rest of the project includes ```target.scad``` to use the configuration.
-Additionally all the generated file directories (assemblies, bom, stls, dxfs, etc.) are placed in a sub-directory called ```<target_name>```.
+The target config file is selected by generating `target.scad` that includes `config_<target_name>.scad`.
+The rest of the project includes `target.scad` to use the configuration.
+Additionally all the generated file directories (assemblies, bom, stls, dxfs, etc.) are placed in a sub-directory called `<target_name>`.
 
 ### Other libraries
 
 The build scripts need to be able to locate the source files where the modules to generate the STL files and assemblies reside. They will search all the scad files
-in the project plus any ```printed``` directories outside the project. This covers the printed parts in NopSCADlib but also allows other libraries of printed parts.
+in the project plus any `printed` directories outside the project. This covers the printed parts in NopSCADlib but also allows other libraries of printed parts.
 
 Other libraries of vitamins and utilities can be used provided they follow the same convensions of NopSCADlib. The build scripts don't need to search those.

gallery/readme.md

@@ -43,11 +43,11 @@ Bench power supply built around an ATX PSU.
 * The green LED shows the power good signal.
 * Dummy loads keep the outputs in range.
 
-
-
 ![](Lab_ATX_PSU.png)
 
 
+
+
 <a name="TOP"></a>
 ## Laser Load
 15kV dummy load for testing CO2 laser PSUs
@@ -77,11 +77,11 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Mains Box
 Mains isolated and variable supply with metering.
 
-
-
 ![](Mains_Box.png)
 
 
+
+
 <a name="TOP"></a>
 ## SunBot
 A solar tracker to keep a solar panel pointing at the sun.
@@ -95,13 +95,15 @@ WiFi enabled remote control turntable for photography
 
 ![](Turntable.png)
 
+Was actually made from DiBond but shown made with carbon fibre here.
+
 
 <a name="TOP"></a>
 ## Variac
 Motorised variac with WiFi control, see [hydraraptor.blogspot.com/2018/04/esp8266-spi-spy](https://hydraraptor.blogspot.com/2018/04/esp8266-spi-spy.html)
 
-
-
 ![](Variac.png)
 
 
+
+

global_defs.scad

@@ -26,17 +26,17 @@
 //  Setting $bom after including lib overrides bom in the libs but not in the local file.
 //  Setting $_bom in the local file overrides it in the local file but not in the libs.
 //
-//function is_undef(x) = x == undef;
+rr_green = [0, 146/255, 0];                                               // RepRap logo colour
 
 $_bom           = is_undef($bom)             ? 0      : $bom;             // 0 no bom, 1 assemblies and stls, 2 vitamins as well
 $exploded       = is_undef($explode)         ? 0      : $explode;         // 1 for exploded view
 layer_height    = is_undef($layer_height)    ? 0.25   : $layer_height;    // layer heigth when printing
 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)      ? [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
+cnc_bit_r       = is_undef($cnc_bit_r)       ? 1.2    : $cnc_bit_r;       // minimum tool radius when milling 2D objects
+pp1_colour      = is_undef($pp1_colour)      ? rr_green : $pp1_colour;    // printed part colour 1, RepRap logo colour
+pp2_colour      = is_undef($pp2_colour)      ? "Crimson"  : $pp2_colour;  // printed part colour 2
+pp3_colour      = is_undef($pp3_colour)      ? "SteelBlue" : $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

lib.scad

@@ -54,6 +54,7 @@ include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
 include <vitamins/rod.scad>
 include <vitamins/scs_bearing_blocks.scad>
+include <vitamins/shaft_couplings.scad>
 include <vitamins/sheets.scad>
 include <vitamins/sk_brackets.scad>
 include <vitamins/spools.scad>
@@ -89,6 +90,7 @@ use <utils/gears.scad>
 use <utils/hanging_hole.scad>
 use <utils/fillet.scad>
 use <utils/rounded_polygon.scad>
+use <utils/rounded_right_triangle.scad>
 use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>

libtest.scad

@@ -17,6 +17,23 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
+//!# NopSCADlib
+//! An ever expanding library of parts modelled in OpenSCAD useful for 3D printers and enclosures for electronics, etc.
+//!
+//! It contains lots of vitamins (the RepRap term for non-printed parts), some general purpose printed parts and some utilities.
+//! There are also Python scripts to generate Bills of Materials (BOMs),
+//! STL files for all the printed parts, DXF files for CNC routed parts in a project and a manual containing assembly
+//! instructions and exploded views by scraping markdown embedded in OpenSCAD comments, [see scripts](scripts/readme.md).
+//!
+//! A simple example project can be found [here](examples/MainsBreakOutBox/readme.md).
+//!
+//! 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 requirements, installation instructions and a usage guide.
+//!
+//! <img src="libtest.png" width="100%"/>
 //
 // This file shows all the parts in the library.
 //
@@ -30,10 +47,12 @@ use <tests/bulldogs.scad>
 use <tests/buttons.scad>
 use <tests/cable_strips.scad>
 use <tests/cameras.scad>
+use <tests/camera_housing.scad>
 use <tests/circlips.scad>
 use <tests/components.scad>
 use <tests/d_connectors.scad>
 use <tests/displays.scad>
+use <tests/drag_chain.scad>
 use <tests/extrusions.scad>
 use <tests/extrusion_brackets.scad>
 use <tests/fans.scad>
@@ -59,6 +78,7 @@ use <tests/opengrab.scad>
 use <tests/panel_meters.scad>
 use <tests/PCBs.scad>
 use <tests/pillars.scad>
+use <tests/press_fit.scad>
 use <tests/PSUs.scad>
 use <tests/pulleys.scad>
 use <tests/rails.scad>
@@ -68,6 +88,7 @@ use <tests/rod.scad>
 use <tests/screws.scad>
 use <tests/SCS_bearing_blocks.scad>
 use <tests/sealing_strip.scad>
+use <tests/shaft_couplings.scad>
 use <tests/sheets.scad>
 use <tests/SK_brackets.scad>
 use <tests/spades.scad>
@@ -117,17 +138,20 @@ cable_grommets_y = 0;
 translate([x5, cable_grommets_y])
     cable_grommets();
 
-translate([x5, cable_grommets_y + 50])
-    feet();
+translate([x5 + 50, cable_grommets_y])
+    ribbon_clamps();
 
-translate([x5, cable_grommets_y + 75])
+translate([x5 + 95, cable_grommets_y])
+    press_fits();
+
+translate([x5, cable_grommets_y + 60])
     fixing_blocks();
 
-translate([x5, cable_grommets_y + 100])
+translate([x5, cable_grommets_y + 90])
     corner_blocks();
 
 translate([x5, cable_grommets_y + 150])
-    ribbon_clamps();
+    feet();
 
 translate([x5 + 70, cable_grommets_y + 150])
     screw_knobs();
@@ -327,7 +351,7 @@ modules_y = iecs_y + 60;
 ssrs_y = modules_y + 80;
 blowers_y = ssrs_y + 60;
 batteries_y = blowers_y + 100;
-steppers_y = batteries_y + 70;
+steppers_y = batteries_y + 55;
 panel_meters_y = steppers_y + 70;
 extrusions_y = panel_meters_y + 80;
 
@@ -346,6 +370,9 @@ translate([x3 + 170, veroboard_y + 16])
 translate([x3, d_connectors_y])
     d_connectors();
 
+translate([x3 + 170, d_connectors_y - 10])
+    camera_housings();
+
 translate([x3, iecs_y])
     iecs();
 
@@ -395,12 +422,16 @@ translate([x4 + 200, belts_y + 58]) {
 
     translate([0, 60])
         opengrab_test();
+
 }
 
+translate([x4 + 175, belts_y, -20])
+    drag_chains();
+
 translate([x4, rails_y + 130])
     rails();
 
-translate([800, fans_y + 50])
+translate([770, fans_y + 50])
     cable_strips();
 
 translate([x4, kp_pillow_blocks_y])
@@ -412,6 +443,9 @@ translate([x4, sk_brackets_y])
 translate([x4, extrusion_brackets_y])
     extrusion_brackets();
 
+translate([x4 + 120, extrusion_brackets_y])
+    shaft_couplings();
+
 translate([x4, scs_bearing_blocks_y])
     scs_bearing_blocks();
 

printed/box.scad

@@ -23,7 +23,7 @@
 //! together. The box panels can be customised to have holes and parts mounted on them by overriding the
 //! definitions of `box_base()`, `box_front()`, etc.
 //!
-//! `box.scad` should be ```use```d and `box_assembly.scad` ```include```d.
+//! `box.scad` should be `use`d and `box_assembly.scad` `include`d.
 //!
 //! A box is defined with a list that specifies the inside dimensions, top, bottom and side sheet materials, the
 //! screw type and printed part wall thickness. This diagram shows how the various dimensions are labelled:
@@ -109,7 +109,7 @@ module grill_hole_positions(width, height, r = 1000) {
     }
 }
 
-module grill(width, height, r = 1000, poly = false, h = 0) { //! A staggered array of 5mm holes to make grills in sheets. Can be constrained to be circular. Set ```poly``` ```true``` for printing, ```false``` for milling.
+module grill(width, height, r = 1000, poly = false, h = 0) { //! A staggered array of 5mm holes to make grills in sheets. Can be constrained to be circular. Set `poly` `true` for printing, `false` for milling.
     extrude_if(h)
         if(poly)
             grill_hole_positions(width, height, r)
@@ -121,11 +121,12 @@ module grill(width, height, r = 1000, poly = false, h = 0) { //! A staggered arr
 
 module box_corner_profile_2D(type) { //! The 2D shape of the corner profile.
     t = box_sheet_slot(type);
+    inset = box_corner_gap(type) + box_profile_overlap(type);
     difference() {
         union() {
             quadrant(box_hole_inset(type) + box_boss_r(type), box_boss_r(type));     // inside corner
 
-            translate([box_corner_gap(type) + box_profile_overlap(type), box_corner_gap(type) + box_profile_overlap(type)])
+            translate([inset, inset])
                 rotate(180)
                     quadrant(box_profile_overlap(type) + box_corner_rad(type), box_corner_rad(type)); // outside corner
         }
@@ -212,33 +213,39 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
     feet = bottom && box_feet(type);
     t = box_sheet_slot(type);
     outset =  box_outset(type);
+    inset = box_inset(type);
     inner_r = box_sheet_r(type);
-    foot_height = box_corner_gap(type) + sheet_thickness(box_base_sheet(type)) + washer_thickness(box_washer(type)) + screw_head_height(box_screw(type)) + box_profile_overlap(type) + 2;
+    cgap = box_corner_gap(type);
+    foot_height = cgap + sheet_thickness(box_base_sheet(type)) + washer_thickness(box_washer(type)) + screw_head_height(box_screw(type)) + box_profile_overlap(type) + 2;
     foot_length = box_corner_rad(type) * 2;
     height = box_bezel_height(type, bottom);
     foot_extension = foot_height - height;
 
     difference() {
+        w = box_width(type);
+        d = box_depth(type);
         translate_z(-box_profile_overlap(type)) difference() {
-            rounded_rectangle([box_width(type) + 2 * outset, box_depth(type) + 2 * outset, feet ? foot_height : height], box_corner_rad(type), false);
+            tw = w + 2 * outset;
+            td = d + 2 * outset;
+            rounded_rectangle([tw, td, feet ? foot_height : height], box_corner_rad(type), false);
             //
             // Remove edges between the feet
             //
             if(feet)
                 hull() {
                     translate_z(height + 0.5)
-                        cube([box_width(type) - 2 * foot_length, box_depth(type) + 2 * outset + 1, 1], center = true);
+                        cube([w - 2 * foot_length, td + 1, 1], center = true);
 
                     translate_z(foot_height + 1)
-                        cube([box_width(type) - 2 * (foot_length - foot_extension), box_depth(type) + 2 * outset + 1, 1], center = true);
+                        cube([w - 2 * (foot_length - foot_extension), td + 1, 1], center = true);
                 }
             if(feet)
                 hull() {
                     translate_z(height + 0.5)
-                        cube([box_width(type) + 2 * outset + 1, box_depth(type) - 2 * foot_length, 1], center = true);
+                        cube([tw + 1, d - 2 * foot_length, 1], center = true);
 
                     translate_z(foot_height + 1)
-                        cube([box_width(type) + 2 * outset + 1, box_depth(type) - 2 * (foot_length - foot_extension), 1], center = true);
+                        cube([tw + 1, d - 2 * (foot_length - foot_extension), 1], center = true);
                 }
         }
         //
@@ -247,28 +254,28 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
         translate_z(-box_profile_overlap(type))
             linear_extrude(2 * box_profile_overlap(type), center = true)
                 for(i = [-1, 1]) {
-                    translate([i * (box_width(type) / 2 + t / 2 - sheet_slot_clearance / 2), 0])
-                         square([t, box_depth(type) - 2 * box_corner_gap(type)], center = true);
+                    translate([i * (w + t - sheet_slot_clearance) / 2, 0])
+                         square([t, d - 2 * cgap], center = true);
 
-                    translate([0, i * (box_depth(type) / 2 + t / 2 - sheet_slot_clearance / 2)])
-                         square([box_width(type) - 2 * box_corner_gap(type), t], center = true);
+                    translate([0, i * (d + t - sheet_slot_clearance) / 2])
+                         square([w - 2 * cgap, t], center = true);
                 }
         //
         // recess for top / bottom panel
         //
-        translate_z(box_corner_gap(type))
-            rounded_rectangle([box_width(type) + bezel_clearance, box_depth(type) + bezel_clearance, height], inner_r + bezel_clearance / 2, false);
+        translate_z(cgap)
+            rounded_rectangle([w + bezel_clearance, d + bezel_clearance, height], inner_r + bezel_clearance / 2, false);
         //
         // leave plastic over the corner profiles
         //
         translate_z(-box_profile_overlap(type) - 1)
-            linear_extrude(box_profile_overlap(type) + box_corner_gap(type) + 2)
+            linear_extrude(box_profile_overlap(type) + cgap + 2)
                 union() {
                     difference() {
-                        square([box_width(type) - 2 * box_inset(type),
-                                box_depth(type) - 2 * box_inset(type)], center = true);
+                        square([w - 2 * inset,
+                                d - 2 * inset], center = true);
 
-                        box_corner_quadrants(type, box_width(type), box_depth(type));
+                        box_corner_quadrants(type, w, d);
                     }
                     box_screw_hole_positions(type)
                         poly_circle(screw_clearance_radius(box_screw(type)));
@@ -291,7 +298,9 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
     dw = bw - 2 * dowel_wall;
     dh = box_bezel_height(type, bottom) - dowel_h_wall;
 
-    dh2 = box_profile_overlap(type) + box_corner_gap(type) - dowel_h_wall;
+    profile_overlap = box_profile_overlap(type);
+
+    dh2 = profile_overlap + box_corner_gap(type) - dowel_h_wall;
 
     end_clearance = 0.5;
     module male() {
@@ -299,14 +308,14 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
             linear_extrude(dowel_length - 2 * end_clearance, center = true)
                 difference() {
                     union() {
-                        h = dh - layer_height;
+                        h1 = dh - layer_height;
                         h2 = dh2 - layer_height;
                         hull() {
-                            translate([bw / 2, h / 2])
-                                square([dw - 1, h], center = true);
+                            translate([bw / 2, h1 / 2])
+                                square([dw - 1, h1], center = true);
 
-                            translate([bw / 2, (h - 1) / 2])
-                                square([dw, h - 1], center = true);
+                            translate([bw / 2, (h1 - 1) / 2])
+                                square([dw, h1 - 1], center = true);
                         }
 
                         hull() {
@@ -318,7 +327,7 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
                         }
                     }
                     translate([bw2 / 2, 0])
-                        square([box_sheet_slot(type), 2 * box_profile_overlap(type)], center = true);
+                        square([box_sheet_slot(type), 2 * profile_overlap], center = true);
                 }
     }
 
@@ -359,7 +368,7 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
         render() difference() {
             union() {
                 clip(xmin = 0, xmax = w, ymin = 0, ymax = h)
-                    translate([tw / 2 - x * w, th / 2 - y * h, box_profile_overlap(type)])
+                    translate([tw / 2 - x * w, th / 2 - y * h, profile_overlap])
                         box_bezel(type, bottom);
 
                 if(x < cols - 1 && y == 0)
@@ -419,10 +428,14 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
     }
 }
 
-module box_screw_hole_positions(type)
+module box_screw_hole_positions(type) {
+    inset = box_hole_inset(type);
+    w = box_width(type) / 2 - inset;
+    d = box_depth(type) / 2 - inset;
     for(x = [-1, 1], y = [-1, 1])
-        translate([x * (box_width(type) / 2 - box_hole_inset(type)), y * (box_depth(type) / 2 - box_hole_inset(type))])
+        translate([x * w, y * d])
             children();
+}
 
 module box_base_blank(type) { //! Generates a 2D template for the base sheet
     dxf("box_base");
@@ -551,25 +564,25 @@ module box_shelf_bracket_section(type, rows, cols, x, y) { //! Generates section
             children();
 }
 
-module box_left_blank(type, sheet = false) { //! Generates a 2D template for the left sheet, ```sheet``` can be set to override the type
+module box_left_blank(type, sheet = false) { //! Generates a 2D template for the left sheet, `sheet` can be set to override the type
     dxf("box_left");
 
     sheet_2D(subst_sheet(type, sheet), box_depth(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
 }
 
-module box_right_blank(type, sheet = false) { //! Generates a 2D template for the right sheet, ```sheet``` can be set to override the type
+module box_right_blank(type, sheet = false) { //! Generates a 2D template for the right sheet, `sheet` can be set to override the type
     dxf("box_right");
 
     sheet_2D(subst_sheet(type, sheet), box_depth(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
 }
 
-module box_front_blank(type, sheet = false) { //! Generates a 2D template for the front sheet, ```sheet``` can be set to override the type
+module box_front_blank(type, sheet = false) { //! Generates a 2D template for the front sheet, `sheet` can be set to override the type
     dxf("box_front");
 
     sheet_2D(subst_sheet(type, sheet), box_width(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
 }
 
-module box_back_blank(type, sheet = false) { //! Generates a 2D template for the back sheet, ```sheet``` can be set to override the type
+module box_back_blank(type, sheet = false) { //! Generates a 2D template for the back sheet, `sheet` can be set to override the type
     dxf("box_back");
 
     sheet_2D(subst_sheet(type, sheet), box_width(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);

printed/box_assembly.scad

@@ -18,7 +18,7 @@
 //
 
 //
-// The assembly is ```include```d so the panel definitions can be overridden to add holes and components.
+// The assembly is `include`d so the panel definitions can be overridden to add holes and components.
 // The _box_module also needs to be wrapped in the file that uses it so it can be called without
 // parameters to make the assembly views. E.g. module box_assembly() _box_assembly(box);
 //

printed/butt_box.scad

@@ -21,7 +21,7 @@
 //! A box made from CNC cut panels butted together using printed fixing blocks. Useful for making large
 //! boxes with minimal 3D printing.  More blocks are added as the box gets bigger.
 //!
-//! Needs to be ```include```d rather than ```use```d to allow the panel definitions to be overridden to add holes
+//! Needs to be `include`d rather than `use`d to allow the panel definitions to be overridden to add holes
 //! and mounted components.
 //!
 //! A list specifies the internal dimensions, screw type, top, bottom and side sheet types and the block

printed/camera_housing.scad

@@ -0,0 +1,392 @@
+//
+// 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/>.
+//
+
+//
+//! Housings for PCB cameras.
+//
+include <../core.scad>
+include <../vitamins/cameras.scad>
+use <../vitamins/pcb.scad>
+use <../vitamins/insert.scad>
+
+wall = 1.75;
+min_wall = 2 * extrusion_width;
+clearance = 0.2;
+
+connector_size = [23, 6, 2.65]; // Worst case size of flat flex connector
+
+cam_back_clearance = round_to_layer(1.5);    // Clearance for components on the back of the pcb
+cam_back_overlap = 1;                        // How much the back overlaps the edge of the pcb
+cam_back_wall = min_wall;
+
+function cam_front_clearance(cam) = round_to_layer(camera_connector_size(cam).z + clearance);
+
+function cam_back_size(cam) = let(
+    pcb = camera_pcb(cam),
+    pcb_size = pcb_size(pcb),
+    nut = screw_nut(pcb_screw(pcb)),
+    holes = [for(h = pcb_holes(pcb)) pcb_coord(pcb, h).x],
+    pitch = max(holes) - min(holes),
+    length = pitch + 2 * (nut_radius(nut) + min_wall),
+    width = pcb_size.y + (length - pcb_size.x) * cos(30)
+    ) [length, width, wall + max(connector_size.z, cam_back_clearance + nut_trap_depth(nut))];
+
+
+function cam_front_size(cam) = cam_back_size(cam) + [ //! Outside dimensions of the case
+    2 * (wall + clearance),
+    2 * (wall + clearance),
+    pcb_thickness(camera_pcb(cam)) + cam_front_clearance(cam) + wall
+];
+
+hinge_screw = M2_cap_screw;
+hinge_nut = screw_nut(hinge_screw);
+hinge_screw_length = 12;
+
+hinge_r = nut_trap_radius(hinge_nut) + 3 * extrusion_width;
+hinge_h = wall + nut_trap_depth(hinge_nut);
+hinge_offset = hinge_r + 1;
+
+bracket_screw = M3_dome_screw;
+
+function cam_screw_length(cam) = let(
+    front = cam_front_size(cam),
+    screw = pcb_screw(camera_pcb(cam)),
+    nut = screw_nut(screw)
+    ) screw_longer_than(front.z + washer_thickness(screw_washer(screw)) - nut_trap_depth(nut) + nut_thickness(nut, true));
+
+function hinge_z(cam) = cam_screw_length(cam) - hinge_r;
+
+module cam_holes(cam) {
+    pcb = camera_pcb(cam);
+    lens_y = camera_lens_offset(cam).y;
+    two_holes = !!len([for (h = pcb_holes(pcb)) if(abs(pcb_coord(pcb, h).y - lens_y) < 1) true]);
+    pcb_screw_positions(pcb)                                                    // screw holes
+        if($i > 1 || !two_holes)
+            children();
+}
+
+module rpi_camera_focus_ring_stl() { //! Focus ring the glue onto RPI lens
+    stl("rpi_camera_focus_ring");
+
+    rad = 15 / 2;
+    hole_r1 = 2.5 / 2;
+    hole_r2 = 5 / 2;
+    thickness = 3;
+    flutes = 8;
+    angle = 180 / flutes;
+    x = rad / (sin(angle / 2) + cos(angle / 2));
+    r = x * sin(angle / 2);
+
+    difference() {
+        linear_extrude(height = thickness, convexity = 5)
+            difference() {
+                union() {
+                    circle(x);
+                    for(i = [0 : flutes - 1])
+                        rotate([0, 0, 2 * angle * i])
+                            translate([x, 0])
+                                circle(r);
+                }
+                for(i = [0 : flutes - 1])
+                    rotate([0, 0, 2 * angle * i + angle])
+                        translate([x, 0])
+                            circle(r);
+            }
+        hull() {
+            poly_cylinder(r = hole_r1, h = 0.1, center = true);
+
+            translate([0, 0, thickness])
+                poly_cylinder(r = hole_r2, h = 0.1, center = true);
+        }
+    }
+}
+
+module camera_back(cam) { //! Make the STL for a camera case back
+    stl(str("camera_back_", cam[0]));
+    pcb = camera_pcb(cam);
+    back = cam_back_size(cam);
+    screw = pcb_screw(pcb);
+    nut = screw_nut(screw);
+
+    translate_z(back.z)
+        hflip()
+            difference() {
+                translate_z(back.z / 2)
+                    cube(back, center = true);
+
+                translate([0, -cam_back_overlap])
+                    cube([pcb_length(pcb) - 2 * cam_back_overlap, pcb_width(pcb), 2 * cam_back_clearance], center = true);
+
+                translate([0, -pcb_width(pcb) / 2])
+                    cube([connector_size.x + 2 * clearance, 2 * connector_size.y + 1, 2 * round_to_layer(connector_size.z + clearance)], center = true);
+
+                translate_z(back.z)
+                    cam_holes(cam)
+                        hflip()
+                            nut_trap(screw, nut, supported = true);
+            }
+}
+
+module camera_front(cam, hinge = 0) { //! Make the STL for a camera case front
+    stl(str("camera_front_", cam[0]));
+    front = cam_front_size(cam);
+    back = cam_back_size(cam);
+    pcb = camera_pcb(cam);
+    pcb_size = pcb_size(pcb);
+    lens_offset = camera_lens_offset(cam);
+    screw = pcb_screw(pcb);
+
+    shelf = front.z - back.z;
+
+    connector_slot = connector_size + 2 * [clearance, 0, layer_height];
+    rad = wall;
+    led_hole_r = 1;
+    led_clearance = [5,   2, 1 * 2];
+    res_clearance = [3.5, 2, 1 * 2];
+
+    conn_pos = camera_connector_pos(cam);
+    conn = camera_connector_size(cam);
+    sensor_length = conn_pos.y + conn.y / 2 - lens_offset.y + clearance;
+
+    module hinge_pos()
+        if(!is_undef(hinge))
+            rotate(hinge * 90)
+                translate([0, (hinge ? front.x * hinge : front.y) / 2 + hinge_offset, hinge_r])
+                    children();
+
+    difference() {
+        union() {
+            hull()
+                for(x = [-1, 1], y = [-1, 1])
+                    translate([x * (front.x / 2 - rad), y * (front.y / 2 - rad)])
+                        hull() {    // 3D truncated teardrop gives radiused edges without exceeding 45 degree overhang
+                            translate_z(front.z - 1)
+                                cylinder(r = rad, h = 1);
+
+                            translate_z(rad)
+                                sphere(rad);
+
+                            cylinder(r = rad * (sqrt(2) - 1), h = eps);
+                        }
+
+            hinge_pos()
+                hull() {
+                    rotate([-90, 0, -90])
+                        teardrop(r = hinge_r, h = hinge_h, center = false);
+
+                    translate([0, -10, -hinge_r])
+                        cube([hinge_h, eps, 2 * hinge_r]);
+                }
+        }
+
+        hinge_pos()
+            rotate([90, 0, 90])
+                teardrop_plus(r = screw_clearance_radius(hinge_screw), h = 100, center = true);
+
+        translate_z(front.z / 2 + shelf - layer_height)                                 // recess for the back
+            cube([back.x + 2 * clearance, back.y + 2 * clearance, front.z], center = true);
+
+        translate_z(front.z / 2 + shelf - pcb_size.z)                                   // recess for PCB
+            cube([pcb_size.x + 2 * clearance, pcb_size.y + 2 * clearance, front.z], center = true);
+
+        translate_z(shelf)
+            hflip() {
+                pcb_component_position(pcb, "smd_led")                                  // clearance for LED
+                    cube(led_clearance, center = true);
+
+                pcb_component_position(pcb, "smd_res")                                  // clearance for resistor
+                    cube(res_clearance, center = true);
+            }
+
+        translate([conn_pos.x, lens_offset.y + sensor_length / 2, shelf - pcb_size.z])  // clearance for sensor connector
+            cube([conn.x + 2 * clearance, sensor_length, 2 * cam_front_clearance(cam)], center = true);
+
+        translate([0, -front.y / 2, shelf + front.z / 2])                               // slot for connector
+            cube([connector_slot.x, connector_slot.y, front.z], center = true);
+
+        translate_z(cam_back_clearance + layer_height)
+            cam_holes(cam)
+                rotate(90)
+                    poly_cylinder(r = screw_clearance_radius(screw), h = 100, center = true);
+
+        translate_z(shelf - pcb_size.z)
+            hflip()
+                camera_lens(cam, clearance);
+
+        hflip()
+            pcb_component_position(pcb, "smd_led")
+                rotate(45)
+                    poly_cylinder(r = led_hole_r, h = 100, center = true);              // hole for led
+    }
+}
+
+function bracket_thickness(cam) = max(wall, min(3.5, hinge_z(cam) - hinge_r - 1));
+
+module camera_bracket_screw_positions(cam) { //! Position children at the bracket screw positions
+    r = washer_radius(screw_washer(bracket_screw)) + 0.5;
+    wide = bracket_thickness(cam) == wall;
+    pitch = wide ? cam_front_size(cam).x / 2 - r : hinge_h + 1 + r;
+
+    for(side = [-1, 1])
+        translate([side * pitch, 0])
+            children();
+}
+
+module camera_bracket_position(cam) //! Position children at the bracket position
+    translate([0,  cam_front_size(cam).y / 2 + hinge_offset])
+        children();
+
+module camera_bracket(cam) { //! Make the STL for the camera bracket
+    stl(str("camera_bracket_", cam[0]));
+
+    t = bracket_thickness(cam);
+    z = hinge_z(cam);
+    translate([hinge_h / 2, 0])
+        difference() {
+            hull() {
+                translate_z(eps / 2)
+                    cube([hinge_h, 2 * hinge_r, eps], center = true);
+
+                translate_z(z)
+                    rotate([0, 90, 0])
+                        cylinder(r = hinge_r, h = hinge_h, center = true);
+            }
+            translate([hinge_h / 2, 0, z])
+                rotate([90, 0, 90])
+                    nut_trap(hinge_screw, screw_nut(hinge_screw), horizontal = true);
+        }
+
+    linear_extrude(t)
+        difference() {
+            hull()
+                camera_bracket_screw_positions(cam)
+                    circle(washer_radius(screw_washer(bracket_screw)) + 0.5);
+
+            camera_bracket_screw_positions(cam)
+                poly_circle(screw_clearance_radius(bracket_screw));
+        }
+}
+
+module camera_assembly(cam, angle = 0) //! Camera case assembly
+assembly(str("camera_", cam[0])) {
+    front = cam_front_size(cam);
+    screw = pcb_screw(camera_pcb(cam));
+    nut = screw_nut(screw);
+    screw_length = cam_screw_length(cam);
+    hinge_z = hinge_z(cam);
+    hinge_pos = [0, front.y / 2  + hinge_offset, -hinge_r];
+
+    camera_bracket_position(cam) {
+        nut = screw_nut(hinge_screw);
+
+        stl_colour(pp1_colour) render()
+            camera_bracket(cam);
+
+        translate([-hinge_h, 0, hinge_z(cam)])
+            rotate([-90, 0, 90]) {
+                vflip()
+                    translate_z(2 * hinge_h - nut_trap_depth(nut))
+                        nut(nut, true);
+
+                screw_and_washer(hinge_screw, screw_longer_than(2 * hinge_h));
+            }
+    }
+
+    translate_z(hinge_z(cam) + hinge_r)
+        translate(hinge_pos)
+            rotate([-angle, 0, 0])
+                translate(-hinge_pos) {
+                    translate_z(cam_back_size(cam).z - front.z)
+                        camera(cam);
+
+                    stl_colour(pp1_colour) render()
+                        translate_z(-front.z)
+                            camera_back(cam);
+
+                    cam_holes(cam) {
+                        screw_and_washer(screw, screw_length);
+
+                        translate_z(-front.z + nut_trap_depth(nut))
+                            vflip()
+                                nut(nut, true);
+                    }
+
+                    *translate(camera_lens_offset(cam))
+                        translate_z(1.5)
+                            stl_colour(pp1_colour) render()
+                                rpi_camera_focus_ring_stl();
+
+                    stl_colour(pp2_colour) render()
+                        hflip()
+                            camera_front(cam, 0);
+                }
+}
+
+module camera_fastened_assembly(cam, thickness, angle = 0) {
+    camera_assembly(cam, angle);
+
+    camera_bracket_position(cam)
+        camera_bracket_screw_positions(cam) {
+            nut = screw_nut(bracket_screw);
+            washer = screw_washer(bracket_screw);
+            t = bracket_thickness(cam);
+            screw_length = screw_longer_than(thickness + t + nut_thickness(nut, true) + 2 * washer_thickness(washer));
+            vflip()
+                translate_z(thickness)
+                    screw_and_washer(bracket_screw, screw_length);
+
+            translate_z(t)
+                nut_and_washer(nut, true);
+        }
+}
+
+module camera_back_rpi_camera_stl()    camera_back(rpi_camera);
+module camera_back_rpi_camera_v1_stl() camera_back(rpi_camera_v1);
+module camera_back_rpi_camera_v2_stl() camera_back(rpi_camera_v2);
+
+module camera_front_rpi_camera_stl()    camera_front(rpi_camera);
+module camera_front_rpi_camera_v1_stl() camera_front(rpi_camera_v1);
+module camera_front_rpi_camera_v2_stl() camera_front(rpi_camera_v2);
+
+module camera_bracket_rpi_camera_stl()    camera_bracket(rpi_camera);
+module camera_bracket_rpi_camera_v1_stl() camera_bracket(rpi_camera_v1);
+module camera_bracket_rpi_camera_v2_stl() camera_bracket(rpi_camera_v2);
+
+module camera_rpi_camera_assembly()    camera_assembly(rpi_camera);
+module camera_rpi_camera_v1_assembly() camera_assembly(rpi_camera_v1);
+module camera_rpi_camera_v2_assembly() camera_assembly(rpi_camera_v2);
+
+module camera_housing(cam) {
+    front = cam_front_size(cam);
+
+    camera_front(cam, 0);
+
+    translate([front.x, 0])
+        camera_back(cam);
+
+    translate([-front.x / 2 - 2 - hinge_r, 0])
+        rotate(90)
+            camera_bracket(cam);
+}
+
+cam = rpi_camera_v2;
+if($preview)
+    camera_fastened_assembly(cam, 3);
+else
+    camera_housing(cam);

printed/corner_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.
 //!
-//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting `show_block` to false.
 //! This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
 //!
-//! Star washers can be omitted by setting ```star_washers``` to false.
+//! Star washers can be omitted by setting `star_washers` to false.
 //
 include <../core.scad>
 use <../vitamins/insert.scad>

printed/drag_chain.scad

@@ -0,0 +1,324 @@
+//
+// 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/>.
+//
+
+//
+//! Parametric cable drag chain to limit the bend radius of a cable run.
+//!
+//! Each link has a maximum bend angle of 45&deg;, so the mininium radius is proportional to the link length.
+//!
+//! The travel property is how far it can move in each direction, i.e. half the maximum travel if the chain is mounted in the middle of the travel.
+//!
+//! The ends can have screw lugs with four screw positions to choose from, specified by a list of two arrays of four bools.
+//! If none are enabled then a child object is expected to customise the end and this gets unioned with the blank end.
+//! If both ends are customised then two children are expected.
+//! Each child is called twice, once with `$fasteners` set to 0 to augment the STL and again with `$fasteners` set to 1 to add
+//! to the assembly, for example to add inserts.
+//
+
+include <../core.scad>
+use <../utils/horiholes.scad>
+use <../utils/maths.scad>
+
+clearance = 0.1;
+
+function drag_chain_name(type)        = type[0]; //! The name to allow more than one in a project
+function drag_chain_size(type)        = type[1]; //! The internal size and link length
+function drag_chain_travel(type)      = type[2]; //! X travel
+function drag_chain_wall(type)        = type[3]; //! Side wall thickness
+function drag_chain_bwall(type)       = type[4]; //! Bottom wall
+function drag_chain_twall(type)       = type[5]; //! Top wall
+function drag_chain_screw(type)       = type[6]; //! Mounting screw for the ends
+function drag_chain_screw_lists(type) = type[7]; //! Two lists of four bools to say which screws positions are used
+
+function drag_chain_clearance() = clearance; //! Clearance around joints.
+
+function drag_chain_radius(type) = //! The bend radius at the pivot centres
+    let(s = drag_chain_size(type))
+        s.x / 2 / sin(360 / 16);
+
+function drag_chain_z(type) = //! Outside dimension of a 180 bend
+    let(os = drag_chain_outer_size(type), s = drag_chain_size(type))
+        2 * drag_chain_radius(type) + os.z;
+
+function drag_chain(name, size, travel, wall = 1.6, bwall = 1.5, twall = 1.5, screw = M2_cap_screw, screw_lists = [[1,0,0,1],[1,0,0,1]]) = //! Constructor
+    [name, size, travel, wall, bwall, twall, screw, screw_lists];
+
+function drag_chain_outer_size(type) = //! Link outer dimensions
+    let(s = drag_chain_size(type), z = s.z + drag_chain_bwall(type) + drag_chain_twall(type))
+        [s.x + z, s.y + 4 * drag_chain_wall(type) + 2 * clearance, z];
+
+function screw_lug_radius(screw) = //! Radius of a screw lug
+    corrected_radius(screw_clearance_radius(screw)) + 3.1 * extrusion_width;
+
+module screw_lug(screw, h = 0) //! Create a D shaped lug for a screw
+    extrude_if(h, center = false)
+        difference() {
+            r = screw_lug_radius(screw);
+            hull() {
+                circle4n(r);
+
+                translate([-r, -r])
+                    square([2 * r, eps]);
+            }
+            poly_circle(screw_clearance_radius(screw));
+        }
+
+function bool2int(b) = b ? 1 : 0;
+
+module drag_chain_screw_positions(type, end) { //! Place children at the screw positions, end = 0 for the start, 1 for the end
+    r = screw_lug_radius(drag_chain_screw(type));
+    s = drag_chain_size(type);
+    os = drag_chain_outer_size(type);
+    R = os.z / 2;
+    x0 = end ? R + norm([drag_chain_cam_x(type), R - drag_chain_twall(type)]) + clearance + r : r;
+    x1 = end ? os.x - r : os.x - 2 * R - clearance - r;
+    for(i = [0 : 3], x = [x0, x1, x0, x1][i], y = [-1, -1, 1, 1][i])
+        if(drag_chain_screw_lists(type)[bool2int(end)][i])
+            translate([x, y * (s.y / 2 + r)])
+                let($a = [180, 0, 180, 0][i])
+                    children();
+}
+
+function drag_chain_cam_x(type) = // how far the cam sticks out
+    let(s = drag_chain_size(type),
+        r =  drag_chain_outer_size(type).z / 2,
+        wall =  drag_chain_wall(type),
+        cam_r = s.x - 2 * clearance - wall - r,  // inner_x_normal - clearance - r
+        twall = drag_chain_twall(type)
+    )   min(sqrt(max(sqr(cam_r) - sqr(r - twall), 0)), r);
+
+module drag_chain_link(type, start = false, end = false, check_kids = true) { //! One link of the chain, special case for start and end
+    stl(str(drag_chain_name(type), "_drag_chain_link", start ? "_start" : end ? "_end" : ""));
+
+    s = drag_chain_size(type);
+    wall = drag_chain_wall(type);
+    bwall = drag_chain_bwall(type);
+    twall = drag_chain_twall(type);
+    os = drag_chain_outer_size(type);
+    r = os.z / 2;
+    pin_r = r / 2;
+
+    socket_x = r;
+    pin_x = socket_x + s.x;
+
+    outer_normal_x =  pin_x - r - clearance;     // s.x - clearance
+    outer_end_x = end ? os.x : outer_normal_x;
+
+    inner_x = start ? 0 : outer_normal_x - wall; // s.x - clearance - wall
+
+    roof_x_normal = 2 * r - twall;
+    roof_x = start ? 0 : roof_x_normal;
+
+    floor_x = start ? 0 : 2 * r;
+    cam_x = drag_chain_cam_x(type);
+    assert(r + norm([drag_chain_cam_x(type), r - drag_chain_twall(type)]) + clearance <= inner_x || start, "Link must be longer");
+
+    difference() {
+        union() {
+            for(side = [-1, 1])
+                rotate([90, 0, 0]) {
+                    // Outer cheeks
+                    translate_z(side * (os.y / 2 - wall / 2))
+                        linear_extrude(wall, center = true)
+                            difference() {
+                                hull() {
+                                    if(start)
+                                        square([eps, os.z]);
+                                    else
+                                        translate([socket_x, r])
+                                            rotate(180)
+                                                teardrop(r = r, h = 0);
+
+                                    translate([outer_end_x - eps, 0])
+                                        square([eps, os.z]);
+                                }
+                                if(!start)
+                                    translate([socket_x, r])
+                                        horihole(pin_r, r);
+                            }
+                    // Inner cheeks
+                    translate_z(side * (s.y / 2 + wall / 2))
+                        linear_extrude(wall, center = true)
+                            difference() {
+                                union() {
+                                    hull() {
+                                        if(!end) {
+                                            translate([pin_x, r])
+                                                rotate(180)
+                                                    teardrop(r = r, h = 0);
+
+                                            translate([pin_x, twall])
+                                                square([cam_x, eps]);
+                                        }
+                                        else
+                                            translate([os.x - eps, 0])
+                                                square([eps, os.z]);
+
+                                        translate([inner_x, 0])
+                                            square([eps, os.z]);
+                                    }
+                                }
+                                // Cutout for top wall
+                                if(!end)
+                                    intersection() {
+                                        translate([pin_x - r, 0])
+                                            square([3 * r, twall]);  // When straight
+
+                                        translate([pin_x, r])
+                                             rotate(-45)
+                                                translate([-r + roof_x_normal, -r - twall]) // When bent fully
+                                                    square(os.z);
+                                    }
+                            }
+                    // Pin
+                    if(!end)
+                        translate([pin_x, r, side * (s.y / 2 + wall + clearance)])
+                            horicylinder(r = pin_r, z = r, h = 2 * wall);
+
+                    // Cheek joint
+                    translate([inner_x, 0, side * (s.y / 2 + wall) - 0.5])
+                        cube([outer_end_x - inner_x, os.z, 1]);
+                }
+
+            // Roof, actually the floor when printed
+            roof_end = end ? s.x + 2 * r : s.x + r - twall - clearance;
+            translate([roof_x, -s.y / 2 - 0.5])
+                cube([roof_end - roof_x , s.y + 1, twall]);
+
+            translate([roof_x, -os.y / 2 + 0.5])
+                cube([s.x - clearance - roof_x, os.y - 1, twall]);
+
+            // Floor, actually the roof when printed
+            floor_end = end ? s.x + 2 * r : s.x + r;
+            translate([floor_x, -s.y / 2 - wall, os.z - bwall])
+                cube([floor_end - floor_x, s.y + 2 * wall, bwall]);
+
+            translate([floor_x, -os.y / 2 + 0.5,  os.z - bwall])
+                cube([s.x - floor_x - clearance, os.y -1, bwall]);
+
+            if(start || end) {
+                drag_chain_screw_positions(type, end)
+                    rotate($a)
+                        screw_lug(drag_chain_screw(type), os.z);
+
+                if(check_kids) {
+                    custom = drag_chain_screw_lists(type)[bool2int(end)] == [0, 0, 0, 0];
+                    assert($children == bool2int(custom), str("wrong number of children for ",  end ? "end" : "start", " STL customisation: ", $children));
+                }
+                children();
+            }
+        }
+        if(start || end)
+            translate_z(-eps)
+                drag_chain_screw_positions(type, end)
+                    rotate($a)
+                        poly_cylinder(r = screw_clearance_radius(drag_chain_screw(type)), h = os.z + 2 * eps, center = false);
+
+    }
+
+    if(show_supports() && !end) {
+        for(side = [-1, 1]) {
+            w = 2.1 * extrusion_width;
+            translate([s.x + r + cam_x - w / 2, side * (s.y / 2 + wall / 2), twall / 2])
+                cube([w, wall, twall], center = true);
+
+            h = round_to_layer(r - pin_r / sqrt(2));
+            y = s.y / 2  + max(wall + w / 2 + clearance, 2 * wall + clearance - w / 2);
+            translate([s.x + r, side * y, h / 2])
+                cube([pin_r * sqrt(2), w, h], center = true);
+
+            gap = cam_x - pin_r / sqrt(2) + extrusion_width;
+            translate([s.x + r + cam_x - gap / 2, side * (s.y / 2 + wall + clearance / 2), layer_height / 2])
+                cube([gap, 2 * wall + clearance, layer_height], center = true);
+        }
+    }
+}
+
+// Need to use a wrapper because can't define nested modules in an assembly
+module _drag_chain_assembly(type, pos = 0, render = false) {
+    s = drag_chain_size(type);
+    x = (1 + exploded()) * s.x;
+    r = drag_chain_radius(type) * x / s.x;
+    travel = drag_chain_travel(type);
+    links = ceil(travel / s.x);
+    actual_travel = links * s.x;
+    z = drag_chain_outer_size(type).z;
+
+    zb = z / 2;                                     // z of bottom track
+    c = [actual_travel / 2 + pos / 2, 0, r + zb];   // centre of bend
+
+    points = [                                      // Calculate list of hinge points
+        for(i = 0, p = [0, 0, z / 2 + 2 * r]; i < links + 5;
+            i = i + 1,
+            dx = p.z > c.z ? x : -x,
+            p = max(p.x + dx, p.x) <= c.x ? p + [dx, 0, 0]      // Straight sections
+                  : let(q = circle_intersect(p, x, c, r))
+                        q.x <= c.x ? [p.x - sqrt(sqr(x) - sqr(p.z - zb)), 0, zb] // Transition back to straight
+                                   : q) // Circular section
+        p
+    ];
+    npoints = len(points);
+
+    module link(n)                                  // Position and colour link with origin at the hinge hole
+        translate([-z / 2, 0, -z / 2]) {
+            stl_colour(n < 0 || n == npoints - 1 ? pp3_colour : n % 2 ? pp1_colour : pp2_colour)
+                render_if(render)
+                    drag_chain_link(type, start = n == -1, end = n == npoints - 1, check_kids = false)
+                        let($fasteners = 0)
+                            children();
+
+            let($fasteners = 1) children();
+        }
+
+    screws = drag_chain_screw_lists(type);
+    custom_start = screws[0] == [0, 0, 0, 0];
+    custom_end   = screws[1] == [0, 0, 0, 0];
+    assert($children == bool2int(custom_start) + bool2int(custom_end), str("wrong number of children for end customisation: ", $children));
+
+    for(i = [0 : npoints - 2]) let(v = points[i + 1] - points[i])
+        translate(points[i])
+            rotate([0, -atan2(v.z, v.x), 0])
+                link(i);
+
+    translate(points[0] - [x, 0, 0])
+        link(-1)
+            if(custom_start)
+                children(0);
+
+    translate(points[npoints - 1])
+        hflip()
+            link(npoints - 1)
+                if(custom_end)
+                    children(custom_start ? 1 : 0);
+}
+
+//! 1. Remove the support material from the links with side cutters.
+//! 1. Clip the links together with the special ones at the ends.
+module drag_chain_assembly(type, pos = 0, render = false)  //! Drag chain assembly
+    assembly(str(drag_chain_name(type), "_drag_chain"), big = true)
+        if($children == 2)
+            _drag_chain_assembly(type, pos, render) {
+                children(0);
+                children(1);
+            }
+        else if($children == 1)
+            _drag_chain_assembly(type, pos, render)
+                children(0);
+        else
+            _drag_chain_assembly(type, pos, render);

printed/fan_guard.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 
 //
-//! Pintable fan finger guard to match the specified fan. To be ```include```d, not ```use```d.
+//! Pintable fan finger guard to match the specified fan. To be `include`d, not `use`d.
 //!
 //! The ring spacing as well as the number of spokes can be specified, if zero a gasket is generated instead of a guard.
 //

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.
 //!
-//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting `show_block` to false.
 //! This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
 //!
-//! Star washers can be omitted by setting ```star_washers``` to false.
+//! Star washers can be omitted by setting `star_washers` to false.
 //
 include <../core.scad>
 use <../vitamins/insert.scad>

printed/flat_hinge.scad

@@ -25,8 +25,8 @@
 //!
 //! Opening the test in OpenSCAD with its customiser enabled allows these parameters to be played with.
 //!
-//! Note setting ```thickness1``` or ```thickness2``` to zero in the ```hinge_fastened_assembly()``` removes the screws from one side or the other and
-//! setting ```show_hinge``` to false removes the hinge.
+//! Note setting `thickness1` or `thickness2` to zero in the `hinge_fastened_assembly()` removes the screws from one side or the other and
+//! setting `show_hinge` to false removes the hinge.
 //! 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>

printed/press_fit.scad

@@ -0,0 +1,50 @@
+//
+// 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/>.
+//
+
+//
+//! Utility for making printed press fit connectors to join printed parts.
+//!
+//! Add solvent or glue to make a permanent fixture.
+//
+include <../core.scad>
+
+interference = 0.0;
+
+bridge_droop = layer_height; //sqrt(4 * layer_height * filament_width / PI) - layer_height;
+
+module press_fit_socket(w = 5, h = 50, horizontal = false) { //! Make a square hole to accept a peg
+    h = horizontal ? h : h + bridge_droop;
+
+    cube([w, w, 2 * h], center = true);
+}
+
+module press_fit_peg(h, w = 5, horizontal = false) {    //! Make a rounded chamfered peg for easy insertion
+    module chamfered_square(w, horizontal) {
+        h = horizontal ? w - bridge_droop : w;
+        rounded_square([w, h], 1);
+    }
+
+    translate_z(-eps)
+        linear_extrude(height = h + eps - layer_height)
+            chamfered_square(w + interference, horizontal);
+
+    translate_z(h - layer_height - eps)
+        linear_extrude(height = layer_height + eps)
+            chamfered_square(w - layer_height, horizontal);
+}

printed/ribbon_clamp.scad

@@ -24,69 +24,72 @@ include <../core.scad>
 use <../vitamins/insert.scad>
 use <../vitamins/cable_strip.scad>
 
-wall = 2;
+wall = 1.6;
 min_wall = 2 * extrusion_width;
 screw = M3_cap_screw;
-insert = screw_insert(screw);
-screw_depth = insert_length(insert) + 1;
 
-function ribbon_clamp_hole_pitch(ways) = ribbon_clamp_slot(ways) + 2 * min_wall + 2 * corrected_radius(insert_hole_radius(insert)); //! Hole pitch
-function ribbon_clamp_width() = 2 * (insert_hole_radius(insert) + wall); //! Width
-function ribbon_clamp_length(ways) = ribbon_clamp_hole_pitch(ways) + ribbon_clamp_width(); //! Length given ways
-function ribbon_clamp_height() = screw_depth + 1; //! Height
+function ribbon_clamp_screw_depth(screw = screw) = insert_length(screw_insert(screw)) + 1;
+function ribbon_clamp_hole_pitch(ways, screw = screw) =
+    ribbon_clamp_slot(ways) + 2 * min_wall + 2 * corrected_radius(insert_hole_radius(screw_insert(screw))); //! Hole pitch
 
-module ribbon_clamp_hole_positions(ways, side = undef) //! Place children at hole positions
+function ribbon_clamp_width(screw = screw) = 2 * (insert_hole_radius(screw_insert(screw)) + wall); //! Width
+function ribbon_clamp_length(ways, screw = screw) = ribbon_clamp_hole_pitch(ways, screw) + ribbon_clamp_width(screw); //! Length given ways
+function ribbon_clamp_height(screw = screw) = ribbon_clamp_screw_depth(screw) + 1; //! Height
+
+module ribbon_clamp_hole_positions(ways, screw = screw, side = undef) //! Place children at hole positions
     for(x = is_undef(side) ? [-1, 1] : side)
-        translate([x * ribbon_clamp_hole_pitch(ways) / 2, 0])
+        translate([x * ribbon_clamp_hole_pitch(ways, screw) / 2, 0])
             children();
 
-module ribbon_clamp_holes(ways, h = 20) //! Drill screw holes
-    ribbon_clamp_hole_positions(ways)
+module ribbon_clamp_holes(ways, h = 20, screw = screw) //! Drill screw holes
+    ribbon_clamp_hole_positions(ways, screw)
         drill(screw_clearance_radius(screw), h);
 
-module ribbon_clamp(ways) { //! Generate STL for given number of ways
-    stl(str("ribbon_clamp_", ways));
+module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of ways
+    screw_d = screw_radius(screw) * 2;
+    stl(str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""));
 
-    pitch = ribbon_clamp_hole_pitch(ways);
-    d = ribbon_clamp_width();
-    h = ribbon_clamp_height();
-    t = h - ribbon_clamp_slot_depth() - wall;
+    pitch = ribbon_clamp_hole_pitch(ways, screw);
+    d = ribbon_clamp_width(screw);
+    h = ribbon_clamp_height(screw);
+    t = round_to_layer(ribbon_clamp_slot_depth() + wall);
+    insert = screw_insert(screw);
 
     difference() {
         union() {
             hull() {
                 translate_z(h - t / 2)
-                    cube([ribbon_clamp_hole_pitch(ways), d, t], center = true);
+                    cube([ribbon_clamp_hole_pitch(ways, screw), d, t], center = true);
 
                 translate_z(1)
                     cube([pitch, max(wall, d - 2 * (h - t)), 2], center = true);
             }
-            ribbon_clamp_hole_positions(ways, -1)
+            ribbon_clamp_hole_positions(ways, screw, -1)
                 cylinder(d = d, h = h);
 
-            ribbon_clamp_hole_positions(ways,  1)
+            ribbon_clamp_hole_positions(ways, screw, 1)
                 cylinder(d = d, h = h);
-
         }
 
         translate_z(h)
             cube([ribbon_clamp_slot(ways), d + 1, ribbon_clamp_slot_depth() * 2], center = true);
 
-        ribbon_clamp_hole_positions(ways)
+        ribbon_clamp_hole_positions(ways, screw)
             translate_z(h)
                 rotate(22.5)
-                    insert_hole(insert, screw_depth - insert_length(insert));
+                    insert_hole(insert, ribbon_clamp_screw_depth(screw) - insert_length(insert));
     }
 }
 
-module ribbon_clamp_assembly(ways) pose([55, 180, 25])  //! Printed part with inserts in place
-    assembly(str("ribbon_clamp_", ways)) {
-    h = ribbon_clamp_height();
+module ribbon_clamp_assembly(ways, screw = screw) pose([55, 180, 25])  //! Printed part with inserts in place
+    assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : "")) {
+    h = ribbon_clamp_height(screw);
+    insert = screw_insert(screw);
 
     stl_colour(pp1_colour) render()
-        translate_z(h) vflip() ribbon_clamp(ways);
+        translate_z(h) vflip() ribbon_clamp(ways, screw);
 
-    ribbon_clamp_hole_positions(ways)
+    ribbon_clamp_hole_positions(ways, screw)
         vflip()
             insert(insert);
 }
@@ -99,20 +102,28 @@ module ribbon_clamp_fastened_assembly(ways, thickness, screw = screw) { //! Clam
     vitamin(str(": Tape self amalgamating silicone ",tape_l," x 25mm"));
 
     washer = screw_washer(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + screw_depth);
+    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + ribbon_clamp_screw_depth(screw));
 
-    ribbon_clamp_assembly(ways);
+    ribbon_clamp_assembly(ways, screw);
 
     color("red") translate_z(tape_thickness / 2)
         cube([tape_l, tape_width, tape_thickness], center = true);
 
-    ribbon_clamp_hole_positions(ways)
+    ribbon_clamp_hole_positions(ways, screw)
         vflip()
            translate_z(thickness)
                 screw_and_washer(screw, screw_length, true);
 }
 
 module ribbon_clamp_20_stl() ribbon_clamp(20);
+module ribbon_clamp_8_2_stl() ribbon_clamp(8, M2_dome_screw);
+module ribbon_clamp_7_2_stl() ribbon_clamp(8, M2_dome_screw);
 
 //! * Place inserts into the holes and press home with a soldering iron with a conical bit heated to 200&deg;C.
 module ribbon_clamp_20_assembly() ribbon_clamp_assembly(20);
+
+//! * Place inserts into the holes and press home with a soldering iron with a conical bit heated to 200&deg;C.
+module ribbon_clamp_8_2_assembly() ribbon_clamp_assembly(8, M2_dome_screw);
+
+//! * Place inserts into the holes and press home with a soldering iron with a conical bit heated to 200&deg;C.
+module ribbon_clamp_7_2_assembly() ribbon_clamp_assembly(8, M2_dome_screw);

scripts/blurb.py

@@ -39,8 +39,6 @@ def _scrape_blurb(lines):
         if b:
             break
         text += t
-    if len(text):
-        text += '\n'
     return text
 
 def scrape_blurb(scad_file):
@@ -49,6 +47,16 @@ def scrape_blurb(scad_file):
         lines = file.readlines()
     return _scrape_blurb(lines)
 
+def split_blurb(lines):
+    """ Split blurb on horizontal rules."""
+    blurbs = [""]
+    for line in lines.split('\n')[:-1]:
+        if re.match(r'\*{3,}',line):
+            blurbs.append("")
+        else:
+            blurbs[-1] += line + '\n'
+    return blurbs
+
 def scrape_module_blurb(lines):
     """ Find the Markup lines before the last function or module. """
     text = ""

scripts/doc_scripts.py

@@ -36,7 +36,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.
 
@@ -60,7 +60,8 @@ They should work with both Python 2 and Python 3.
                         break
                 if not blurb:
                     print("Missing description for", file)
-                print("| ```%s``` | %s |" % (file, blurb), file = doc_file)
+                else:
+                    print("| `%s` | %s |" % (file, blurb), file = doc_file)
 
     with open(dir + "/readme.html", "wt") as html_file:
         do_cmd(("python -m markdown -x tables " + doc_name).split(), html_file)

scripts/gallery.py

@@ -52,7 +52,7 @@ def gallery(force):
             if os.path.isfile(document):
                 with open(document, 'rt') as readme:
                     for line in readme.readlines():
-                        match = re.match(r"^.*!(\[.*\]\(.*\)).*$", line)
+                        match = re.search(r"!(\[.*\]\(.*\))", line)
                         if match:
                             image = match.group(0)
                             if image.startswith('![Main Assembly](assemblies/'):

scripts/make_all.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License along with NopSCADlib.
 # If not, see <https://www.gnu.org/licenses/>.
 #
-#! Generates all the files for a project by running ```bom.py```, ```stls.py```, ```dxfs.py```, ```render.py``` and ```views.py```.
+#! Generates all the files for a project by running `bom.py`, `stls.py`, `dxfs.py`, `render.py` and `views.py`.
 
 import sys
 

scripts/openscad.py

@@ -18,13 +18,13 @@
 #
 
 #
-# Run openscad
+#! Run `openscad.exe` and capture `stdout` and `stderr` in `openscad.log` as well as printing to the console.
 #
 from __future__ import print_function
 
 import subprocess, sys
 
-def run_list(args, silent = False):
+def run_list(args, silent = False, verbose = False):
     cmd = ["openscad"] + args
     if not silent:
         for arg in cmd:
@@ -33,7 +33,7 @@ def run_list(args, silent = False):
     with open("openscad.log", "w") as log:
         rc = subprocess.call(cmd, stdout = log, stderr = log)
     for line in open("openscad.log", "rt"):
-        if 'ERROR:' in line or 'WARNING:' in line:
+        if verbose or 'ERROR:' in line or 'WARNING:' in line:
             print(line[:-1])
     if rc:
         sys.exit(rc)
@@ -43,3 +43,6 @@ def run(*args):
 
 def run_silent(*args):
     run_list(list(args), True);
+
+if __name__ == '__main__':
+    run_list(sys.argv[1:], True, True)

scripts/panels.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License along with NopSCADlib.
 # If not, see <https://www.gnu.org/licenses/>.
 #
-#! Panelises DXF files so they can be routed together by running scad files found in the ```panels``` directory.
+#! Panelises DXF files so they can be routed together by running scad files found in the `panels` directory.
 
 from __future__ import print_function
 import sys

scripts/plateup.py

@@ -87,24 +87,25 @@ def plateup(target, part_type, usage = None):
                     match = re.match(r'^ECHO: "~(.*?\.' + part_type + r').*"$', line)
                     if match:
                         used.append(match.group(1))
-    #
-    # Copy file that are not included
-    #
     copied = []
-    for file in os.listdir(parts_dir):
-        if file.endswith('.' + part_type) and not file in used:
-            src = parts_dir + '/' + file
-            dst = target_dir + '/' + file
-            if mtime(src) > mtime(dst):
-                print("Copying %s to %s" % (src, dst))
-                copyfile(src, dst)
-            copied.append(file)
-    #
-    # Remove any cruft
-    #
-    targets = [file[:-4] + part_type for file in all_sources]
-    for file in os.listdir(target_dir):
-        if file.endswith('.' + part_type):
-            if not file in targets and not file in copied:
-                print("Removing %s" % file)
-                os.remove(target_dir + '/' + file)
+    if all_sources:
+        #
+        # Copy files that are not included
+        #
+        for file in os.listdir(parts_dir):
+            if file.endswith('.' + part_type) and not file in used:
+                src = parts_dir + '/' + file
+                dst = target_dir + '/' + file
+                if mtime(src) > mtime(dst):
+                    print("Copying %s to %s" % (src, dst))
+                    copyfile(src, dst)
+                copied.append(file)
+        #
+        # Remove any cruft
+        #
+        targets = [file[:-4] + part_type for file in all_sources]
+        for file in os.listdir(target_dir):
+            if file.endswith('.' + part_type):
+                if not file in targets and not file in copied:
+                    print("Removing %s" % file)
+                    os.remove(target_dir + '/' + file)

scripts/platters.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License along with NopSCADlib.
 # If not, see <https://www.gnu.org/licenses/>.
 #
-#! Generates build plates of STL files for efficient printing by running scad files found in the ```platters``` directory.
+#! Generates build plates of STL files for efficient printing by running scad files found in the `platters` directory.
 
 from __future__ import print_function
 import sys

scripts/readme.md

@@ -1,22 +1,23 @@
 
 # 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.
 
 | Script  | Function  |
 |:---|:---|
-| ```bom.py``` | Generates BOM files for the project. |
-| ```c14n_stl.py``` | OpenSCAD produces randomly ordered STL files. This script re-orders them consistently so that GIT can tell if they have changed or not. |
-| ```doc_scripts.py``` | Makes this document and doc/usage.md. |
-| ```dxfs.py``` | Generates DXF files for all the routed parts listed on the BOM or a specified list. |
-| ```gallery.py``` | Finds projects and adds them to the gallery. |
-| ```make_all.py``` | Generates all the files for a project by running ```bom.py```, ```stls.py```, ```dxfs.py```, ```render.py``` and ```views.py```. |
-| ```panels.py``` | Panelises DXF files so they can be routed together by running scad files found in the ```panels``` directory. |
-| ```platters.py``` | Generates build plates of STL files for efficient printing by running scad files found in the ```platters``` directory. |
-| ```render.py``` | Renders STL and DXF files to PNG for inclusion in the build instructions. |
-| ```set_config.py``` | Sets the target configuration for multi-target projects that have variable configurations. |
-| ```stls.py``` | Generates STL files for all the printed parts listed on the BOM or a specified list. |
-| ```svgs.py``` | Generates SVG files for all the routed parts listed on the BOM or a specified list. |
-| ```tests.py``` | Runs all the tests in the tests directory and makes the readme file with a catalog of the results. |
-| ```views.py``` | Generates exploded and unexploded assembly views and scrapes build instructions to make readme.md, readme.html and printme.html files for the project. |
+| `bom.py` | Generates BOM files for the project. |
+| `c14n_stl.py` | OpenSCAD produces randomly ordered STL files. This script re-orders them consistently so that GIT can tell if they have changed or not. |
+| `doc_scripts.py` | Makes this document and doc/usage.md. |
+| `dxfs.py` | Generates DXF files for all the routed parts listed on the BOM or a specified list. |
+| `gallery.py` | Finds projects and adds them to the gallery. |
+| `make_all.py` | Generates all the files for a project by running `bom.py`, `stls.py`, `dxfs.py`, `render.py` and `views.py`. |
+| `openscad.py` | Run `openscad.exe` and capture `stdout` and `stderr` in `openscad.log` as well as printing to the console. |
+| `panels.py` | Panelises DXF files so they can be routed together by running scad files found in the `panels` directory. |
+| `platters.py` | Generates build plates of STL files for efficient printing by running scad files found in the `platters` directory. |
+| `render.py` | Renders STL and DXF files to PNG for inclusion in the build instructions. |
+| `set_config.py` | Sets the target configuration for multi-target projects that have variable configurations. |
+| `stls.py` | Generates STL files for all the printed parts listed on the BOM or a specified list. |
+| `svgs.py` | Generates SVG files for all the routed parts listed on the BOM or a specified list. |
+| `tests.py` | Runs all the tests in the tests directory and makes the readme file with a catalog of the results. |
+| `views.py` | Generates exploded and unexploded assembly views and scrapes build instructions to make readme.md, readme.html and printme.html files for the project. |

scripts/tests.py

@@ -97,7 +97,6 @@ def tests(tests):
     for dir in [deps_dir, png_dir, bom_dir]:
         if not os.path.isdir(dir):
             os.makedirs(dir)
-    doc_name = "readme.md"
     index = {}
     bodies = {}
     done = []
@@ -108,19 +107,33 @@ def tests(tests):
     #
     png_name = "libtest.png"
     scad_name = "libtest.scad"
-    if not os.path.isfile(png_name):
-        openscad.run(colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall", "-o", png_name, scad_name);
-        do_cmd(["magick", png_name, "-trim", "-resize", "1280", "-bordercolor", background, "-border", "10", png_name])
+    if os.path.isfile(scad_name):
+        libtest = True
+        lib_blurb = scrape_blurb(scad_name)
+        if not os.path.isfile(png_name):
+            openscad.run(colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall", "-o", png_name, scad_name);
+            do_cmd(["magick", png_name, "-trim", "-resize", "1280", "-bordercolor", background, "-border", "10", png_name])
+    else:
+        #
+        # Project tests so just a title
+        #
+        libtest = False
+        project = ' '.join(word[0].upper() + word[1:] for word in os.path.basename(os.getcwd()).split('_'))
+        lib_blurb = '#' + project + ' Tests\n'
+
+    doc_base_name = "readme" if libtest else "tests"
+    doc_name = doc_base_name + ".md"
     #
     # List of individual part files
     #
-    scads = [i for i in sorted(os.listdir(scad_dir), key = lambda s: s.lower()) if i[-5:] == ".scad"]
 
+    scads = [i for i in sorted(os.listdir(scad_dir), key = lambda s: s.lower()) if i[-5:] == ".scad"]
+    types = []
     for scad in scads:
         base_name = scad[:-5]
         if not tests or base_name in tests:
             done.append(base_name)
-            print(base_name)
+            print('\n'+base_name)
             cap_name = base_name[0].capitalize() + base_name[1:]
             base_name = base_name.lower()
             scad_name = scad_dir + '/' + scad
@@ -132,29 +145,42 @@ def tests(tests):
             if is_plural(base_name) and os.path.isfile(vits_name):
                 objects_name = vits_name
 
-            locations = [
-                ('vitamins/' + depluralise(base_name) + '.scad', 'Vitamins'),
-                ('printed/' + base_name + '.scad',               'Printed'),
-                ('utils/' + base_name + '.scad',                 'Utilities'),
-                ('utils/core/' + base_name + '.scad',            'Core Utilities'),
-            ]
+            locations = []
+            if os.path.isdir('vitamins'):
+                locations.append(('vitamins/' + depluralise(base_name) + '.scad', 'Vitamins'))
+            if os.path.isdir('printed'):
+                locations.append(('printed/' + base_name + '.scad',               'Printed'))
+            if os.path.isdir('utils'):
+                locations.append(('utils/' + base_name + '.scad',                 'Utilities'))
+            if libtest and os.path.isdir('utils/core'):
+                locations.append(('utils/core/' + base_name + '.scad',            'Core Utilities'))
 
             for name, type in locations:
                 if os.path.isfile(name):
                     impl_name = name
                     break
             else:
-                print("Can't find implementation!")
-                continue
+                if libtest:
+                    print("Can't find implementation!")
+                    continue
+                else:
+                    type = 'Tests'                         # OK when testing part of a project
+                    impl_name = None
 
-            vsplit = "AJR" + chr(ord('Z') + 1)
-            vtype = locations[0][1]
-            types = [vtype + ' ' + vsplit[i] + '-'  + chr(ord(vsplit[i + 1]) - 1) for i in range(len(vsplit) - 1)] + [loc[1] for loc in locations[1 :]]
-            if type == vtype:
-                for i in range(1, len(vsplit)):
-                    if cap_name[0] < vsplit[i]:
-                         type = types[i - 1]
-                         break
+            if libtest:
+                vsplit = "AJR" + chr(ord('Z') + 1)
+                vtype = locations[0][1]
+                types = [vtype + ' ' + vsplit[i] + '-' + chr(ord(vsplit[i + 1]) - 1) for i in range(len(vsplit) - 1)] + [loc[1] for loc in locations[1 :]]
+                if type == vtype:
+                    for i in range(1, len(vsplit)):
+                        if cap_name[0] < vsplit[i]:
+                             type = types[i - 1]
+                             break
+            else:
+                if not types:
+                    types = [loc[1] for loc in locations]   # No need to split up the vitamin list
+                    if not type in types:                   # Will happen when implementation is not found and type is set to Tests
+                        types.append(type)
 
             for t in types:
                 if not t in bodies:
@@ -193,7 +219,7 @@ def tests(tests):
                     if things:
                         body += ['### %s\n| %s | Description |\n|:--- |:--- |' % (thing.title(), heading)]
                         for item in sorted(things):
-                            body += ['| ```%s``` | %s |' % (item, things[item])]
+                            body += ['| `%s` | %s |' % (item, things[item])]
                         body += ['']
 
             body += ["![%s](%s)\n" %(base_name, png_name)]
@@ -226,7 +252,7 @@ def tests(tests):
                             desc = ''
                             if thing == "vitamins":
                                 vit = item.split(':')
-                                name = '```' + vit[0] + '```' if vit[0] else ''
+                                name = '`' + vit[0] + '`' if vit[0] else ''
                                 while '[[' in name and ']]' in name:
                                     i = name.find('[[')
                                     j = name.find(']]') + 2
@@ -250,24 +276,7 @@ def tests(tests):
         usage()
 
     with open(doc_name, "wt") as doc_file:
-        print('# NopSCADlib', file = doc_file)
-        print('''\
-An ever expanding library of parts modelled in OpenSCAD useful for 3D printers and enclosures for electronics, etc.
-
-It contains lots of vitamins (the RepRap term for non-printed parts), some general purpose printed parts and
-some utilities. There are also Python scripts to generate Bills of Materials (BOMs),
- STL files for all the printed parts, DXF files for CNC routed parts in a project and a manual containing assembly
-instructions and exploded views by scraping markdown embedded in OpenSCAD comments, [see scripts](scripts/readme.md). A simple example project can be found [here](examples/MainsBreakOutBox/readme.md).
-
-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 requirements, installation instructions and a usage guide.
-
-<img src="libtest.png" width="100%"/>\n
-''', file = doc_file)
-
+        print(lib_blurb, file = doc_file)
         print('## Table of Contents<a name="top"/>', file = doc_file)
         print('<table><tr>', file = doc_file)
         n = 0
@@ -288,10 +297,10 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
         for type in types:
             for line in bodies[type]:
                 print(line, file = doc_file)
-    with open("readme.html", "wt") as html_file:
-        do_cmd("python -m markdown -x tables readme.md".split(), html_file)
+    with open(doc_base_name + ".html", "wt") as html_file:
+        do_cmd(("python -m markdown -x tables " + doc_name).split(), html_file)
     times.print_times()
-    do_cmd('codespell -L od readme.md'.split())
+    do_cmd(('codespell -L od ' + doc_name).split())
 
 if __name__ == '__main__':
     for arg in sys.argv[1:]:

scripts/views.py

@@ -35,6 +35,7 @@ import json
 import blurb
 import bom
 import shutil
+import re
 from colorama import Fore
 
 def is_assembly(s):
@@ -217,12 +218,17 @@ def views(target, do_assemblies = None):
             if not main_file:
                 raise Exception("can't find source for main_assembly")
             text = blurb.scrape_blurb(source_dir + '/' + main_file)
+            blurbs = blurb.split_blurb(text)
             if len(text):
-                print(text, file = doc_file, end = '')
+                print(blurbs[0], file = doc_file)
             else:
                 if print_mode:
                     print(Fore.MAGENTA + "Missing project description" + Fore.WHITE)
-            print('![Main Assembly](assemblies/%s.png)\n' % flat_bom[-1]["name"].replace('_assembly', '_assembled'), file = doc_file)
+            #
+            # Only add the image if the first blurb section doesn't contain one.
+            #
+            if not re.search(r'\!\[.*\]\(.*\)', blurbs[0], re.MULTILINE):
+                print('![Main Assembly](assemblies/%s.png)\n' % flat_bom[-1]["name"].replace('_assembly', '_assembled'), file = doc_file)
             eop(print_mode, doc_file, first = True)
             #
             # Build TOC
@@ -234,6 +240,8 @@ def views(target, do_assemblies = None):
                 cap_name = titalise(name)
                 print('1. [%s](#%s)' % (cap_name, name), file = doc_file)
             print(file = doc_file)
+            if len(blurbs) > 1:
+                print(blurbs[1], file = doc_file)
             eop(print_mode, doc_file)
             #
             # Global BOM
@@ -283,6 +291,8 @@ def views(target, do_assemblies = None):
                     print("| %s | %s |" % (pad(grand_total, 2, 1), pad('Total %s count' % headings[t], 2)), file = doc_file)
 
             print(file = doc_file)
+            if len(blurbs) > 2:
+                print(blurbs[2], file = doc_file)
             eop(print_mode, doc_file)
             #
             # Assembly instructions
@@ -308,8 +318,7 @@ def views(target, do_assemblies = None):
                 if printed:
                     print('### 3D Printed parts', file = doc_file)
                     keys = sorted(list(printed.keys()))
-                    for i in range(len(keys)):
-                        p = keys[i]
+                    for i, p in enumerate(keys):
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', printed[p]["count"], p), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(printed) - 1:
                             n = (i % 3) + 1
@@ -324,8 +333,7 @@ def views(target, do_assemblies = None):
                 if routed:
                     print("### CNC Routed parts", file = doc_file)
                     keys = sorted(list(routed.keys()))
-                    for i in range(len(keys)):
-                        r = keys[i]
+                    for i, r in enumerate(keys):
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', routed[r]["count"], r), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(routed) - 1:
                             n = (i % 3) + 1
@@ -340,8 +348,7 @@ def views(target, do_assemblies = None):
                 if sub_assemblies:
                     print("### Sub-assemblies", file = doc_file)
                     keys = sorted(list(sub_assemblies.keys()))
-                    for i in range(len(keys)):
-                        a = keys[i]
+                    for i, a in enumerate(keys):
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', sub_assemblies[a], a), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(keys) - 1:
                             n = (i % 3) + 1

tests/PCB.scad

@@ -121,7 +121,8 @@ test_pcb = ["TestPCB", "Test PCB",
         [ 70, 130, 180, "term35", 3, "lime"],
         [ 50, 150,   0, "transition", 5],
         [ 50, 160,   0, "block", 10, 5, 8, "orange"],
-        [ 50, 170,   0, "button_6mm"],
+        [ 45, 170,   0, "button_6mm"],
+        [ 55, 170,   0, "button_4p5mm"],
         [ 50, 185,   0, "microswitch", small_microswitch],
         [ 52, 200,   0, "pcb", 11, TMC2130 ],
         [ 80, 200,   0, "pdip", 24, "27C32", true, inch(0.6) ],

tests/belts.scad

@@ -23,46 +23,52 @@ use <../vitamins/insert.scad>
 use <../utils/layout.scad>
 
 module belt_test() {
-    p1 = [75,  -50];
     p2 = [-75, -50];
     p3 = [-75, 100];
     p4 = [75,  100];
 
-    p5 = [75  - pulley_pr(GT2x20ob_pulley) - pulley_pr(GT2x16_plain_idler),  -pulley_pr(GT2x16_plain_idler)];
-    p6 = [-75 + pulley_pr(GT2x20ob_pulley) + pulley_pr(GT2x16_plain_idler),  -pulley_pr(GT2x16_plain_idler)];
+    p5 = [75  + pulley_pr(GT2x20ob_pulley) - pulley_pr(GT2x16_plain_idler), +pulley_pr(GT2x16_plain_idler)];
+    p6 = [-75 + pulley_pr(GT2x20ob_pulley) + pulley_pr(GT2x16_plain_idler), -pulley_pr(GT2x16_plain_idler)];
 
-    translate(p1) pulley_assembly(GT2x20ob_pulley);
-    translate(p2) pulley_assembly(GT2x20ob_pulley);
-    translate(p3) pulley_assembly(GT2x20_toothed_idler);
-    translate(p4) pulley_assembly(GT2x20_toothed_idler);
+    module pulleys(flip = false) {
+        translate(p2) rotate([0, flip ? 180 : 0, 0]) pulley_assembly(GT2x20ob_pulley);
+        translate(p3) pulley_assembly(GT2x20_toothed_idler);
+        translate(p4) pulley_assembly(GT2x20_toothed_idler);
+        translate(p5) {
+            pulley = GT2x16_toothed_idler;
+            screw = find_screw(hs_cs_cap, pulley_bore(pulley));
+            insert = screw_insert(screw);
 
-    translate(p5) {
-        pulley = GT2x16_plain_idler;
-        screw = find_screw(hs_cs_cap, pulley_bore(pulley));
-        insert = screw_insert(screw);
-
-        pulley_assembly(pulley);
-        translate_z(pulley_height(pulley) + pulley_offset(pulley) + screw_head_depth(screw, pulley_bore(pulley)))
-            screw(screw, 20);
-
-        translate_z(pulley_offset(pulley) - insert_length(insert))
-            vflip()
-                insert(insert);
+            hflip(flip) {
+                pulley_assembly(pulley);
+                translate_z(pulley_height(pulley) + pulley_offset(pulley) + screw_head_depth(screw, pulley_bore(pulley)))
+                    screw(screw, 20);
 
+                translate_z(pulley_offset(pulley) - insert_length(insert))
+                    vflip()
+                        insert(insert);
+            }
+        }
+        translate(p6) pulley_assembly(GT2x16_plain_idler);
     }
-    translate(p6) pulley_assembly(GT2x16_plain_idler);
 
-    path = [ [p1.x, p1.y, pulley_pr(GT2x20ob_pulley)],
-             [p5.x, p5.y, -pulley_pr(GT2x16_plain_idler)],
+    path = [ [p5.x, p5.y, pulley_pr(GT2x16_plain_idler)],
              [p6.x, p6.y, -pulley_pr(GT2x16_plain_idler)],
              [p2.x, p2.y, pulley_pr(GT2x20ob_pulley)],
              [p3.x, p3.y, pulley_pr(GT2x20ob_pulley)],
              [p4.x, p4.y, pulley_pr(GT2x20ob_pulley)]
            ];
+
     belt = GT2x6;
     belt(belt, path, 80, [0,  0]);
+    pulleys();
+    translate_z(20)
+        hflip() {
+            belt(belt, path, 80, [0,  0], belt_colour = grey(90), tooth_colour = grey(50));
+            pulleys(flip=true);
+        }
 
-    translate([-25, 0])
+    translate([-25, 0, 10])
         layout([for(b = belts) belt_width(b)], 10)
             rotate([0, 90, 0])
                 belt(belts[$i], [[0, 0, 20], [0, 1, 20]], belt_colour = $i%2==0 ? grey(90) : grey(20), tooth_colour = $i%2==0 ? grey(70) : grey(50));

tests/camera_housing.scad

@@ -0,0 +1,33 @@
+//
+// 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>
+
+use <../printed/camera_housing.scad>
+
+include <../vitamins/cameras.scad>
+
+use <../vitamins/pcb.scad>
+
+module camera_housings()
+    layout([for(c = cameras) pcb_length(camera_pcb(c))], 15, false) let(c = cameras[$i])
+        camera_fastened_assembly(c, 3);
+
+if($preview)
+    camera_housings();

tests/cameras.scad

@@ -24,7 +24,7 @@ include <../vitamins/cameras.scad>
 use <../vitamins/pcb.scad>
 
 module cameras()
-    layout([for(c = cameras) pcb_length(camera_pcb(c))], 10, false) let(c = cameras[$i])
+    layout([for(c = cameras) pcb_length(camera_pcb(c))], 15, false) let(c = cameras[$i])
         camera(c);
 
 if($preview)

tests/catenary.scad

@@ -0,0 +1,56 @@
+//
+// 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/>.
+//
+l = 250; // [1: 1000]
+x = 200; // [1: 1000]
+y = 50; //[-500 : 500]
+
+include <../utils/core/core.scad>
+use <../utils/catenary.scad>
+use <../utils/sweep.scad>
+use <../utils/annotation.scad>
+
+module catenaries() {
+    //
+    // catenary curve path from control points
+    //
+    curve = [for(p = catenary_points(l, x, y)) [p.x, p.y, 0]];
+    //
+    // Draw the curve
+    //
+    r = 0.5;
+    sweep(curve, circle_points(r, $fn = 64));
+    //
+    // Minimum Z
+    //
+    min_z = catenary_points(l, x, y, 0);
+
+    color("blue") {
+        translate([min_z.x, min_z.y + r])
+            rotate([-90, 0, 0])
+                arrow();
+
+        translate([min_z.x, min_z.y - r])
+            rotate([90, 0, 0])
+                arrow();
+    }
+}
+
+if($preview)
+    rotate(is_undef($bom) ? 0 : [70, 0, 315])
+        catenaries();

tests/dogbones.scad

@@ -26,6 +26,12 @@ module dogbones() {
     #translate([15, 0])
         dogbone_rectangle([10, 20, 5], center = false);
 
+    #translate([30, 0])
+        dogbone_rectangle_x([10, 20, 5], center = false);
+
+    #translate([45, 0])
+        dogbone_rectangle_y([10, 20, 5], center = false);
+
     sq = 3;
     translate([-5 + sq / 2 + eps, -10 + sq / 2 + eps])
         %cube([sq, sq, 1], center = true);

tests/drag_chain.scad

@@ -0,0 +1,59 @@
+//
+// 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/>.
+//
+
+// Link length between hinges
+x = 10; //[8 : 30]
+
+// Link inner width
+y = 10; //[5 : 30]
+
+// Link inner height
+z = 5;  //[4 : 11]
+// Side wall thickness
+wall = 1.6; //[0.9: 0.1: 3]
+// Bottom wall thickness
+bwall = 1.5; //[1: 0.25: 3]
+// Top wall thickness
+twall = 1.5; //[1: 0.25: 3]
+// Max travel in each direction
+travel = 100;
+// Current position
+pos = 50; // [-100 : 1 : 100]
+
+include <../core.scad>
+use <../printed/drag_chain.scad>
+
+include <../vitamins/leadnuts.scad>
+
+drag_chain = drag_chain("x", [x, y, z], travel, wall = wall, bwall = bwall, twall = twall);
+
+module drag_chains()
+    drag_chain_assembly(drag_chain, pos);
+
+if($preview)
+    drag_chains();
+else {
+    drag_chain_link(drag_chain);
+
+    translate([-x * 2, 0])
+        drag_chain_link(drag_chain, start = true);
+
+    translate([x * 2, 0])
+        drag_chain_link(drag_chain, end = true);
+}

tests/foot.scad

@@ -21,14 +21,14 @@ use <../printed/foot.scad>
 
 module feet()
     if($preview) {
-        translate([50, 0])
+        translate([40, 0])
             foot_assembly(3);
 
         translate([foot_diameter(insert_foot()) / 2, 0])
             fastened_insert_foot_assembly(3);
     }
     else {
-        translate([50, 0])
+        translate([40, 0])
             foot();
 
         insert_foot();

tests/global.scad

@@ -29,6 +29,23 @@ module globals() {
         translate([50, 0])
             right_triangle(10, 20, 0);
     }
+    assert(slice("ABCD")    == "ABCD");
+    assert(slice("ABCD", 1) == "BCD");
+    assert(slice("ABCD", 2) == "CD");
+    assert(slice("ABCD", 3) == "D");
+    assert(slice("ABCD", 4) == "");
+    assert(slice("ABCD", 1, -1) == "BC");
+    assert(slice("ABCD", 2, -1) == "C");
+    assert(slice("ABCD", 3, -1) == "");
+    assert(slice("ABCD", 4, -1) == "");
+    assert(slice("ABCD", 0, -1) == "ABC");
+    assert(slice("ABCD", 0, -2) == "AB");
+    assert(slice("ABCD", 0, -3) == "A");
+    assert(slice("ABCD", 0, -4) == "");
+    assert(slice("ABCD", 0,  0) == "");
+    assert(slice("ABCD", 0,  1) == "A");
+    assert(slice("ABCD", 0,  2) == "AB");
+    assert(slice("ABCD", 0,  3) == "ABC");
 }
 
 rotate([70, 0, 315]) globals();

tests/horiholes.scad

@@ -69,9 +69,13 @@ module horiholes() {
             color(silver)
                 cylinder(r = $r, h = eps, center = true, $fn = 360);
 
+    hole_positions()
+        color("blue")
+            horicylinder(r = $r, z = $z, h = 2 * eps, center = true, $fn = 360);
+
     hole_positions()
         color("red")
-            linear_extrude(2 * eps, center = true)
+            linear_extrude(3 * eps, center = true)
                 intersection() {
                     difference() {
                         square(8, center = true);

tests/hot_ends.scad

@@ -25,7 +25,7 @@ module hot_ends()
     layout([for(h = hot_ends) 40])
         translate([-20, 0])
             rotate(90)
-                hot_end(hot_ends[$i], 3);
+                hot_end(hot_ends[$i], 3, bowden = $i == 3);
 
 if($preview)
     hot_ends();

tests/maths.scad

@@ -69,6 +69,33 @@ module maths() {
     // Test Euler
     //
     assert(euler(rotate(r)) == r, "euler() failed");
+    //
+    // Circle intersect
+    //
+    r1 = 10;
+    c1 = [50, 0, 10];
+    r2 = 20;
+    c2 = [67, 0, 0];
+    p1 = circle_intersect(c1, r1, c2, r2);
+    p2 = circle_intersect(c2, r2, c1, r1);
+
+    rotate(90) {
+        color(grey(90))
+            translate(c1) rotate([90, 0, 0]) cylinder(r = r1, h = 4 * eps, center = true);
+
+        color(grey(80))
+            translate(c2) rotate([90, 0, 0]) cylinder(r = r2, h = eps, center = true);
+
+        color("red")
+            translate(p1) rotate([90, 0, 0]) cylinder(r = 0.1, h = 6 * eps, center = true);
+
+        color("blue")
+            translate(p2) rotate([90, 0, 0]) cylinder(r = 0.1, h = 6 * eps, center = true);
+
+        translate(p1) arrow();
+
+        translate(p2) vflip() arrow();
+    }
 }
 
 rotate(45)

tests/opengrab.scad

@@ -21,11 +21,11 @@ include <../utils/core/core.scad>
 use <../vitamins/opengrab.scad>
 
 module opengrab_test() {
-    opengrab_target();
-
     rotate(45)
-        translate_z(opengrab_target_thickness())
-            opengrab();
+        opengrab_target();
+
+    translate_z(opengrab_target_thickness())
+        opengrab();
 }
 
 if($preview)

tests/pin_headers.scad

@@ -23,26 +23,56 @@ include <../vitamins/pin_headers.scad>
 
 pins = 10;
 
-module pin_headers()
+module pin_headers() {
     layout([for(p = pin_headers) hdr_pitch(p) * pins], 15) {
         idc_transition(pin_headers[$i], 10);
 
         translate([0, 20])
-            pin_header(pin_headers[$i], 10, 2, right_angle = true);
+            pin_header(pin_headers[$i], 3, 2, right_angle = true);
+
+        translate([-10, 20])
+            pin_header(pin_headers[$i], 3, 1, right_angle = true);
+
+         translate([10, 20])
+            pin_header(pin_headers[$i], 3, 3, right_angle = true);
+
+        translate([0, 30])
+            pin_header(pin_headers[$i], 8, 1);
 
         translate([0, 40])
             pin_header(pin_headers[$i], 10, 2);
 
+        translate([0, 50])
+            box_header(pin_headers[$i], 8, 1);
+
         translate([0, 60])
             box_header(pin_headers[$i], 10, 2);
 
+        translate([0, 70])
+            pin_socket(pin_headers[$i], 8, 1);
+
         translate([0, 80])
             pin_socket(pin_headers[$i], 10, 2);
 
-        translate([0, 110])
-            pin_socket(pin_headers[$i], 10, 2, right_angle = true);
+        translate([-10, 105])
+            pin_socket(pin_headers[$i], 3, 1, right_angle = true);
 
+        translate([0, 105])
+            pin_socket(pin_headers[$i], 3, 2, right_angle = true);
+
+        translate([10, 105])
+            pin_socket(pin_headers[$i], 3, 3, right_angle = true);
     }
 
+    for(i = [0, 1], p = [5, 2][i], j = [0 , 1]) {
+        h = [jst_ph_header, jst_xh_header][j];
+        translate([-20 * (i + 1), 0 + j * 40])
+            jst_xh_header(h, p);
+
+        translate([-20 * (i + 1), 20 + j * 40])
+            jst_xh_header(h, p, true);
+    }
+}
+
 if($preview)
     pin_headers();