Updated readme

Merge branch 'extrusion_center' of https://github.com/martinbudden/NopSCADlib into martinbudden-extrusion_center
Added center option to spring and documented the origin of rods, etc.
2025-09-03 12:22:46 +02:00 · 2020-02-27 09:44:54 +00:00 · 2020-02-27 09:41:01 +00:00 · 2020-02-27 09:39:05 +00:00 · 2020-02-27 09:03:23 +00:00 · 2020-02-26 19:43:02 +00:00
151 changed files with 2738 additions and 526 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,16 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto eol=lf
+
+# Declare text files that are normalized and converted on checkout.
+*.scad text
+*.py   text
+*.md   text
+
+# Handle Windows batch and command files 
+*.{bat,[bB][aA][tT]} text eol=crlf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+
+# Denote files that are binary and should not be modified.
+*.png binary
+*.jpg binary
+
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ tests/bom/
 *.log
 *.html
 bounds.json
+options.json
 times.txt
 *_diff.png
 *.echo
--- a/docs/metric_threads.png
+++ b/docs/metric_threads.png
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -26,7 +26,7 @@ OpenSCAD has to be setup to find libraries by setting the ```OPENSCADPATH``` env
 in the directory it points to. This can be done with ```git clone https://github.com/nophead/NopSCADlib.git``` while in that directory or, if you don't want to use GIT,
 by downloading https://github.com/nophead/NopSCADlib/archive/master.zip and unzipping it to a directory called NopSCADlib.

-The ```NopSCADlib/scripts``` directory needs to be added to the executable search path.
+The ```NopSCADlib/scripts``` directory needs to be added to the executable search path, ```PATH``` on Windows and ```path``` on Linux and Mac.

 The installation can be tested by opening ```NopSCADlib/libtest.scad``` in the OpenSCAD GUI. It should render all the objects in the library in about 1 minute.

--- a/global_defs.scad
+++ b/global_defs.scad
@@ -39,6 +39,7 @@ pp2_colour      = is_undef($pp2_colour)      ? "red"  : $pp2_colour;      // pri
 pp3_colour      = is_undef($pp3_colour)      ? "blue" : $pp3_colour;      // printed part colour 3
 pp4_colour      = is_undef($pp4_colour)      ? "darkorange" : $pp4_colour;// printed part colour 4
 show_rays       = is_undef($show_rays)       ? false  : $show_rays;       // show camera sight lines and light direction
+show_threads    = is_undef($show_threads)    ? false  : $show_threads;    // show screw threads

 // Minimum wall is about two filaments wide but we extrude it closer to get better bonding
 squeezed_wall = $preview ? 2 * extrusion_width - layer_height * (1 - PI / 4)
@@ -59,7 +60,9 @@ grey60                          = [0.6, 0.6, 0.6];
 grey70                          = [0.7, 0.7, 0.7];
 grey80                          = [0.8, 0.8, 0.8];
 grey90                          = [0.9, 0.9, 0.9];
-brass                           = "gold";
+gold                            = [255/255, 215/255, 0/255];
+brass                           = [255/255, 220/255, 100/255];
+silver                          = [0.75, 0.75, 0.75];

 /*
 * Enums
--- a/lib.scad
+++ b/lib.scad
@@ -22,7 +22,7 @@
 //
 include <core.scad>

-include <vitamins/fans.scad>
+include <vitamins/psus.scad>
 include <vitamins/inserts.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
@@ -34,14 +34,11 @@ include <vitamins/components.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/tubings.scad>
 include <vitamins/zipties.scad>
-include <vitamins/linear_bearings.scad>
+include <vitamins/scs_bearing_blocks.scad>
 include <vitamins/rod.scad>
 include <vitamins/leadnuts.scad>
 include <vitamins/bulldogs.scad>
 include <vitamins/pillars.scad>
-include <vitamins/psus.scad>
-include <vitamins/iecs.scad>
-include <vitamins/rockers.scad>
 include <vitamins/ssrs.scad>
 include <vitamins/d_connectors.scad>
 include <vitamins/buttons.scad>
@@ -55,7 +52,6 @@ include <vitamins/transformers.scad>
 include <vitamins/variacs.scad>
 include <vitamins/springs.scad>
 include <vitamins/batteries.scad>
-include <vitamins/microswitches.scad>
 include <vitamins/ball_bearings.scad>
 include <vitamins/light_strips.scad>
 include <vitamins/spools.scad>
@@ -63,6 +59,7 @@ include <vitamins/mains_sockets.scad>
 include <vitamins/ldrs.scad>
 include <vitamins/geared_steppers.scad>
 include <vitamins/extrusions.scad>
+include <vitamins/sk_brackets.scad>

 use <vitamins/jack.scad>
 use <vitamins/meter.scad>
@@ -91,3 +88,4 @@ use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>
 use <utils/sector.scad>
+use <utils/thread.scad>
--- a/libtest.png
+++ b/libtest.png
--- a/libtest.scad
+++ b/libtest.scad
@@ -136,13 +136,13 @@ translate([x5, cable_grommets_y + 250])
 translate([900, 600])
    box_test();

-translate([850, 1220])
+translate([850, 1260])
    bbox_test();

 x0 = 0;
 inserts_y = 0;
 nuts_y = inserts_y + 20;
-washers_y = nuts_y + 60;
+washers_y = nuts_y + 100;
 screws_y = washers_y + 120;
 o_rings_y = screws_y + 130;
 springs_y = o_rings_y + 20;
@@ -254,7 +254,7 @@ buttons_y = spades_y + 40;
 jacks_y = buttons_y + 40;
 microswitches_y = jacks_y + 40;
 rockers_y = microswitches_y + 40;
-toggles_y = rockers_y + 40;
+toggles_y = rockers_y + 60;
 components_y = toggles_y + 40;

 translate([x2, leds_y])
--- a/printed/box.scad
+++ b/printed/box.scad
@@ -35,8 +35,7 @@ include <../core.scad>
 use <../vitamins/sheet.scad>
 use <../vitamins/screw.scad>
 use <../vitamins/washer.scad>
-
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/quadrant.scad>

 bezel_clearance = 0.2;
--- a/printed/corner_block.scad
+++ b/printed/corner_block.scad
@@ -32,7 +32,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/maths.scad>

--- a/printed/fixing_block.scad
+++ b/printed/fixing_block.scad
@@ -32,7 +32,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/maths.scad>

 def_screw = M3_cap_screw;
--- a/printed/foot.scad
+++ b/printed/foot.scad
@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>

 foot        = [25, 12, 3, 2, M4_cap_screw, 10];
 insert_foot = [20, 10, 0, 2, M3_cap_screw, 10];
--- a/printed/handle.scad
+++ b/printed/handle.scad
@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>

 dia = 18;
 length = 90; // inside length
--- a/printed/psu_shroud.scad
+++ b/printed/psu_shroud.scad
@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>

 use <../vitamins/wire.scad>
 use <../vitamins/psu.scad>
--- a/printed/ribbon_clamp.scad
+++ b/printed/ribbon_clamp.scad
@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../vitamins/cable_strip.scad>

 wall = 2;
--- a/printed/screw_knob.scad
+++ b/printed/screw_knob.scad
@@ -34,7 +34,7 @@ knob_waves = 5;
 knob_height = knob_stem_h + knob_thickness;
 function knob_height() = knob_height;

-module screw_knob(screw) { //! Generate the STL foe a knob to fit the specified hex screw
+module screw_knob(screw) { //! Generate the STL for a knob to fit the specified hex screw
    stl(str("screw_knob_M", screw_radius(screw) * 20));

    knob_stem_r = nut_trap_radius(screw_nut(screw)) + knob_wall;
--- a/printed/socket_box.scad
+++ b/printed/socket_box.scad
@@ -23,7 +23,7 @@
 include <../core.scad>
 include <../vitamins/mains_sockets.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 include <../vitamins/ring_terminals.scad>

 box_height = 19;
--- a/printed/ssr_shroud.scad
+++ b/printed/ssr_shroud.scad
@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>

 use <../vitamins/wire.scad>
 use <../vitamins/ssr.scad>
--- a/printed/strap_handle.scad
+++ b/printed/strap_handle.scad
@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>

 strap = [18, 2, M3_pan_screw, 3, 25];
 function strap() = strap;
--- a/readme.md
+++ b/readme.md
@@ -21,32 +21,34 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#Bom">Bom</a> </td></tr>
 <tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
 <tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Global">Global</a> </td></tr>
-<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Pcbs">Pcbs</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
-<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Psus">Psus</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
-<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Pcb_mount">Pcb_mount</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microview">Microview</a> </td><td></td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Pcb">Pcb</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
+<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Pcbs">Pcbs</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
+<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Psus">Psus</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Pcb_mount">Pcb_mount</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Scs_bearing_blocks">Scs_bearing_blocks</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Sk_brackets">Sk_brackets</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Spools">Spools</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Springs">Springs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Kp_pillow_blocks">Kp_pillow_blocks</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
 <tr><td> <a href = "#Modules">Modules</a> </td><td></td><td></td><td></td><td></td></tr>
 </table>

@@ -93,8 +95,10 @@ Also single bearing balls are modelled as just a silver sphere and a BOM entry.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```ball_bearing(BB608)``` |  Ball bearing 608-2RS 8mm x 22mm x 7mm |
+|   1 | ```ball_bearing(BB6200)``` |  Ball bearing 6200-2RS 10mm x 30mm x 9mm |
+|   1 | ```ball_bearing(BB6201)``` |  Ball bearing 6201-2RS 12mm x 32mm x 10mm |
 |   1 | ```ball_bearing(BB624)``` |  Ball bearing 624-2RS 4mm x 13mm x 5mm |
-|   2 | ``` bearing_ball(3)``` |  Steel ball 3mm |
+|   4 | ``` bearing_ball(3)``` |  Steel ball 3mm |


 <a href="#top">Top</a>
@@ -196,7 +200,7 @@ Individual teeth are not drawn, instead they are represented by a lighter colour
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```belt(type, points, gap = 0, gap_pt = undef)``` | Draw a belt path given a set of points and pitch radii where the pulleys are. Closed loop unless a gap is specified |
+| ```belt(type, points, gap = 0, gap_pt = undef, belt_colour = grey20, tooth_colour = grey50)``` | Draw a belt path given a set of points and pitch radii where the pulleys are. Closed loop unless a gap is specified |

 ![belts](tests/png/belts.png)

@@ -213,7 +217,7 @@ Individual teeth are not drawn, instead they are represented by a lighter colour
 |   2 | ```pulley(GT2x16_plain_idler)``` |  Pulley GT2 idler smooth 9.63mm |
 |   2 | ```pulley(GT2x20ob_pulley)``` |  Pulley GT2OB 20 teeth |
 |   1 | ```screw(M3_cs_cap_screw, 20)``` |  Screw M3 cs cap x 20mm |
-|   4 | ```screw(M3_grub_screw, 6)``` |  Screw M3 grub x 6mm |
+|   4 | ```screw(M3_grub_screw, 6)``` |  Screw M3 grub x  6mm |


 <a href="#top">Top</a>
@@ -586,6 +590,54 @@ LCD dispays.
 |   1 | ```display(SSD1963_4p3)``` |  LCD display SSD1963 4.3" |


+<a href="#top">Top</a>
+
+---
+<a name="Extrusion_brackets"></a>
+## Extrusion_brackets
+Brackets for joining extrusions at a corner.
+
+
+[vitamins/extrusion_brackets.scad](vitamins/extrusion_brackets.scad) Object definitions.
+
+[vitamins/extrusion_bracket.scad](vitamins/extrusion_bracket.scad) Implementation.
+
+[tests/extrusion_brackets.scad](tests/extrusion_brackets.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```extrusion_corner_bracket_base_thickness(type)``` | Thickness of base of bracket |
+| ```extrusion_corner_bracket_hole_offset(type)``` | Hole offset from corner |
+| ```extrusion_corner_bracket_side_thickness(type)``` | Thickness of side of bracket |
+| ```extrusion_corner_bracket_size(type)``` | Size of bracket |
+| ```extrusion_inner_corner_bracket_size(type)``` | Size of inner bracket |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```extrusion_corner_bracket(type)``` | Corner bracket for extrusion |
+| ```extrusion_corner_bracket_assembly(type, part_thickness = 2, screw_type = M4_cap_screw, nut_type = M4_sliding_t_nut, max_screw_depth = 6)``` | Assembly with fasteners in place |
+| ```extrusion_corner_bracket_hole_positions(type)``` | Place children at hole positions |
+| ```extrusion_inner_corner_bracket(type, grub_screws = true)``` | Inner corner bracket for extrusion |
+
+![extrusion_brackets](tests/png/extrusion_brackets.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```extrusion(E2020, 20, false)``` |  Extrusion E2020 x 20mm |
+|   1 | ```extrusion(E2020, 30, false)``` |  Extrusion E2020 x 30mm |
+|   1 | ```extrusion(E2020, 40, false)``` |  Extrusion E2020 x 40mm |
+|   1 | ```extrusion(E2020, 50, false)``` |  Extrusion E2020 x 50mm |
+|   2 | ```extrusion_corner_bracket(E20_corner_bracket)``` |  Extrusion corner bracket 20 |
+|   2 | ```extrusion_inner_corner_bracket(E20_inner_corner_bracket, true)``` |  Extrusion inner corner bracket 4.5 |
+|   1 | ```extrusion_inner_corner_bracket(E20_inner_corner_bracket, false)``` |  Extrusion inner corner bracket 4.5 |
+|   4 | ```sliding_t_nut(M4_sliding_t_nut)``` |  Nut M4 sliding T |
+|   4 | ```screw(M4_cap_screw, 8)``` |  Screw M4 cap x  8mm |
+|   4 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+
+
 <a href="#top">Top</a>

 ---
@@ -617,21 +669,21 @@ Aluminium  extrusion.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```extrusion(type, length, cornerHole = false)``` | Draw the specified extrusion |
+| ```extrusion(type, length, center = false, cornerHole = false)``` | Draw the specified extrusion |

 ![extrusions](tests/png/extrusions.png)

 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```extrusion(E2020, 80)``` |  Extrusion E2020 x 80mm |
-|   1 | ```extrusion(E2040, 80)``` |  Extrusion E2040 x 80mm |
-|   1 | ```extrusion(E2060, 80)``` |  Extrusion E2060 x 80mm |
-|   1 | ```extrusion(E2080, 80)``` |  Extrusion E2080 x 80mm |
-|   1 | ```extrusion(E3030, 80)``` |  Extrusion E3030 x 80mm |
-|   1 | ```extrusion(E3060, 80)``` |  Extrusion E3060 x 80mm |
-|   1 | ```extrusion(E4040, 80)``` |  Extrusion E4040 x 80mm |
-|   1 | ```extrusion(E4080, 80)``` |  Extrusion E4080 x 80mm |
+|   1 | ```extrusion(E2020, 80, false)``` |  Extrusion E2020 x 80mm |
+|   1 | ```extrusion(E2040, 80, false)``` |  Extrusion E2040 x 80mm |
+|   1 | ```extrusion(E2060, 80, false)``` |  Extrusion E2060 x 80mm |
+|   1 | ```extrusion(E2080, 80, false)``` |  Extrusion E2080 x 80mm |
+|   1 | ```extrusion(E3030, 80, false)``` |  Extrusion E3030 x 80mm |
+|   1 | ```extrusion(E3060, 80, false)``` |  Extrusion E3060 x 80mm |
+|   1 | ```extrusion(E4040, 80, false)``` |  Extrusion E4040 x 80mm |
+|   1 | ```extrusion(E4080, 80, false)``` |  Extrusion E4080 x 80mm |


 <a href="#top">Top</a>
@@ -823,7 +875,7 @@ Parametric green terminal blocks
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```green_terminal(type, ways, skip = [])``` | Draw green terminal blocks, skip can be used to remove pins. |
+| ```green_terminal(type, ways, skip = [], colour = "lime")``` | Draw green terminal blocks, skip can be used to remove pins. |
 | ```terminal_254(ways, skip = [])``` | Draw 0.1" terminal block |

 ![green_terminals](tests/png/green_terminals.png)
@@ -992,10 +1044,11 @@ IEC mains inlets and outlet.
 |   1 | ```iec(IEC_inlet)``` |  IEC inlet |
 |   1 | ```iec(IEC_inlet_atx)``` |  IEC inlet for ATX |
 |   1 | ```iec(IEC_outlet)``` |  IEC outlet RS 811-7193 |
-|  10 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|   1 | ```iec(IEC_switched_fused_inlet)``` |  IEC320 C14 switched fused inlet module |
+|  12 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |   4 | ```screw(M3_cs_cap_screw, 10)``` |  Screw M3 cs cap x 10mm |
-|   6 | ```screw(M3_cs_cap_screw, 12)``` |  Screw M3 cs cap x 12mm |
-|  10 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|   8 | ```screw(M3_cs_cap_screw, 12)``` |  Screw M3 cs cap x 12mm |
+|  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |


 <a href="#top">Top</a>
@@ -1086,6 +1139,59 @@ E.g. a "brown" socket for mains live needs to be displayed as "sienna" to look r
 |   1 | ```jack_4mm_shielded("brown", 3, "sienna")``` |  4mm shielded jack socket brown |


+<a href="#top">Top</a>
+
+---
+<a name="Kp_pillow_blocks"></a>
+## Kp_pillow_blocks
+KP pillow block bearings
+
+
+[vitamins/kp_pillow_blocks.scad](vitamins/kp_pillow_blocks.scad) Object definitions.
+
+[vitamins/kp_pillow_block.scad](vitamins/kp_pillow_block.scad) Implementation.
+
+[tests/kp_pillow_blocks.scad](tests/kp_pillow_blocks.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```kp_base_height(type)``` | Height of base containing the bolts |
+| ```kp_diameter(type)``` | Rod hole diameter |
+| ```kp_hole_offset(type)``` | Rod hole offset |
+| ```kp_screw_separation(type)``` | Separation of bolts in the base |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```kp_size(type)``` | Size of bracket |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```kp_pillow_block(type)``` | Draw the KP pillow block |
+| ```kp_pillow_block_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef)``` | Assembly with fasteners in place |
+| ```kp_pillow_block_hole_positions(type)``` | Place children at hole positions |
+
+![kp_pillow_blocks](tests/png/kp_pillow_blocks.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```kp_pillow_block(KP000)``` |  KP000 pillow block |
+|   1 | ```kp_pillow_block(KP001)``` |  KP001 pillow block |
+|   1 | ```kp_pillow_block(KP08_15)``` |  KP08_15 pillow block |
+|   1 | ```kp_pillow_block(KP08_18)``` |  KP08_18 pillow block |
+|   2 | ```sliding_t_nut(M4_hammer_nut)``` |  Nut M4 hammer |
+|   2 | ```sliding_t_nut(M4_sliding_t_nut)``` |  Nut M4 sliding T |
+|   2 | ```sliding_t_nut(M5_sliding_t_nut)``` |  Nut M5 sliding T |
+|   2 | ```nut(M5_nut, nyloc = undef)``` |  Nut M5 x 4mm  |
+|   4 | ```screw(M4_cap_screw, 10)``` |  Screw M4 cap x 10mm |
+|   4 | ```screw(M5_cap_screw, 12)``` |  Screw M5 cap x 12mm |
+|   4 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+|   6 | ```washer(M5_washer)``` |  Washer  M5 x 10mm x 1mm |
+
+
 <a href="#top">Top</a>

 ---
@@ -1152,7 +1258,9 @@ Nuts for leadscrews.
 | ```leadnut_hole_dia(type)``` | The diameter of the screw holes |
 | ```leadnut_hole_pitch(type)``` | The radia pitch of the screw holes |
 | ```leadnut_holes(type)``` | The number of screw holes |
+| ```leadnut_lead(type)``` | Screw lead |
 | ```leadnut_od(type)``` | Outer diameter of the shank |
+| ```leadnut_pitch(type)``` | Screw pitch |
 | ```leadnut_screw(type)``` | The type of the fixing screws |

 ### Functions
@@ -1620,11 +1728,16 @@ If a nut is given a child then it gets placed on its top surface.
 |   1 | ```nut(M2p5_nut)``` |  Nut M2.5 x 2.2mm  |
 |   1 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
 |   1 | ```nut(M2p5_nut, nylon = true)``` |  Nut M2.5 x 2.2mm nylon |
+|   1 | ```sliding_t_nut(M3_hammer_nut)``` |  Nut M3 hammer |
+|   1 | ```sliding_t_nut(M3_sliding_t_nut)``` |  Nut M3 sliding T |
 |   1 | ```nut(M3_nut)``` |  Nut M3 x 2.4mm  |
 |   1 | ```nut(M3_nut, brass = true)``` |  Nut M3 x 2.4mm brass |
 |   1 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|   1 | ```sliding_t_nut(M4_hammer_nut)``` |  Nut M4 hammer |
+|   1 | ```sliding_t_nut(M4_sliding_t_nut)``` |  Nut M4 sliding T |
 |   1 | ```nut(M4_nut)``` |  Nut M4 x 3.2mm  |
 |   1 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
+|   1 | ```sliding_t_nut(M5_sliding_t_nut)``` |  Nut M5 sliding T |
 |   1 | ```nut(M5_nut)``` |  Nut M5 x 4mm  |
 |   1 | ```nut(M5_nut, nyloc = true)``` |  Nut M5 x 4mm nyloc |
 |   1 | ```nut(M6_half_nut)``` |  Nut M6 x 3mm  |
@@ -1701,6 +1814,88 @@ A permanent magnet that can be magnatized and de-magnatized electronically.
 |   1 | ```opengrab()``` |  OpenGrab V3 electro permanent magnet |


+<a href="#top">Top</a>
+
+---
+<a name="Pcb"></a>
+## Pcb
+PCBs and perfboard with optional components. The shape can be a rectangle with optionally rounded corners or a polygon for odd shapes like Arduino.
+
+
+[vitamins/pcb.scad](vitamins/pcb.scad) Implementation.
+
+[tests/pcb.scad](tests/pcb.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```hdmi_depth(type)``` | Front to back depth |
+| ```hdmi_height(type)``` | Outside height above the PCB |
+| ```hdmi_height1(type)``` | Inside height at the sides |
+| ```hdmi_height2(type)``` | Inside height in the middle |
+| ```hdmi_thickness(type)``` | Wall thickness of the metal |
+| ```hdmi_width1(type)``` | Inside width at the top |
+| ```hdmi_width2(type)``` | Inside width at the bottom |
+| ```pcb_accessories(type)``` | List of accessories to go on the BOM, SD cards, USB cables, etc. |
+| ```pcb_colour(type)``` | Colour of the subtrate |
+| ```pcb_components(type)``` | List of components |
+| ```pcb_grid(type)``` | Grid if a perfboard |
+| ```pcb_hole_d(type)``` | Mounting hole diameter |
+| ```pcb_holes(type)``` | List of hole positions |
+| ```pcb_land_d(type)``` | Pad around mounting hole |
+| ```pcb_length(type)``` | Length |
+| ```pcb_name(type)``` | Description |
+| ```pcb_parts_on_bom(type)``` | True if the parts should be separate BOM items |
+| ```pcb_polygon(type)``` | Optional outline polygon for odd shaped boards |
+| ```pcb_radius(type)``` | Corner radius |
+| ```pcb_thickness(type)``` | Thickness |
+| ```pcb_width(type)``` | Width |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```pcb_component_position(type, name, index = 0)``` | Return x y position of specified component |
+| ```pcb_coord(type, p)``` | Convert offsets from the edge to coordinates relative to the centre |
+| ```pcb_grid_pos(type, x, y, z = 0)``` | Returns a pcb grid position |
+| ```pcb_screw(type, cap = hs_cap)``` | Mounting screw type |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```barrel_jack(cutout = false)``` | Draw barrel power jack |
+| ```buzzer(height, diameter, colour)``` | Draw PCB buzzer with specified height, diameter and color |
+| ```chip(length, width, thickness, colour, cutout = false)``` | Draw a coloured cube to represent a chip, or other rectangular component |
+| ```flat_flex(cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
+| ```flex(cutout = false)``` | Draw flexistrip connector |
+| ```hdmi(type, cutout = false)``` | Draw HDMI socket |
+| ```jack(cutout = false)``` | Draw 3.5mm jack |
+| ```molex_254(ways)``` | Draw molex header |
+| ```pcb(type)``` | Draw specified PCB |
+| ```pcb_assembly(type, height, thickness)``` | Draw PCB assembly with spaces and fasteners in place |
+| ```pcb_base(type, height, thickness, wall = 2)``` | Generate STL for a base with PCB spacers |
+| ```pcb_component(comp, cutouts = false, angle = undef)``` | Draw pcb component from description |
+| ```pcb_component_position(type, name)``` | Position child at the specified component position |
+| ```pcb_components(type, cutouts = false, angle = undef)``` | Draw list of PCB components on the PCB |
+| ```pcb_cutouts(type, angle = undef)``` | Make cut outs to clear components on a PCB |
+| ```pcb_grid(type, x, y, z = 0)``` | Positions children at specified grid position |
+| ```pcb_screw_positions(type)``` | Positions children at the mounting hole positions |
+| ```pcb_spacer(screw, height, wall = 1.8, taper = 0)``` | Generate STL for PCB spacer |
+| ```rj45(cutout = false)``` | Draw RJ45 Ethernet connector |
+| ```terminal_35(ways, colour = "blue")``` | Draw 3.5mm terminal block |
+| ```uSD(size, cutout = false)``` | Draw uSD socket |
+| ```usb_Ax1(cutout = false)``` | Draw USB type A single socket |
+| ```usb_Ax2(cutout = false)``` | Draw USB type A dual socket |
+| ```usb_B(cutout = false)``` | Draw USB B connector |
+| ```usb_uA(cutout = false)``` | Draw USB micro A connector |
+
+![pcb](tests/png/pcb.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```pcb(TestPCB)``` |  Test PCB |
+
+
 <a href="#top">Top</a>

 ---
@@ -1752,6 +1947,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | Module | Description |
 |:--- |:--- |
 | ```barrel_jack(cutout = false)``` | Draw barrel power jack |
+| ```buzzer(height, diameter, colour)``` | Draw PCB buzzer with specified height, diameter and color |
 | ```chip(length, width, thickness, colour, cutout = false)``` | Draw a coloured cube to represent a chip, or other rectangular component |
 | ```flat_flex(cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
 | ```flex(cutout = false)``` | Draw flexistrip connector |
@@ -1769,8 +1965,9 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | ```pcb_screw_positions(type)``` | Positions children at the mounting hole positions |
 | ```pcb_spacer(screw, height, wall = 1.8, taper = 0)``` | Generate STL for PCB spacer |
 | ```rj45(cutout = false)``` | Draw RJ45 Ethernet connector |
-| ```terminal_35(ways)``` | Draw 3.5mm terminal block |
+| ```terminal_35(ways, colour = "blue")``` | Draw 3.5mm terminal block |
 | ```uSD(size, cutout = false)``` | Draw uSD socket |
+| ```usb_Ax1(cutout = false)``` | Draw USB type A single socket |
 | ```usb_Ax2(cutout = false)``` | Draw USB type A dual socket |
 | ```usb_B(cutout = false)``` | Draw USB B connector |
 | ```usb_uA(cutout = false)``` | Draw USB micro A connector |
@@ -1795,7 +1992,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```molex_254(2)``` |  Molex KK header 2 way |
 |   1 | ```molex_254(3)``` |  Molex KK header 3 way |
 |  16 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
-|  28 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
+|  32 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
 |  12 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |  12 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
 |   1 | ```pcb(PI_IO)``` |  PI_IO V2 |
@@ -1806,11 +2003,13 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```pcb(PERF74x51)``` |  Perfboard 74 x 51mm |
 |   1 | ```pcb(PERF80x20)``` |  Perfboard 80 x 20mm |
 |   1 | ```pin_socket(2p54header, 13, 2, right_angle = true)``` |  Pin socket 13 x 2 right_angle |
+|   1 | ```pcb(RAMPSEndstop)``` |  RAMPS Endstop Switch |
 |   1 | ```pcb(RPI3)``` |  Raspberry Pi 3 |
 |   1 | ```pcb(RPI0)``` |  Raspberry Pi Zero |
 |  16 | ```screw(M2_cap_screw, 25)``` |  Screw M2 cap x 25mm |
 |   4 | ```screw(M2p5_cap_screw, 16)``` |  Screw M2.5 cap x 16mm |
 |   8 | ```screw(M2p5_cap_screw, 20)``` |  Screw M2.5 cap x 20mm |
+|   4 | ```screw(M2p5_cap_screw, 35)``` |  Screw M2.5 cap x 35mm |
 |   8 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
 |   4 | ```screw(M2p5_pan_screw, 25)``` |  Screw M2.5 pan x 25mm |
 |   4 | ```screw(M2p5_pan_screw, 35)``` |  Screw M2.5 pan x 35mm |
@@ -1822,7 +2021,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   2 | ```green_terminal(gt_2p54, 4)``` |  Terminal block 4 way 0.1" |
 |   1 |  |  USB A to Mini B lead |
 |  16 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
-|  28 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
+|  32 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
 |  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |  12 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | ```pcb(ZC_A0591)``` |  ZC-A0591 ULN2003 driver PCB |
@@ -1838,6 +2037,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer25110_2.stl |
 |   4 | pcb_spacer25120_2.stl |
 |   4 | pcb_spacer25230.stl |
+|   4 | pcb_spacer25240.stl |
 |   4 | pcb_spacer2570.stl |
 |   4 | pcb_spacer2580.stl |
 |   4 | pcb_spacer2590.stl |
@@ -1927,9 +2127,10 @@ Pin headers and sockets, etc.
 |:--- |:--- |
 | ```box_header(type, cols = 1, rows = 1, smt = false, cutout = false)``` | Draw box header |
 | ```idc_transition(type, cols = 5, skip = [], cutout = false)``` | Draw IDC transition header |
+| ```jst_xh_header(type, pin_count, right_angle=false, colour, pin_colour)``` | Draw JST XH connector |
 | ```pin(type, length = undef)``` | Draw a header pin |
-| ```pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cutout = false)``` | Draw pin header |
-| ```pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt = false, cutout = false)``` | Draw pin socket |
+| ```pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cutout = false, colour)``` | Draw pin header |
+| ```pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt = false, cutout = false, colour)``` | Draw pin socket |

 ![pin_headers](tests/png/pin_headers.png)

@@ -2014,10 +2215,10 @@ Face order is bottom, top, left, right, front, back.
 |   1 | ```psu(PD_150_12)``` |  PSU PD-150-12 |
 |   1 | ```psu(S_250_48)``` |  PSU S-250-48 |
 |   1 | ```psu(S_300_12)``` |  PSU S-300-12 |
-|   4 | ```screw(No632_pan_screw, 8)``` |  Screw 6-32 pan x 8mm |
-|   4 | ```screw(M3_cap_screw, 8)``` |  Screw M3 cap x 8mm |
-|   8 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x 8mm |
-|   4 | ```screw(M4_cap_screw, 8)``` |  Screw M4 cap x 8mm |
+|   4 | ```screw(No632_pan_screw, 8)``` |  Screw 6-32 pan x  8mm |
+|   4 | ```screw(M3_cap_screw, 8)``` |  Screw M3 cap x  8mm |
+|   8 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x  8mm |
+|   4 | ```screw(M4_cap_screw, 8)``` |  Screw M4 cap x  8mm |
 |  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |

@@ -2083,10 +2284,10 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
 |   1 | ```pulley(GT2x20um_pulley)``` |  Pulley GT2UM 20 teeth |
 |   1 | ```pulley(T2p5x16_pulley)``` |  Pulley T2.5 16 teeth |
 |   1 | ```pulley(T5x10_pulley)``` |  Pulley T5 10 teeth |
-|   1 | ```screw(M3_grub_screw, 3)``` |  Screw M3 grub x 3mm |
-|   2 | ```screw(M3_grub_screw, 4)``` |  Screw M3 grub x 4mm |
-|   4 | ```screw(M3_grub_screw, 6)``` |  Screw M3 grub x 6mm |
-|   1 | ```screw(M4_grub_screw, 6)``` |  Screw M4 grub x 6mm |
+|   1 | ```screw(M3_grub_screw, 3)``` |  Screw M3 grub x  3mm |
+|   2 | ```screw(M3_grub_screw, 4)``` |  Screw M3 grub x  4mm |
+|   4 | ```screw(M3_grub_screw, 6)``` |  Screw M3 grub x  6mm |
+|   1 | ```screw(M4_grub_screw, 6)``` |  Screw M4 grub x  6mm |


 <a href="#top">Top</a>
@@ -2135,10 +2336,10 @@ Linear rails with carriages.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```carriage(type, rail)``` | Draw the specified carriage |
+| ```carriage(type, rail, end_color = grey20, wiper_color = grey20)``` | Draw the specified carriage |
 | ```carriage_hole_positions(type)``` | Position children over screw holes |
 | ```rail(type, length)``` | Draw the specified rail |
-| ```rail_assembly(type, length, pos)``` | Rail and carriage assembly |
+| ```rail_assembly(type, length, pos, carriage_end_color = grey20, carriage_wiper_color = grey20)``` | Rail and carriage assembly |
 | ```rail_hole_positions(type, length, first = 0, screws = 100, both_ends = true)``` | Position children over screw holes |
 | ```rail_screws(type, length, thickness, screws = 100)``` | Place screws in the rail |

@@ -2246,7 +2447,7 @@ Rocker switch. Also used for neon indicator in the same form factor.
 | ```rocker_height(type)``` | Body height |
 | ```rocker_part(type)``` | Part description |
 | ```rocker_pivot(type)``` | Pivot distance from the back of the flange |
-| ```rocker_slot_h(type)``` | Panel slow height |
+| ```rocker_slot_h(type)``` | Panel slot height |
 | ```rocker_slot_w(type)``` | Panel slot width |
 | ```rocker_spades(type)``` | Spade types and positions |
 | ```rocker_width(type)``` | Body width |
@@ -2254,7 +2455,7 @@ Rocker switch. Also used for neon indicator in the same form factor.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```rocker(type)``` | Draw the specified rocker switch |
+| ```rocker(type, colour)``` | Draw the specified rocker switch |
 | ```rocker_hole(type, h = 0)``` | Make a hole to accept a rocker switch, by default 2D, set h for 3D |

 ![rockers](tests/png/rockers.png)
@@ -2262,8 +2463,8 @@ Rocker switch. Also used for neon indicator in the same form factor.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```rocker(neon_indicator)``` |  Neon Indicator H8630FBNAL |
-|   1 | ```rocker(small_rocker)``` |  Rocker Switch PRASA1-16F-BB0BW |
+|   2 | ```rocker(neon_indicator)``` |  Neon Indicator H8630FBNAL |
+|   2 | ```rocker(small_rocker)``` |  Rocker Switch PRASA1-16F-BB0BW |


 <a href="#top">Top</a>
@@ -2273,6 +2474,8 @@ Rocker switch. Also used for neon indicator in the same form factor.
 ## Rod
 Steel rods and studding with chamfered ends.

+These items are sysmtrical, so by default the origin is in the centre but it can be changed to the bottom.
+

 [vitamins/rod.scad](vitamins/rod.scad) Implementation.

@@ -2281,14 +2484,20 @@ Steel rods and studding with chamfered ends.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```rod(d , l)``` | Draw a smooth rod with specified length and diameter |
-| ```studding(d , l)``` | Draw a threaded rod with specified length and diameter |
+| ```leadscrew(d , l, lead, starts, center = true)``` | Draw a leadscrew with specified diameter, length, lead and number of starts |
+| ```rod(d , l, center = true)``` | Draw a smooth rod with specified diameter and length |
+| ```studding(d , l, center = true)``` | Draw a threaded rod with specified diameter and length |

 ![rod](tests/png/rod.png)

 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```leadscrew(10, 80, 8, 4)``` |  Leadscrew 10 x 80mm, 8mm lead, 4 starts |
+|   1 | ```leadscrew(12, 80, 12, 4)``` |  Leadscrew 12 x 80mm, 12mm lead, 4 starts |
+|   1 | ```leadscrew(16, 80, 16, 4)``` |  Leadscrew 16 x 80mm, 16mm lead, 4 starts |
+|   1 | ```leadscrew(6, 80, 2, 1)``` |  Leadscrew 6 x 80mm, 2mm lead, 1 starts |
+|   1 | ```leadscrew(8, 80, 8, 4)``` |  Leadscrew 8 x 80mm, 8mm lead, 4 starts |
 |   1 | ```rod(10, 80)``` |  Smooth rod 10mm x 80mm |
 |   1 | ```rod(12, 80)``` |  Smooth rod 12mm x 80mm |
 |   1 | ```rod(16, 80)``` |  Smooth rod 16mm x 80mm |
@@ -2358,21 +2567,21 @@ Machine screws and wood screws with various head styles.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```screw(No632_pan_screw, 30)``` |  Screw 6-32 pan x 30mm |
-|   1 | ```screw(M2_cap_screw, 25)``` |  Screw M2 cap x 25mm |
-|   1 | ```screw(M2_cs_cap_screw, 25)``` |  Screw M2 cs cap x 25mm |
-|   1 | ```screw(M2p5_cap_screw, 25)``` |  Screw M2.5 cap x 25mm |
-|   1 | ```screw(M2p5_pan_screw, 30)``` |  Screw M2.5 pan x 30mm |
-|   1 | ```screw(M3_cap_screw, 25)``` |  Screw M3 cap x 25mm |
-|   1 | ```screw(M3_cs_cap_screw, 25)``` |  Screw M3 cs cap x 25mm |
-|   1 | ```screw(M3_dome_screw, 25)``` |  Screw M3 dome x 25mm |
-|   1 | ```screw(M3_grub_screw, 6)``` |  Screw M3 grub x 6mm |
-|   1 | ```screw(M3_hex_screw, 30)``` |  Screw M3 hex x 30mm |
-|   1 | ```screw(M3_low_cap_screw, 25)``` |  Screw M3 low cap x 25mm |
-|   1 | ```screw(M3_pan_screw, 30)``` |  Screw M3 pan x 30mm |
+|   1 | ```screw(M2_cap_screw, 10)``` |  Screw M2 cap x 10mm |
+|   1 | ```screw(M2_cs_cap_screw, 10)``` |  Screw M2 cs cap x 10mm |
+|   1 | ```screw(M2p5_cap_screw, 10)``` |  Screw M2.5 cap x 10mm |
+|   1 | ```screw(M2p5_pan_screw, 10)``` |  Screw M2.5 pan x 10mm |
+|   1 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
+|   1 | ```screw(M3_cs_cap_screw, 10)``` |  Screw M3 cs cap x 10mm |
+|   1 | ```screw(M3_dome_screw, 10)``` |  Screw M3 dome x 10mm |
+|   1 | ```screw(M3_grub_screw, 6)``` |  Screw M3 grub x  6mm |
+|   1 | ```screw(M3_hex_screw, 10)``` |  Screw M3 hex x 10mm |
+|   1 | ```screw(M3_low_cap_screw, 10)``` |  Screw M3 low cap x 10mm |
+|   1 | ```screw(M3_pan_screw, 10)``` |  Screw M3 pan x 10mm |
 |   1 | ```screw(M4_cap_screw, 25)``` |  Screw M4 cap x 25mm |
 |   1 | ```screw(M4_cs_cap_screw, 25)``` |  Screw M4 cs cap x 25mm |
 |   1 | ```screw(M4_dome_screw, 25)``` |  Screw M4 dome x 25mm |
-|   1 | ```screw(M4_grub_screw, 6)``` |  Screw M4 grub x 6mm |
+|   1 | ```screw(M4_grub_screw, 6)``` |  Screw M4 grub x  6mm |
 |   1 | ```screw(M4_hex_screw, 30)``` |  Screw M4 hex x 30mm |
 |   1 | ```screw(M4_pan_screw, 30)``` |  Screw M4 pan x 30mm |
 |   1 | ```screw(M5_cap_screw, 30)``` |  Screw M5 cap x 30mm |
@@ -2383,12 +2592,70 @@ Machine screws and wood screws with various head styles.
 |   1 | ```screw(M6_pan_screw, 30)``` |  Screw M6 pan x 30mm |
 |   1 | ```screw(M8_cap_screw, 35)``` |  Screw M8 cap x 35mm |
 |   1 | ```screw(M8_hex_screw, 30)``` |  Screw M8 hex x 30mm |
-|   1 | ```screw(No2_screw, 30)``` |  Screw No2 pan wood x 30mm |
-|   1 | ```screw(No4_screw, 30)``` |  Screw No4 pan wood x 30mm |
+|   1 | ```screw(No2_screw, 10)``` |  Screw No2 pan wood x 10mm |
+|   1 | ```screw(No4_screw, 10)``` |  Screw No4 pan wood x 10mm |
 |   1 | ```screw(No6_cs_screw, 30)``` |  Screw No6 cs wood x 30mm |
 |   1 | ```screw(No6_screw, 30)``` |  Screw No6 pan wood x 30mm |


+<a href="#top">Top</a>
+
+---
+<a name="Scs_bearing_blocks"></a>
+## Scs_bearing_blocks
+[vitamins/scs_bearing_blocks.scad](vitamins/scs_bearing_blocks.scad) Object definitions.
+
+[vitamins/scs_bearing_block.scad](vitamins/scs_bearing_block.scad) Implementation.
+
+[tests/scs_bearing_blocks.scad](tests/scs_bearing_blocks.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```scs_bearing(type)``` | Linear bearing used |
+| ```scs_block_center_height(type)``` | Height of the center of the block |
+| ```scs_block_side_height(type)``` | Height of the side of the block, this determines the minimum screw length |
+| ```scs_hole_offset(type)``` | Offset of bearing hole from base of block |
+| ```scs_screw(type)``` | Screw type |
+| ```scs_screw_separation_x(type)``` | Screw separation in X direction |
+| ```scs_screw_separation_z(type)``` | Screw separation in Z direction |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```scs_size(type)``` | Size of scs bracket bounding block |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```scs_bearing_block(type)``` | Draw the specified SCS bearing block |
+| ```scs_bearing_block_assembly(type, part_thickness, screw_type, nut_type)``` | Assembly with screws and nuts in place |
+| ```scs_bearing_block_hole_positions(type)``` | Place children at hole positions |
+
+![scs_bearing_blocks](tests/png/scs_bearing_blocks.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|  12 | ```nut(M4_nut)``` |  Nut M4 x 3.2mm  |
+|  24 | ```nut(M5_nut)``` |  Nut M5 x 4mm  |
+|   1 | ```scs_bearing_block(SCS10LUU)``` |  SCS10LUU bearing block |
+|   1 | ```scs_bearing_block(SCS10UU)``` |  SCS10UU bearing block |
+|   1 | ```scs_bearing_block(SCS12LUU)``` |  SCS12LUU bearing block |
+|   1 | ```scs_bearing_block(SCS12UU)``` |  SCS12UU bearing block |
+|   1 | ```scs_bearing_block(SCS16LUU)``` |  SCS16LUU bearing block |
+|   1 | ```scs_bearing_block(SCS16UU)``` |  SCS16UU bearing block |
+|   1 | ```scs_bearing_block(SCS6UU)``` |  SCS6UU bearing block |
+|   1 | ```scs_bearing_block(SCS8LUU)``` |  SCS8LUU bearing block |
+|   1 | ```scs_bearing_block(SCS8UU)``` |  SCS8UU bearing block |
+|   4 | ```screw(M4_cap_screw, 25)``` |  Screw M4 cap x 25mm |
+|   8 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
+|  16 | ```screw(M5_cap_screw, 35)``` |  Screw M5 cap x 35mm |
+|   8 | ```screw(M5_cap_screw, 45)``` |  Screw M5 cap x 45mm |
+|  12 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+|  24 | ```washer(M5_washer)``` |  Washer  M5 x 10mm x 1mm |
+
+
 <a href="#top">Top</a>

 ---
@@ -2478,6 +2745,62 @@ Note that modules that drill holes will return a 2D object if ```h``` is set to
 |   1 | ```sheet(Steel06, 30, 30, 2)``` |  Sheet mild steel 30mm x 30mm x 0.6mm |


+<a href="#top">Top</a>
+
+---
+<a name="Sk_brackets"></a>
+## Sk_brackets
+SK shaft support brackets
+
+
+[vitamins/sk_brackets.scad](vitamins/sk_brackets.scad) Object definitions.
+
+[vitamins/sk_bracket.scad](vitamins/sk_bracket.scad) Implementation.
+
+[tests/sk_brackets.scad](tests/sk_brackets.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```sk_base_height(type)``` | Height of base containing the screws |
+| ```sk_diameter(type)``` | Rod hole diameter |
+| ```sk_hole_offset(type)``` | Rod hole offset |
+| ```sk_screw_separation(type)``` | Separation of screws in the base |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```sk_size(type)``` | Size of bracket |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```sk_bracket(type)``` | SK shaft support bracket |
+| ```sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef, max_screw_depth = 6)``` | Assembly with fasteners in place |
+| ```sk_bracket_hole_positions(type)``` | Place children at hole positions |
+
+![sk_brackets](tests/png/sk_brackets.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   2 | ```extrusion(E2020, 20, false)``` |  Extrusion E2020 x 20mm |
+|   2 | ```extrusion(E3030, 20, false)``` |  Extrusion E3030 x 20mm |
+|   2 | ```sliding_t_nut(M4_hammer_nut)``` |  Nut M4 hammer |
+|   2 | ```sliding_t_nut(M4_sliding_t_nut)``` |  Nut M4 sliding T |
+|   2 | ```sliding_t_nut(M5_sliding_t_nut)``` |  Nut M5 sliding T |
+|   2 | ```nut(M5_nut, nyloc = undef)``` |  Nut M5 x 4mm  |
+|   1 | ```sk_bracket(SK10)``` |  SK10 shaft support bracket |
+|   1 | ```sk_bracket(SK12)``` |  SK12 shaft support bracket |
+|   1 | ```sk_bracket(SK16)``` |  SK16 shaft support bracket |
+|   1 | ```sk_bracket(SK8)``` |  SK8 shaft support bracket |
+|   2 | ```screw(M4_cap_screw, 12)``` |  Screw M4 cap x 12mm |
+|   2 | ```screw(M4_dome_screw, 12)``` |  Screw M4 dome x 12mm |
+|   4 | ```screw(M5_cap_screw, 16)``` |  Screw M5 cap x 16mm |
+|   4 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+|   6 | ```washer(M5_washer)``` |  Washer  M5 x 10mm x 1mm |
+
+
 <a href="#top">Top</a>

 ---
@@ -2544,7 +2867,7 @@ Filament spool models
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```spool(type)``` | Draw specified spool |
+| ```spool(type, filament_depth = 0, filament_colour = "white", filament_d = 3)``` | Draw specified spool with optional filament |

 ![spools](tests/png/spools.png)

@@ -2564,6 +2887,8 @@ Filament spool models
 ## Springs
 Compression springs. Can be tapered, have open, closed or ground ends. Ground ends will render a lot slower.

+By default springs have their origin at the bottom but can be centered.
+

 [vitamins/springs.scad](vitamins/springs.scad) Object definitions.

@@ -2592,7 +2917,7 @@ Compression springs. Can be tapered, have open, closed or ground ends. Ground en
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```comp_spring(type, l = 0)``` | Draw specified spring, l can be set to specify the compressed length. |
+| ```comp_spring(type, l = 0, center = false)``` | Draw specified spring, l can be set to specify the compressed length. |

 ![springs](tests/png/springs.png)

@@ -2672,7 +2997,7 @@ NEMA stepper motor model.
 | ```NEMA_length(type)``` | Body length |
 | ```NEMA_radius(type)``` | End cap radius |
 | ```NEMA_shaft_dia(type)``` | Shaft diameter |
-| ```NEMA_shaft_length(type)``` | Shaft length above the face |
+| ```NEMA_shaft_length(type)``` | Shaft length above the face, if a list then a leadscrew: length, lead, starts |
 | ```NEMA_width(type)``` | Width of the square face |

 ### Functions
@@ -2684,7 +3009,7 @@ NEMA stepper motor model.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```NEMA(type)``` | Draw specified NEMA stepper motor |
+| ```NEMA(type, shaft_angle = 0)``` | Draw specified NEMA stepper motor |
 | ```NEMA_outline(type)``` | 2D outline |
 | ```NEMA_screw_positions(type, n = 4)``` | Positions children at the screw holes |
 | ```NEMA_screws(type, screw, n = 4, screw_length = 8, earth = undef)``` | Place screws and optional earth tag |
@@ -2694,7 +3019,7 @@ NEMA stepper motor model.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|  24 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x 8mm |
+|  24 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x  8mm |
 |   1 | ```NEMA(NEMA14)``` |  Stepper motor NEMA14 x 36mm |
 |   1 | ```NEMA(NEMA16)``` |  Stepper motor NEMA16 x 19.2mm |
 |   1 | ```NEMA(NEMA17S)``` |  Stepper motor NEMA17 x 34mm |
@@ -3488,7 +3813,7 @@ Star washers can be omitted by setting ```star_washers``` to false.
 |   3 | ```insert(F1BM2p5)``` |  Heatfit insert M2.5 |
 |   3 | ```insert(F1BM3)``` |  Heatfit insert M3 |
 |   3 | ```insert(F1BM4)``` |  Heatfit insert M4 |
-|   3 | ```screw(M2_cap_screw, 8)``` |  Screw M2 cap x 8mm |
+|   3 | ```screw(M2_cap_screw, 8)``` |  Screw M2 cap x  8mm |
 |   3 | ```screw(M2p5_pan_screw, 10)``` |  Screw M2.5 pan x 10mm |
 |   3 | ```screw(M3_dome_screw, 10)``` |  Screw M3 dome x 10mm |
 |   3 | ```screw(M4_dome_screw, 12)``` |  Screw M4 dome x 12mm |
@@ -3708,7 +4033,7 @@ Star washers can be omitted by setting ```star_washers``` to false.
 |   3 | ```insert(F1BM2p5)``` |  Heatfit insert M2.5 |
 |   3 | ```insert(F1BM3)``` |  Heatfit insert M3 |
 |   3 | ```insert(F1BM4)``` |  Heatfit insert M4 |
-|   3 | ```screw(M2_cap_screw, 8)``` |  Screw M2 cap x 8mm |
+|   3 | ```screw(M2_cap_screw, 8)``` |  Screw M2 cap x  8mm |
 |   3 | ```screw(M2p5_pan_screw, 10)``` |  Screw M2.5 pan x 10mm |
 |   3 | ```screw(M3_dome_screw, 10)``` |  Screw M3 dome x 10mm |
 |   3 | ```screw(M4_dome_screw, 16)``` |  Screw M4 dome x 16mm |
@@ -3852,7 +4177,7 @@ inserts don't grip well in rubber.
 | ---:|:--- |:---|
 |   1 | ```insert(F1BM3)``` |  Heatfit insert M3 |
 |   1 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
-|   1 | ```screw(M3_cap_screw, 8)``` |  Screw M3 cap x 8mm |
+|   1 | ```screw(M3_cap_screw, 8)``` |  Screw M3 cap x  8mm |
 |   1 | ```screw(M4_cap_screw, 16)``` |  Screw M4 cap x 16mm |
 |   1 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |   2 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
@@ -4093,7 +4418,7 @@ Knob with embedded hex head screw.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```screw_knob(screw)``` | Generate the STL foe a knob to fit the specified hex screw |
+| ```screw_knob(screw)``` | Generate the STL for a knob to fit the specified hex screw |
 | ```screw_knob_assembly(screw, length)``` | Assembly with the screw in place |

 ![screw_knob](tests/png/screw_knob.png)
@@ -4267,7 +4592,7 @@ be fully customised by passing a list of properties.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   2 | ```insert(F1BM3)``` |  Heatfit insert M3 |
-|   2 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x 8mm |
+|   2 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x  8mm |
 |   2 | ```washer(M3_penny_washer)``` |  Washer penny  M3 x 12mm x 0.8mm |
 |   2 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |

@@ -4431,6 +4756,8 @@ Maths utilities for manipulating vectors and matrices.
 ### Functions
 | Function | Description |
 |:--- |:--- |
+| ```angle_between(v1, v2)``` | Return the angle between two vectors |
+| ```euler(R)``` | Convert a rotation matrix to a Euler rotation vector. |
 | ```identity(n, x = 1)``` | Construct an arbitrary size identity matrix |
 | ```reverse(v)``` | Reverse a vector |
 | ```rotate(a, v)``` | Generate a 4x4 rotation matrix, ```a``` can be a vector of three angles or a single angle around ```z```, or around axis ```v``` |
@@ -4441,6 +4768,7 @@ Maths utilities for manipulating vectors and matrices.
 | ```transpose(m)``` | Transpose an arbitrary size matrix |
 | ```unit(v)``` | Convert ```v``` to a unit vector |
 | ```vec3(v)``` | Return a 3 vector with the first three elements of ```v``` |
+| ```vec4(v)``` | Return a 4 vector with the first three elements of ```v``` |

 ![maths](tests/png/maths.png)

@@ -4607,9 +4935,12 @@ An additional twist around the path can be specified. If the path is closed this
 | ```after(path1, path2)``` | Translate ```path2``` so its start meets the end of ```path1``` and then concatenate |
 | ```arc_points(r, a = [90, 0, 180], al = 90)``` | Generate the points of a circular arc |
 | ```before(path1, path2)``` | Translate ```path1``` so its end meets the start of ```path2``` and then concatenate |
-| ```circle_points(r = 1, z = 0)``` | Generate the points of a circle, setting z makes a single turn spiral |
+| ```cap(facets, segment = 0, end)``` | Create the mesh for an end cap |
+| ```circle_points(r = 1, z = 0, dir = -1)``` | Generate the points of a circle, setting z makes a single turn spiral |
+| ```helical_twist_per_segment(r, pitch, sides)``` | Calculate the twist around Z that rotate_from_to() introduces |
 | ```path_length(path, i = 0, length = 0)``` | Calculated the length along a path |
 | ```rectangle_points(w, h)``` | Generate the points of a rectangle |
+| ```skin_faces(points, npoints, facets, loop, offset = 0)``` | Create the mesh for the swept volume without end caps |
 | ```sweep(path, profile, loop = false, twist = 0)``` | Generate the point list and face list of the swept volume |

 ### Modules
@@ -4620,6 +4951,50 @@ An additional twist around the path can be specified. If the path is closed this
 ![sweep](tests/png/sweep.png)


+<a href="#top">Top</a>
+
+---
+<a name="Thread"></a>
+## Thread
+Utilities for making threads with sweep. They can be used to model screws, nuts, studding, leadscrews, etc, and also to make printed threads.
+
+The ends can be tapered, flat or chamfered by setting the ```top``` and ```bot``` parameters to -1 for tapered, 0 for a flat cut and positive to
+specify a chamfer angle.
+
+Threads are by default solid, so the male version is wrapped around a cylinder and the female inside a tube. This can be suppressed to just get the helix, for
+example to make a printed pot with a screw top lid.
+
+Threads with a typical 60 degree angle appear too bright with OpenSCAD's primitive lighting model as they face towards the lights more than the top and sides of
+a cylinder. To get around this a colour can be passed to thread that is used to colour the cylinder and then toned down to colour the helix.
+
+Making the ends requires a CGAL intersection, which make threads relatively slow. For this reason they are generally disabled when using the GUI but can
+be enabled by setting ```$show_threads``` to ```true```. When the tests are run, by default, threads are enabled only for things that feature them like screws.
+This behaviour can be changed by setting a ```SHOW_THREADS``` environment variable to ```false``` to disable all threads and ```true``` to enable all threads.
+The same variable also affects the generation of assembly diagrams.
+
+Threads obey the $fn, $fa, $fs variables.
+
+
+[utils/thread.scad](utils/thread.scad) Implementation.
+
+[tests/thread.scad](tests/thread.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```metric_coarse_pitch(d)``` | Convert metric diameter to pitch |
+| ```thread_profile(h, crest, angle, overlap = 0.1)``` | Create thread profile path |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```female_metric_thread(d, pitch, length, center = true, top = -1, bot = -1, colour = undef)``` | Create female thread with metric profile |
+| ```male_metric_thread(d, pitch, length, center = true, top = -1, bot = -1, solid = true, colour = undef)``` | Create male thread with metric profile |
+| ```thread(dia, pitch, length, profile, center = true, top = -1, bot = -1, starts = 1, solid = true, female = false, colour = undef)``` | Create male or femail thread, ends can be tapered, chamfered or square |
+
+![thread](tests/png/thread.png)
+
+
 <a href="#top">Top</a>

 ---
@@ -4689,7 +5064,7 @@ heirachical BOMs are also generated for real projects.
 | ---:|:--- |:---|
 |   1 | ```insert(F1BM3)``` |  Heatfit insert M3 |
 |   1 | ```widget(3)``` |  Rivit like thing for 3mm sheets |
-|   1 | ```screw(M3_cap_screw, 8)``` |  Screw M3 cap x 8mm |
+|   1 | ```screw(M3_cap_screw, 8)``` |  Screw M3 cap x  8mm |
 |   1 | ```sheet(PMMA3, 20, 20, 1)``` |  Sheet acrylic 20mm x 20mm x 3mm |
 |   1 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |   1 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
@@ -4897,11 +5272,12 @@ Small holes can get away without it, but they print better with truncated teardr
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```semi_teardrop(h, r, d = undef, center = true)``` | A semi teardrop in the positive Y domain |
-| ```teardrop(h, r, center = true, truncate = true)``` | For making horizontal holes that don't need support material, set ```truncate = false``` to make traditional RepRap teardrops that don't even need bridging |
-| ```teardrop_plus(h, r, center = true, truncate = true)``` | Slightly bigger teardrop to allow for the 3D printing staircase effect |
-| ```tearslot(h, r, w, center = true)``` | A horizontal slot that doesn't need support material |
-| ```vertical_tearslot(h, r, l, center = true)``` | A vertical slot that doesn't need support material |
+| ```semi_teardrop(h, r, d = undef, center = true, chamfer = 0)``` | A semi teardrop in the positive Y domain |
+| ```teardrop(h, r, center = true, truncate = true, chamfer = 0)``` | For making horizontal holes that don't need support material, set ```truncate = false``` to make traditional RepRap teardrops that don't even need bridging |
+| ```teardrop_chamfer(h, center, chamfer)``` | Helper module for adding chamfer to a teardrop |
+| ```teardrop_plus(h, r, center = true, truncate = true, chamfer = 0)``` | Slightly bigger teardrop to allow for the 3D printing staircase effect |
+| ```tearslot(h, r, w, center = true, chamfer = 0)``` | A horizontal slot that doesn't need support material |
+| ```vertical_tearslot(h, r, l, center = true, chamfer = 0)``` | A vertical slot that doesn't need support material |

 ![teardrops](tests/png/teardrops.png)

--- a/scripts/exports.py
+++ b/scripts/exports.py
@@ -85,48 +85,49 @@ def make_parts(target, part_type, parts = None):
    #
    lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
    module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename[-5:] == ".scad":
-                #
-                # find any modules ending in _<part_type>
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    for line in f.readlines():
-                        words = line.split()
-                        if(len(words) and words[0] == "module"):
-                            module = words[1].split('(')[0]
-                            if module.endswith(module_suffix):
-                                base_name = module[:-4]
-                                part = base_name + '.' + part_type
-                                if part in targets:
-                                    #
-                                    # make a file to use the module
-                                    #
-                                    part_maker_name = part_type + ".scad"
-                                    with open(part_maker_name, "w") as f:
-                                        f.write("use <%s/%s>\n" % (dir, filename))
-                                        f.write("%s();\n" % module);
-                                    #
-                                    # Run openscad on the created file
-                                    #
-                                    part_file = target_dir + "/" + part
-                                    dname = deps_name(deps_dir, filename)
-                                    changed = check_deps(part_file, dname)
-                                    changed = times.check_have_time(changed, part)
-                                    if part_type == 'stl' and not changed and not part in bounds_map:
-                                        changed = "No bounds"
-                                    if changed:
-                                        print(changed)
-                                        t = time.time()
-                                        openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
-                                        times.add_time(part, t)
-                                        if part_type == 'stl':
-                                            bounds = c14n_stl.canonicalise(part_file)
-                                            bounds_map[part] = bounds
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename[-5:] == ".scad":
+                    #
+                    # find any modules ending in _<part_type>
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        for line in f.readlines():
+                            words = line.split()
+                            if(len(words) and words[0] == "module"):
+                                module = words[1].split('(')[0]
+                                if module.endswith(module_suffix):
+                                    base_name = module[:-4]
+                                    part = base_name + '.' + part_type
+                                    if part in targets:
+                                        #
+                                        # make a file to use the module
+                                        #
+                                        part_maker_name = part_type + ".scad"
+                                        with open(part_maker_name, "w") as f:
+                                            f.write("use <%s/%s>\n" % (dir, filename))
+                                            f.write("%s();\n" % module);
+                                        #
+                                        # Run openscad on the created file
+                                        #
+                                        part_file = target_dir + "/" + part
+                                        dname = deps_name(deps_dir, filename)
+                                        changed = check_deps(part_file, dname)
+                                        changed = times.check_have_time(changed, part)
+                                        if part_type == 'stl' and not changed and not part in bounds_map:
+                                            changed = "No bounds"
+                                        if changed:
+                                            print(changed)
+                                            t = time.time()
+                                            openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
+                                            times.add_time(part, t)
+                                            if part_type == 'stl':
+                                                bounds = c14n_stl.canonicalise(part_file)
+                                                bounds_map[part] = bounds

-                                    targets.remove(part)
-                                    os.remove(part_maker_name)
+                                        targets.remove(part)
+                                        os.remove(part_maker_name)
    #
    # Write new bounds file
    #
--- a/scripts/openscad.py
+++ b/scripts/openscad.py
@@ -24,7 +24,7 @@ from __future__ import print_function

 import subprocess, sys

-def _run(args, silent):
+def run_list(args, silent = False):
    cmd = ["openscad"] + args
    if not silent:
        for arg in cmd:
@@ -39,7 +39,7 @@ def _run(args, silent):
        sys.exit(rc)

 def run(*args):
-    _run(list(args), False)
+    run_list(list(args), False)

 def run_silent(*args):
-    _run(list(args), True);
+    run_list(list(args), True);
--- a/scripts/options.py
+++ b/scripts/options.py
@@ -0,0 +1,49 @@
+#
+# NopSCADlib Copyright Chris Palmer 2020
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Set command line options from enviroment variables and check if they have changed
+
+import json, os, deps
+
+def check_options(dir = '.'):
+    global options, options_mtime
+    options = { "show_threads": str(os.getenv("SHOW_THREADS")) }
+    options_fname = dir + '/options.json'
+    try:
+        with open(options_fname) as json_file:
+            last_options = json.load(json_file)
+    except:
+        last_options = {}
+    if last_options != options:
+        with open(options_fname, 'w') as outfile:
+            json.dump(options, outfile, indent = 4)
+    options_mtime = deps.mtime(options_fname)
+
+def have_changed(changed, target):
+    if not changed and deps.mtime(target) < options_mtime:
+        return "command line options changed"
+    return changed
+
+def list():
+    result = []
+    for name in options.keys():
+        value = options[name]
+        if value != 'None':
+            result.append('-D$' + name + '=' + value)
+    return result
--- a/scripts/tests.py
+++ b/scripts/tests.py
@@ -27,6 +27,7 @@ import openscad
 import subprocess
 import bom
 import times
+import options
 import time
 import json
 import shutil
@@ -96,6 +97,7 @@ def tests(tests):
    index = {}
    bodies = {}
    times.read_times()
+    options.check_options(deps_dir)
    #
    # Make cover pic if does not exist as very slow. Delete it to force an update.
    #
@@ -190,11 +192,12 @@ def tests(tests):
            oldest = png_name if mtime(png_name) < mtime(bom_name) else bom_name
            changed = check_deps(oldest, dname)
            changed = times.check_have_time(changed, scad_name)
+            changed = options.have_changed(changed, oldest)
            if changed:
                print(changed)
                t = time.time()
                tmp_name = 'tmp.png'
-                openscad.run("-D", "$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, scad_name);
+                openscad.run_list(options.list() + ["-D$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, scad_name]);
                times.add_time(scad_name, t)
                do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name])
                update_image(tmp_name, png_name)
--- a/scripts/views.py
+++ b/scripts/views.py
@@ -28,6 +28,7 @@ import openscad
 from tests import do_cmd, update_image, colour_scheme, background
 import time
 import times
+import options
 from deps import *
 import os
 import json
@@ -102,6 +103,7 @@ def views(target, do_assemblies = None):
        os.makedirs(deps_dir)

    times.read_times(target_dir)
+    options.check_options(deps_dir)
    bounds_fname = top_dir + 'stls/bounds.json'
    with open(bounds_fname) as json_file:
        bounds_map = json.load(json_file)
@@ -122,65 +124,67 @@ def views(target, do_assemblies = None):
    #
    main_blurb = None
    lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename.endswith('.scad'):
-                #
-                # find any modules with names ending in _assembly
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    lines = f.readlines()
-                line_no = 0
-                for line in lines:
-                    words = line.split()
-                    if len(words) and words[0] == "module":
-                        module = words[1].split('(')[0]
-                        if is_assembly(module):
-                            if module in assemblies:
-                                #
-                                # Scrape the assembly instructions
-                                #
-                                for ass in flat_bom:
-                                    if ass["name"] == module:
-                                        if not "blurb" in ass:
-                                            ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
-                                        break
-                                if not do_assemblies or module in do_assemblies:
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename.endswith('.scad'):
+                    #
+                    # find any modules with names ending in _assembly
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        lines = f.readlines()
+                    line_no = 0
+                    for line in lines:
+                        words = line.split()
+                        if len(words) and words[0] == "module":
+                            module = words[1].split('(')[0]
+                            if is_assembly(module):
+                                if module in assemblies:
                                    #
-                                    # make a file to use the module
+                                    # Scrape the assembly instructions
                                    #
-                                    png_maker_name = 'png.scad'
-                                    with open(png_maker_name, "w") as f:
-                                        f.write("use <%s/%s>\n" % (dir, filename))
-                                        f.write("%s();\n" % module);
-                                    #
-                                    # Run openscad on th created file
-                                    #
-                                    dname = deps_name(deps_dir, filename)
-                                    for explode in [0, 1]:
-                                        png_name = target_dir + '/' + module + '.png'
-                                        if not explode:
-                                            png_name = png_name.replace('_assembly', '_assembled')
-                                        changed = check_deps(png_name, dname)
-                                        changed = times.check_have_time(changed, png_name)
-                                        tmp_name = 'tmp.png'
-                                        if changed:
-                                            print(changed)
-                                            t = time.time()
-                                            openscad.run("-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name);
-                                            times.add_time(png_name, t)
-                                            do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
-                                            update_image(tmp_name, png_name)
-                                        tn_name = png_name.replace('.png', '_tn.png')
-                                        if mtime(png_name) > mtime(tn_name):
-                                            do_cmd(("magick "+ png_name + " -trim -resize 280x280 -background " + background + " -gravity Center -extent 280x280 -bordercolor " + background + " -border 10 " + tmp_name).split())
-                                            update_image(tmp_name, tn_name)
-                                    os.remove(png_maker_name)
-                                done_assemblies.append(module)
-                            else:
-                                if module == 'main_assembly':
-                                    main_blurb = blurb.scrape_module_blurb(lines[:line_no])
-                    line_no += 1
+                                    for ass in flat_bom:
+                                        if ass["name"] == module:
+                                            if not "blurb" in ass:
+                                                ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
+                                            break
+                                    if not do_assemblies or module in do_assemblies:
+                                        #
+                                        # make a file to use the module
+                                        #
+                                        png_maker_name = 'png.scad'
+                                        with open(png_maker_name, "w") as f:
+                                            f.write("use <%s/%s>\n" % (dir, filename))
+                                            f.write("%s();\n" % module);
+                                        #
+                                        # Run openscad on the created file
+                                        #
+                                        dname = deps_name(deps_dir, filename)
+                                        for explode in [0, 1]:
+                                            png_name = target_dir + '/' + module + '.png'
+                                            if not explode:
+                                                png_name = png_name.replace('_assembly', '_assembled')
+                                            changed = check_deps(png_name, dname)
+                                            changed = times.check_have_time(changed, png_name)
+                                            changed = options.have_changed(changed, png_name)
+                                            tmp_name = 'tmp.png'
+                                            if changed:
+                                                print(changed)
+                                                t = time.time()
+                                                openscad.run_list(options.list() + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name]);
+                                                times.add_time(png_name, t)
+                                                do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
+                                                update_image(tmp_name, png_name)
+                                            tn_name = png_name.replace('.png', '_tn.png')
+                                            if mtime(png_name) > mtime(tn_name):
+                                                do_cmd(("magick "+ png_name + " -trim -resize 280x280 -background " + background + " -gravity Center -extent 280x280 -bordercolor " + background + " -border 10 " + tmp_name).split())
+                                                update_image(tmp_name, tn_name)
+                                        os.remove(png_maker_name)
+                                    done_assemblies.append(module)
+                                else:
+                                    if module == 'main_assembly':
+                                        main_blurb = blurb.scrape_module_blurb(lines[:line_no])
+                        line_no += 1
    times.print_times()
    #
    # Build the document
--- a/tests/belts.scad
+++ b/tests/belts.scad
@@ -20,8 +20,8 @@ include <../core.scad>

 include <../vitamins/belts.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
 include <../vitamins/pulleys.scad>
+use <../vitamins/insert.scad>
 use <../utils/layout.scad>

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

 if($preview)
--- a/tests/bom.scad
+++ b/tests/bom.scad
@@ -22,8 +22,8 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
 include <../vitamins/sheets.scad>
+use <../vitamins/insert.scad>
 $explode = 1; // Normally set on the command line when generating assembly views with views.py

 screw = M3_cap_screw;
--- a/tests/box.scad
+++ b/tests/box.scad
@@ -20,7 +20,7 @@ include <../core.scad>

 include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>

 use <../printed/box.scad>

--- a/tests/butt_box.scad
+++ b/tests/butt_box.scad
@@ -20,7 +20,7 @@ include <../core.scad>

 include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>

 include <../printed/butt_box.scad>

--- a/tests/d_connectors.scad
+++ b/tests/d_connectors.scad
@@ -35,4 +35,5 @@ module d_connectors()
                }

 if($preview)
-    d_connectors();
+    let($show_threads = true)
+        d_connectors();
--- a/tests/extrusion_brackets.scad
+++ b/tests/extrusion_brackets.scad
@@ -0,0 +1,60 @@
+//
+// 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>
+
+include <../vitamins/extrusion_brackets.scad>
+include <../vitamins/extrusions.scad>
+include <../vitamins/washers.scad>
+include <../vitamins/nuts.scad>
+
+module extrusion_brackets() {
+    extrusion_inner_corner_bracket(E20_inner_corner_bracket);
+
+    translate([30, 0])
+        extrusion_inner_corner_bracket(E20_inner_corner_bracket, grub_screws = false);
+
+    translate([60, 0])
+        extrusion_corner_bracket_assembly(E20_corner_bracket);
+
+    eWidth = extrusion_width(E2020);
+
+    translate([0, 60]) {
+        extrusion_inner_corner_bracket(E20_inner_corner_bracket);
+        translate([-eWidth / 2, 0, 0])
+            rotate([-90, 0, 0])
+                extrusion(E2020, 20);
+        translate([-eWidth, -eWidth / 2, 0])
+            rotate([0, 90, 0])
+                extrusion(E2020, 40);
+    }
+
+    translate([60, 60]) {
+        extrusion_corner_bracket_assembly(E20_corner_bracket);
+        translate([-eWidth / 2, 0, 0])
+            rotate([-90, 0, 0])
+                extrusion(E2020, 30);
+        translate([-eWidth, -eWidth / 2, 0])
+            rotate([0, 90, 0])
+                extrusion(E2020, 50);
+    }
+}
+
+if($preview)
+    let($show_threads = true)
+        extrusion_brackets();
--- a/tests/inserts.scad
+++ b/tests/inserts.scad
@@ -37,4 +37,5 @@ module inserts() {
 }

 if($preview)
-    inserts();
+    let($show_threads = true)
+        inserts();
--- a/tests/kp_pillow_blocks.scad
+++ b/tests/kp_pillow_blocks.scad
@@ -0,0 +1,34 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/kp_pillow_blocks.scad>
+include <../vitamins/nuts.scad>
+
+module kp_pillow_blocks() {
+    screws = [M4_cap_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw];
+    nuts = [M4_sliding_t_nut, M4_hammer_nut, M5_sliding_t_nut, M5_nut];
+    assert(len(screws) == len(kp_pillow_blocks) && len(nuts) == len(kp_pillow_blocks));
+    layout([for(k = kp_pillow_blocks) 2 * kp_size(k)[1]])
+        kp_pillow_block_assembly(kp_pillow_blocks[$i], screw_type = screws[$i], nut_type = nuts[$i]);
+}
+
+if($preview)
+    kp_pillow_blocks();
--- a/tests/leadnuts.scad
+++ b/tests/leadnuts.scad
@@ -27,4 +27,5 @@ module leadnuts()
        leadnut(leadnuts[$i]);

 if($preview)
-    leadnuts();
+    let($show_threads = true)
+        leadnuts();
--- a/tests/maths.scad
+++ b/tests/maths.scad
@@ -56,7 +56,7 @@ module maths() {
    //
    z = [0, 0, 1];
    v = cross(u, z);
-    a = acos(u * z);
+    a = angle_between(u, z);


    l = 20;
@@ -64,6 +64,11 @@ module maths() {
        translate_z(l)
            vflip()
                arrow(l);
+
+    //
+    // Test Euler
+    //
+    assert(euler(rotate(r)) == r, "euler() failed");
 }

 rotate(45)
--- a/tests/nuts.scad
+++ b/tests/nuts.scad
@@ -22,13 +22,12 @@ use <../utils/layout.scad>
 include <../vitamins/screws.scad>

 module nuts() {
-    for(nyloc = [false, true])
-        translate([0, nyloc ? 20 : 0])
-            layout([for(n = nuts) 2 * nut_radius(n)], 5)
-                nut(nuts[$i], nyloc);
+    layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) {
+        for(nyloc = [false, true])
+            translate([0, nyloc ? 20 : 0])
+                nut(n, nyloc);

-    translate([0, 40])
-        layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) {
+        translate([0, 40]) {
            if(n == M3_nut)
                nut(n, brass = true);

@@ -45,7 +44,28 @@ module nuts() {
            if(n == M8_nut)
                #nut_trap(M8_cap_screw, n, h = 30);
        }
+
+        translate([0, 60]) {
+            if(n == M3_nut)
+                sliding_t_nut(M3_sliding_t_nut);
+
+            if(n == M4_nut)
+                sliding_t_nut(M4_sliding_t_nut);
+
+            if(n == M5_nut)
+                sliding_t_nut(M5_sliding_t_nut);
+        }
+
+        translate([0, 80]) {
+            if(n == M3_nut)
+                sliding_t_nut(M3_hammer_nut);
+
+            if(n == M4_nut)
+                sliding_t_nut(M4_hammer_nut);
+       }
+    }
 }

 if($preview)
-    nuts();
+    let($show_threads = true)
+        nuts();
--- a/tests/opengrab.scad
+++ b/tests/opengrab.scad
@@ -29,4 +29,5 @@ module opengrab_test() {
 }

 if($preview)
-    opengrab_test();
+    let($show_threads = true)
+        opengrab_test();
--- a/tests/pcb.scad
+++ b/tests/pcb.scad
@@ -0,0 +1,109 @@
+//
+// 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 <../vitamins/pcb.scad>
+include <../vitamins/microswitches.scad>
+include <../vitamins/d_connectors.scad>
+
+gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,1.5,     1,  3,   6,     0,  0,   0];
+gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,1.5,   1,2.5,   6,     0,  0,   0];
+
+TMC2130HeatSinkColor = "DeepSkyBlue";
+TMC2130 = ["TMC2130", "TMC2130",
+    20, 14, 1.6, 0, 3, 0, "white", false, [],
+    [
+        [  10,  1,  0, "-2p54header", 8, 1 ,undef, "blue" ],
+        [  10, 13,  0, "-2p54header", 8, 1],
+        [  12,  7,  0, "-chip", 6, 4, 1, grey20 ],
+        // mock up a heat sink
+        [  10,  7,  0, "block", 9, 9,  2, TMC2130HeatSinkColor ],
+        [  10, 11,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  9,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  7,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  5,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  3,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+    ],
+    []
+];
+
+test_pcb = ["TestPCB", "Test PCB",
+    50, 500, 1.6, // length, width, thickness
+    3,      // Corner radius
+    2.75,   // Mounting hole diameter
+    6,      // Pad around mounting hole
+    "green",// Color
+    false,  // True if the parts should be separate BOM items
+    // hole offsets
+    [ [3, 3], [3, -3], [-3, 3], [-3, -3] ],
+    // components
+    [
+        [ 10,  10,   0, "2p54header", 4, 1],
+        [ 25,  10,   0, "2p54header", 5, 1, undef, "blue" ],
+        [ 10,  20,   0, "2p54boxhdr", 4, 2],
+        [ 10,  30,   0, "2p54socket", 6, 1],
+        [ 25,  30,   0, "2p54socket", 4, 1, undef, undef, undef, "red" ],
+        [ 10,  40,   0, "chip", 10, 5, 1, grey20],
+        [ 10,  60, 180, "rj45"],
+        [  8,  80, 180, "usb_A"],
+        [  8, 100, 180, "usb_Ax2"],
+        [  3, 120, 180, "usb_uA"],
+        [  8, 140, 180, "usb_B"],
+        [ 10, 160,   0, "buzzer"],
+        [ 25, 160,   0, "buzzer", 4.5, 8.5],
+        [ 10, 175,   0, "potentiometer"],
+        [ 30, 175,   0, "potentiometer", 7, 8],
+        [  8, 190, 180, "jack"],
+        [  6, 200, 180, "barrel_jack"],
+        [  5, 220, 180, "hdmi"],
+        [  3, 240, 180, "mini_hdmi"],
+        [ 10, 250,   0, "flex"],
+        [ 10, 265,   0, "flat_flex"],
+        [ 10, 280,   0, "D_plug", DCONN9],
+        [ 10, 300,   0, "molex_hdr", 2],
+        [ 10, 310,   0, "jst_xh", 2],
+        [ 10, 320, 180, "term254", 3],
+        [ 20, 320, 180, "term254", 3, undef, grey20],
+        [ 10, 340, 180, "gterm35", 4, [1,2]],
+        [ 20, 340, 180, "gterm35", 4, [1,2], "red"],
+        [ 30, 340, 180, "gterm", gt_5x11, 3],
+        [ 10, 360, 180, "gterm635", 2],
+        [ 25, 360, 180, "gterm635", 2, undef, "blue"],
+        [ 40, 360, 180, "gterm", gt_5x17, 2, undef, grey20],
+        [ 40, 340, 180, "gterm", gt_5x17, 3, [1], "red"],
+        [ 10, 380, 180, "term35", 4],
+        [ 20, 380, 180, "term35", 3, "lime"],
+        [ 10, 400,   0, "transition", 5],
+        [ 10, 410,   0, "block", 10, 5, 8, "orange"],
+        [ 10, 420,   0, "button_6mm"],
+        [ 10, 435,   0, "microswitch", small_microswitch],
+        [ 12, 450,   0, "pcb", 11, TMC2130 ],
+        [ 12, 456,   0, "2p54socket", 8, 1 ],
+        [ 12, 444,   0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [ 10, 470,   0, "standoff",  5, 4.5, 12.5, 2.54],
+        [  6, 480, 180, "uSD", [12, 11.5, 1.4]],
+    ],
+    // accessories
+    []
+];
+
+
+if($preview)
+    let($show_threads = true)
+        pcb(test_pcb);
--- a/tests/pcb_mount.scad
+++ b/tests/pcb_mount.scad
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../lib.scad>
+include <../core.scad>
 use <../printed/pcb_mount.scad>

 PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", true, [],
--- a/tests/pillars.scad
+++ b/tests/pillars.scad
@@ -26,4 +26,5 @@ module pillars()
        pillar(pillars[$i]);

 if($preview)
-    pillars();
+    let($show_threads = true)
+        pillars();
--- a/tests/png/ball_bearings.png
+++ b/tests/png/ball_bearings.png
--- a/tests/png/belts.png
+++ b/tests/png/belts.png
--- a/tests/png/blowers.png
+++ b/tests/png/blowers.png
--- a/tests/png/bom.png
+++ b/tests/png/bom.png
--- a/tests/png/box.png
+++ b/tests/png/box.png
--- a/tests/png/butt_box.png
+++ b/tests/png/butt_box.png
--- a/tests/png/components.png
+++ b/tests/png/components.png
--- a/tests/png/corner_block.png
+++ b/tests/png/corner_block.png
--- a/tests/png/d_connectors.png
+++ b/tests/png/d_connectors.png
--- a/tests/png/displays.png
+++ b/tests/png/displays.png
--- a/tests/png/door_hinge.png
+++ b/tests/png/door_hinge.png
--- a/tests/png/extrusion_brackets.png
+++ b/tests/png/extrusion_brackets.png
--- a/tests/png/fan_guard.png
+++ b/tests/png/fan_guard.png
--- a/tests/png/fans.png
+++ b/tests/png/fans.png
--- a/tests/png/fixing_block.png
+++ b/tests/png/fixing_block.png
--- a/tests/png/flat_hinge.png
+++ b/tests/png/flat_hinge.png
--- a/tests/png/foot.png
+++ b/tests/png/foot.png
--- a/tests/png/geared_steppers.png
+++ b/tests/png/geared_steppers.png
--- a/tests/png/handle.png
+++ b/tests/png/handle.png
--- a/tests/png/iecs.png
+++ b/tests/png/iecs.png
--- a/tests/png/inserts.png
+++ b/tests/png/inserts.png
--- a/tests/png/kp_pillow_blocks.png
+++ b/tests/png/kp_pillow_blocks.png
--- a/tests/png/leadnuts.png
+++ b/tests/png/leadnuts.png
--- a/tests/png/microswitches.png
+++ b/tests/png/microswitches.png
--- a/tests/png/modules.png
+++ b/tests/png/modules.png
--- a/tests/png/nuts.png
+++ b/tests/png/nuts.png
--- a/tests/png/opengrab.png
+++ b/tests/png/opengrab.png
--- a/tests/png/pcb.png
+++ b/tests/png/pcb.png
--- a/tests/png/pcb_mount.png
+++ b/tests/png/pcb_mount.png
--- a/tests/png/pcbs.png
+++ b/tests/png/pcbs.png
--- a/tests/png/pillars.png
+++ b/tests/png/pillars.png
--- a/tests/png/psu_shroud.png
+++ b/tests/png/psu_shroud.png
--- a/tests/png/pulleys.png
+++ b/tests/png/pulleys.png
--- a/tests/png/rails.png
+++ b/tests/png/rails.png
--- a/tests/png/ribbon_clamp.png
+++ b/tests/png/ribbon_clamp.png
--- a/tests/png/ring_terminals.png
+++ b/tests/png/ring_terminals.png
--- a/tests/png/rockers.png
+++ b/tests/png/rockers.png
--- a/tests/png/rod.png
+++ b/tests/png/rod.png
--- a/tests/png/screw_knob.png
+++ b/tests/png/screw_knob.png
--- a/tests/png/screws.png
+++ b/tests/png/screws.png
--- a/tests/png/scs_bearing_blocks.png
+++ b/tests/png/scs_bearing_blocks.png
--- a/tests/png/sk_brackets.png
+++ b/tests/png/sk_brackets.png
--- a/tests/png/socket_box.png
+++ b/tests/png/socket_box.png
--- a/tests/png/spools.png
+++ b/tests/png/spools.png
--- a/tests/png/ssr_shroud.png
+++ b/tests/png/ssr_shroud.png
--- a/tests/png/ssrs.png
+++ b/tests/png/ssrs.png
--- a/tests/png/stepper_motors.png
+++ b/tests/png/stepper_motors.png
--- a/tests/png/teardrops.png
+++ b/tests/png/teardrops.png
--- a/tests/png/thread.png
+++ b/tests/png/thread.png
--- a/tests/png/toggles.png
+++ b/tests/png/toggles.png
--- a/tests/png/veroboard.png
+++ b/tests/png/veroboard.png
--- a/tests/png/washers.png
+++ b/tests/png/washers.png
--- a/tests/rails.scad
+++ b/tests/rails.scad
@@ -34,7 +34,7 @@ module rails()
            nut = screw_nut(screw);
            washer = screw_washer(screw);

-            rail_assembly(rail, length, rail_travel(rail, length) / 2);
+            rail_assembly(rail, length, rail_travel(rail, length) / 2, $i<2 ? grey20 : "green", $i<2 ? grey20 : "red");

            rail_screws(rail, length, sheet + nut_thickness(nut, true) + washer_thickness(washer));

--- a/tests/rockers.scad
+++ b/tests/rockers.scad
@@ -21,9 +21,13 @@ use <../utils/layout.scad>

 include <../vitamins/rockers.scad>

-module rockers()
-    layout([for(r = rockers) rocker_flange_w(r)], 5)
+module rockers() {
+    layout([for(r = rockers) rocker_flange_w(r)], 5) {
        rocker(rockers[$i]);
+        translate([0, 25])
+            rocker(rockers[$i], $i==0 ? "red" : "green");
+    }
+}

 if($preview)
    rockers();
--- a/tests/rod.scad
+++ b/tests/rod.scad
@@ -24,13 +24,23 @@ include <../vitamins/linear_bearings.scad>
 use <../vitamins/rod.scad>

 module rods()
-    layout([for(b = linear_bearings) 2 * bearing_radius(b)]) {
+    layout([for(b = linear_bearings) 2 * bearing_radius(b)]) let(d = bearing_rod_dia(linear_bearings[$i])){

-        rod(bearing_rod_dia(linear_bearings[$i]), 80);
+        rod(d, 80);

        translate([0, 30])
-            studding(bearing_rod_dia(linear_bearings[$i]), 80);
+            studding(d, 80);
+
+        if(d >= 6)
+            translate([0, 60]) {
+                starts = d > 6 ? 4 : 1;
+                pitch = d > 14 ? 4
+                               : d > 10 ? 3 : 2;
+                let($show_threads = true)
+                    leadscrew(d, 80, starts * pitch, starts);
+            }
    }

 if($preview)
-    rods();
+    let($show_threads = true)
+        rods();
--- a/tests/screws.scad
+++ b/tests/screws.scad
@@ -25,13 +25,15 @@ for(y = [0 : len(screw_lists) -1])
    for(x = [0 : len(screw_lists[y]) -1]) {
        screw = screw_lists[y][x];
        if(screw) {
-             length = screw_max_thread(screw)
-                    ? screw_longer_than(screw_max_thread(screw) + 5)
-                    : screw_head_type(screw) == hs_grub ? 6 : 30;
+             length = screw_head_type(screw) == hs_grub ? 6
+                    : screw_radius(screw) <= 1.5 ? 10
+                    : screw_max_thread(screw) ? screw_longer_than(screw_max_thread(screw) + 5)
+                    : 30;
            translate([x * 20, y * 20])
                screw(screw, length);
        }
    }

 if($preview)
-    screws();
+    let($show_threads = true)
+        screws();
--- a/tests/scs_bearing_blocks.scad
+++ b/tests/scs_bearing_blocks.scad
@@ -0,0 +1,35 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/scs_bearing_blocks.scad>
+
+module scs_bearing_blocks()
+    layout([for(s = scs_bearing_blocks) 2 * scs_size(s)[0]]) {
+        part_thickness = 5;
+        scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);
+
+        if($i > 0) // skip $i==0, since no SCS6LUU long variant to match SCS6UU
+            translate([0, 60])
+                scs_bearing_block_assembly(scs_bearing_blocks_long[$i - 1], part_thickness);
+    }
+
+if($preview)
+    scs_bearing_blocks();
--- a/tests/sk_brackets.scad
+++ b/tests/sk_brackets.scad
@@ -0,0 +1,40 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/sk_brackets.scad>
+include <../vitamins/extrusions.scad>
+
+module sk_brackets() {
+    screws = [M4_dome_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw];
+    nuts = [M4_hammer_nut, M4_sliding_t_nut, M5_sliding_t_nut, undef];
+    // channel depth = 6 for 2020 extrusion, 9 for 3030 extrusion
+    depths = [6, 6, 9, 0];
+    layout([for(s = sk_brackets) 1.5 * sk_size(s)[1]]) {
+        sk_bracket_assembly(sk_brackets[$i], screw_type = screws[$i], nut_type = nuts[$i], max_screw_depth = depths[$i]);
+        translate([0, -sk_hole_offset(sk_brackets[$i]) - extrusion_width($i < 2 ? E2020 : E3030) / 2, 0])
+            rotate([0, 90, 0])
+                extrusion($i < 2 ? E2020 : E3030, 20);
+    }
+}
+
+if($preview)
+    let($show_threads = true)
+        sk_brackets();
--- a/tests/spools.scad
+++ b/tests/spools.scad
@@ -23,9 +23,9 @@ use <../utils/layout.scad>
 include <../vitamins/spools.scad>

 module spools()
-    layout([for(s = spools) spool_height(s)], 100)
+    layout([for(s = spools) spool_height(s)], 100) let(s = spools[$i])
        rotate([90, 0, 90])
-            spool(spools[$i]);
+            spool(s, filament_depth =  spool_depth(s) / 2, filament_colour = [pp1_colour, pp2_colour, pp3_colour, pp4_colour][$i % 4], filament_d = $i ? 3 : 1.75);

 if($preview)
    spools();
--- a/tests/sweep.scad
+++ b/tests/sweep.scad
@@ -44,7 +44,7 @@ knot = [ for(i=[0:.2:359])
           (19*cos(3*i) + 40)*sin(2*i),
            19*sin(3*i) ] ];

-sweep(knot, L_points, loop = true, twist = 0);
+sweep(knot, L_points, loop = true);

 p = transform_points([[0,0,0], [20,0,5], [10,30,4], [0,0,0], [0,0,20]], scale(10));
 n = 100;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chris Palmer	a2ce3f1278	Updated readme	2020-02-27 09:44:54 +00:00
Chris Palmer	01eb6931d9	Merge branch 'extrusion_center' of https://github.com/martinbudden/NopSCADlib into martinbudden-extrusion_center	2020-02-27 09:41:01 +00:00
Chris Palmer	c09a74b4c9	Added center option to spring and documented the origin of rods, etc.	2020-02-27 09:39:05 +00:00
Martin Budden	aab7f3d683	Added center parameter. Added cornerhole dimensions to E20.	2020-02-27 09:03:23 +00:00
Chris Palmer	ad719dad5a	Added copyright boiler plate and description. Updated images and readme.	2020-02-26 19:43:02 +00:00
Chris Palmer	00690b61d2	Merge branch 'extrusion_corner_brackets' of https://github.com/martinbudden/NopSCADlib into martinbudden-extrusion_corner_brackets	2020-02-26 19:23:39 +00:00
Chris Palmer	1a24e0d87e	Added image and updated readme.	2020-02-26 15:55:22 +00:00
Chris Palmer	171c9a6a34	Merge branch 'pcb_additions' of https://github.com/martinbudden/NopSCADlib into martinbudden-pcb_additions	2020-02-26 15:39:12 +00:00
Chris Palmer	8bb4b3881e	Fixed test, image and readme updated.	2020-02-26 15:24:33 +00:00
Chris Palmer	79f8bc66e1	Merge branch 'Drachenkaetzchen-patch-1' of https://github.com/Drachenkaetzchen/NopSCADlib into Drachenkaetzchen-Drachenkaetzchen-patch-1	2020-02-26 14:58:27 +00:00
Chris Palmer	33c9d158ef	REmoved fans.scad from lib.scad as already included from psus.scad.	2020-02-26 14:03:46 +00:00
Chris Palmer	d2874a0531	Moved washers.scad from screws.scad to nuts.scad. Moved screw_insert() from inserts.scad to screw.scad. Changed most includes of inserts.scad to use insert.scad. Removed linear_bearings, iecs, rockers and microswitches from lib.scad as already included by other vitamins.	2020-02-26 13:46:11 +00:00
Felicia Hummel	b6fd795a25	Updated readme to reflect the pillow block changes	2020-02-26 13:02:17 +01:00
Felicia Hummel	ad0882db40	Added 15mm and 18mm variants for the KP08 blocks	2020-02-26 12:57:53 +01:00
Chris Palmer	8afb08aaa4	Updated image	2020-02-26 10:23:05 +00:00
Martin Budden	e87dffd92c	More pcb component examples. Allowed more colour setting.	2020-02-26 07:19:55 +00:00
Martin Budden	c364bf06b2	Code tidy.	2020-02-25 22:34:13 +00:00
Martin Budden	1668f9c54c	Naming update.	2020-02-25 22:23:44 +00:00
Martin Budden	e0dd174010	Parameterisation of extrusion brackets.	2020-02-25 22:19:20 +00:00
Martin Budden	f104bd42e5	Added back jst_xh connector to ramps endstop.	2020-02-25 21:38:53 +00:00
Martin Budden	8342ba87e9	Update as per code review.	2020-02-25 21:07:29 +00:00
Martin Budden	0e58e92fbc	Allowed parameterised green terminals on PCBs.	2020-02-25 21:01:04 +00:00
Martin Budden	1af2e18594	Added usb_Ax1 and potentiometer.	2020-02-25 20:39:37 +00:00
Martin Budden	598527edbe	Added a test pcb.	2020-02-25 20:13:15 +00:00
Martin Budden	9c666f8f47	Merge branch 'pin_header_color' into pcb_additions	2020-02-25 19:07:58 +00:00
Martin Budden	bc1f135e40	Added ability to set socket color.	2020-02-25 17:06:16 +00:00
Martin Budden	ce36729e50	Allow pin header base colour to be set on PCB.	2020-02-25 17:05:48 +00:00
Martin Budden	1dca024e64	Internal and external corner brackets for 20nn extrusion.	2020-02-25 16:53:51 +00:00
Chris Palmer	c1833f0820	Updated image and readme.	2020-02-25 13:42:31 +00:00
Chris Palmer	6a7f7dcbbf	Merge branch 'sk_bracket_screw_length' of https://github.com/martinbudden/NopSCADlib into martinbudden-sk_bracket_screw_length	2020-02-25 12:34:19 +00:00
Chris Palmer	5d3f1115bb	Updated readme and images	2020-02-25 11:11:05 +00:00
Chris Palmer	9f9adeb6ca	Merge branch 'teardrop_chamfer' of https://github.com/martinbudden/NopSCADlib into martinbudden-teardrop_chamfer	2020-02-25 09:44:38 +00:00
Chris Palmer	f9b06c855c	Merge branch 'martinbudden-kp_pillow_block'	2020-02-25 09:32:55 +00:00
Chris Palmer	05bfe9b159	Updated and images.	2020-02-25 09:32:40 +00:00
Martin Budden	f961874ce3	Added kp_pillow_blocks.	2020-02-25 07:55:47 +00:00
Martin Budden	7a6210f442	Add optional chamfer to teardrops. Defaults to no chamfer.	2020-02-25 07:46:57 +00:00
Martin Budden	5bae0aaa51	Better sk_bracket screw length calculation.	2020-02-25 07:33:07 +00:00
Chris Palmer	8649d59e8a	Merge branch 'martinbudden-print_search_path'	2020-02-25 00:05:12 +00:00
Chris Palmer	e9bc300b8d	Fix for printed directory not present.	2020-02-24 23:58:22 +00:00
Chris Palmer	dcb1e74894	Merge branch 'print_search_path' of https://github.com/martinbudden/NopSCADlib into martinbudden-print_search_path	2020-02-24 19:02:50 +00:00
Chris Palmer	42b9479094	Merge branch 'martinbudden-tnuts_and_hammer_nuts'	2020-02-24 18:37:40 +00:00
Chris Palmer	f46f35e909	Updated readme	2020-02-24 18:37:25 +00:00
Chris Palmer	0513b151b2	Merge branch 'tnuts_and_hammer_nuts' of https://github.com/martinbudden/NopSCADlib into martinbudden-tnuts_and_hammer_nuts	2020-02-24 18:22:05 +00:00
Chris Palmer	dcf258f11a	Brass colour now distinct from gold.	2020-02-24 18:15:20 +00:00
Martin Budden	4ff6c7d0a8	Unified tnuts and hammer nuts.	2020-02-24 17:40:39 +00:00
Chris Palmer	2edb6d4df2	Shorter screws when using T-nut but mignt not be a suitable standard size.	2020-02-24 12:01:40 +00:00
Chris Palmer	26e8497018	Merge branch 'martinbudden-sk_brackets_tidy'	2020-02-24 11:42:07 +00:00
Chris Palmer	bfde879ce2	Updated readme and images.	2020-02-24 11:41:39 +00:00
Chris Palmer	4641e3a642	More nut and screw types	2020-02-24 11:40:30 +00:00
Chris Palmer	42cfed8846	Set default part thickness to 2.	2020-02-24 11:38:31 +00:00
Chris Palmer	8c339a18c4	Removed washers from T-nuts and used the lack to detect them.	2020-02-24 11:23:10 +00:00
Chris Palmer	065ec0a430	Corrected nut placement	2020-02-24 11:18:34 +00:00
Chris Palmer	e7eea0520c	T nut thickness no longer includes the stem to simplyfy placement and screw length calculations.	2020-02-24 11:14:30 +00:00
Chris Palmer	5cb994b58b	Retabulated nut table	2020-02-24 10:21:37 +00:00
Chris Palmer	573425055a	Fixed origin of T-nuts to be consistent with others. I.e the mating face is at Z = 0.	2020-02-24 09:11:59 +00:00
Chris Palmer	66a7a9bfe0	Used named elements of size.	2020-02-24 08:57:22 +00:00
Chris Palmer	0335545334	Merge branch 'sk_brackets_tidy' of https://github.com/martinbudden/NopSCADlib into martinbudden-sk_brackets_tidy	2020-02-24 08:38:16 +00:00
Chris Palmer	fa91acbaad	Merge branch 'martinbudden-scs_bearing_blocks'	2020-02-24 00:03:42 +00:00
Chris Palmer	8bad05e721	Added to lib.scad	2020-02-24 00:00:32 +00:00
Chris Palmer	9d6727d371	Added images and readme	2020-02-23 23:57:18 +00:00
Chris Palmer	8902d83f0a	Merge branch 'scs_bearing_blocks' of https://github.com/martinbudden/NopSCADlib into martinbudden-scs_bearing_blocks	2020-02-23 23:40:02 +00:00
Martin Budden	e40b10f5a0	Added comment.	2020-02-23 23:08:34 +00:00
Martin Budden	66a8d1d583	Tidy of sk_brackets as per scs_bearing_blocks code review.	2020-02-23 22:56:47 +00:00
Martin Budden	d066648a76	Renamed sheet_thickness to part_thickness.	2020-02-23 22:34:59 +00:00
Chris Palmer	b8546414c0	Fixed leadscrew when center = false.	2020-02-23 21:54:26 +00:00
Martin Budden	581c2f8a96	Used accessor functions internally.	2020-02-23 21:49:35 +00:00
Martin Budden	e9ee88dfe9	Updates as per code review.	2020-02-23 21:41:47 +00:00
Martin Budden	b07a8ad245	Added SCS bearing blocks, SCSnUU and SCSnLUU variants	2020-02-23 21:06:38 +00:00
Chris Palmer	ab17de3b0b	Merge branch 'martinbudden-green_terminals'	2020-02-23 19:53:10 +00:00
Chris Palmer	0b8141844c	Updated readme.	2020-02-23 19:52:18 +00:00
Chris Palmer	7d0548b033	Merge branch 'green_terminals' of https://github.com/martinbudden/NopSCADlib into martinbudden-green_terminals	2020-02-23 19:49:16 +00:00
Martin Budden	ad3e8d85af	Added scad/printed to stl search path.	2020-02-23 17:54:28 +00:00
Chris Palmer	8435a350d0	Merge branch 'martinbudden-sk_brackets'	2020-02-23 17:32:54 +00:00
Chris Palmer	3e5d4b1c8e	Added to lib.scad.	2020-02-23 17:12:47 +00:00
Chris Palmer	20f830a008	Added image and updated readme.	2020-02-23 16:46:27 +00:00
Chris Palmer	10bd8ff354	Merge branch 'sk_brackets' of https://github.com/martinbudden/NopSCADlib into martinbudden-sk_brackets	2020-02-23 16:22:11 +00:00
Chris Palmer	4459cca3ea	Merge branch 'martinbudden-screw_length_formatting'	2020-02-23 16:16:30 +00:00
Chris Palmer	95bbebd42d	Updated readme.	2020-02-23 16:16:09 +00:00
Martin Budden	cc84a5a536	Added comments and ability to set colour to green terminals.	2020-02-23 15:38:02 +00:00
Chris Palmer	28c795e9f4	Merge branch 'screw_length_formatting' of https://github.com/martinbudden/NopSCADlib into martinbudden-screw_length_formatting	2020-02-23 15:24:43 +00:00
Chris Palmer	9a0477d16b	Merge branch 'martinbudden-pcb_microswitch2'	2020-02-23 15:22:43 +00:00
Chris Palmer	0583da2eb7	Added images	2020-02-23 15:22:25 +00:00
Chris	9a08fe9b5c	Merge branch 'master' into pcb_microswitch2	2020-02-23 15:10:13 +00:00
Chris Palmer	8ab7993148	Merge branch 'martinbudden-rocker_color'	2020-02-23 15:03:23 +00:00
Chris Palmer	16dd8d6d17	Added images and readme.	2020-02-23 15:02:39 +00:00
Chris Palmer	08c268145e	Merge branch 'rocker_color' of https://github.com/martinbudden/NopSCADlib into martinbudden-rocker_color	2020-02-23 14:52:11 +00:00
Chris Palmer	ba7e64233a	Clarified path settings in usage.md.	2020-02-23 14:46:39 +00:00
Chris Palmer	7090c714ce	Merge branch 'martinbudden-pcb_buzzer'	2020-02-23 14:34:04 +00:00
Martin Budden	c5038db6d9	Added support for tNuts in sk_brackets.	2020-02-23 14:32:40 +00:00
Chris Palmer	654f094304	Merge branch 'martinbudden-spool_filament'	2020-02-23 14:28:57 +00:00
Chris Palmer	1e5e5860e1	Made more realistic and added a test.	2020-02-23 14:28:39 +00:00
Martin Budden	a08216d0b8	Added SK shaft support brackets.	2020-02-23 13:57:14 +00:00
Chris Palmer	3d8a9ec8aa	Merge branch 'spool_filament' of https://github.com/martinbudden/NopSCADlib into martinbudden-spool_filament	2020-02-23 10:04:23 +00:00
Chris Palmer	7ec059142f	Updated readme.	2020-02-23 10:01:28 +00:00
Chris Palmer	7f0d96b824	Merge branch 'pcb_buzzer' of https://github.com/martinbudden/NopSCADlib into martinbudden-pcb_buzzer	2020-02-22 23:06:08 +00:00
Chris Palmer	9e826c1a09	Merge branch 'martinbudden-belt_colors'	2020-02-22 23:02:03 +00:00
Chris Palmer	2c1dbe04a9	Added images and readme.	2020-02-22 23:01:50 +00:00
Chris Palmer	d644d6b698	Merge branch 'belt_colors' of https://github.com/martinbudden/NopSCADlib into martinbudden-belt_colors	2020-02-22 22:47:42 +00:00
Chris Palmer	8db4cc2cb5	Merge branch 'martinbudden-pcb_jst_xh'	2020-02-22 22:40:31 +00:00
Chris Palmer	509a87939c	Updated images and readme	2020-02-22 22:40:09 +00:00
Chris Palmer	40607e6cfc	Merge branch 'pcb_jst_xh' of https://github.com/martinbudden/NopSCADlib into martinbudden-pcb_jst_xh	2020-02-22 22:28:16 +00:00
Chris Palmer	599fbba6c2	Reduced dependecies in pcb_mount test.	2020-02-22 22:24:45 +00:00
Chris Palmer	52729d012c	Merge branch 'martinbudden-rail_carriage_coloring'	2020-02-22 22:16:50 +00:00
Chris Palmer	6097e07094	Updated images and readme.	2020-02-22 22:16:09 +00:00
Chris Palmer	9d71438a3c	Merge branch 'rail_carriage_coloring' of https://github.com/martinbudden/NopSCADlib into martinbudden-rail_carriage_coloring	2020-02-22 21:59:15 +00:00
Chris Palmer	ffa1ab940b	Merge branch 'martinbudden-tnuts'	2020-02-22 21:51:16 +00:00
Chris Palmer	3174013e1a	Updated images and readme.	2020-02-22 21:51:05 +00:00
Chris Palmer	c4eea38a2b	Added threads	2020-02-22 21:27:51 +00:00
Chris Palmer	0cd89279a5	Merge branch 'tnuts' of https://github.com/martinbudden/NopSCADlib into martinbudden-tnuts	2020-02-22 21:12:13 +00:00
Chris Palmer	92051e0b28	Merge branch 'martinbudden-gitattributes'	2020-02-22 21:05:26 +00:00
Chris Palmer	f4b22e35c7	Merge branch 'gitattributes' of https://github.com/martinbudden/NopSCADlib into martinbudden-gitattributes	2020-02-22 21:02:24 +00:00
Chris Palmer	17ecfc07f3	Merge branch 'martinbudden-screw_knob_typo'	2020-02-22 20:58:55 +00:00
Chris Palmer	9658205efd	Updated readme	2020-02-22 20:58:43 +00:00
Chris Palmer	53140a4cc1	Merge branch 'screw_knob_typo' of https://github.com/martinbudden/NopSCADlib into martinbudden-screw_knob_typo	2020-02-22 20:55:17 +00:00
Chris Palmer	2798d39538	Merge branch 'martinbudden-iec_switched_fused'	2020-02-22 20:51:58 +00:00
Chris Palmer	8be0cc98ea	Updated the images and readme.	2020-02-22 20:51:15 +00:00
Chris Palmer	6a5f31edd8	Merge branch 'iec_switched_fused' of https://github.com/martinbudden/NopSCADlib into martinbudden-iec_switched_fused	2020-02-22 20:01:25 +00:00
Chris Palmer	e068918e21	Added screw threads to most things that are threaded. Added a mechanism for tests.py and views.py to have command line options.	2020-02-22 19:44:01 +00:00
Chris Palmer	1614f50b73	Merged master	2020-02-22 18:32:35 +00:00
Martin Budden	32522b28d7	Added hammer nuts.	2020-02-19 06:42:11 +00:00
Martin Budden	1936c95d06	Added IEC 320 C14 switched fused inlet module.	2020-02-18 08:24:16 +00:00
Martin Budden	16060629c0	Added sliding t nuts. Sizes M3, M4 and M5.	2020-02-18 07:48:01 +00:00
Martin Budden	b7b5c837bd	Used tube for buzzer.	2020-02-17 19:40:49 +00:00
Martin Budden	a793cb6d43	Added ability to use microswitch on a pcb.	2020-02-17 06:58:09 +00:00
Martin Budden	dc4e24b63a	Simplified drawing of filament.	2020-02-16 23:06:07 +00:00
Martin Budden	8f85ac73dc	Added space before screw length when length < 10 to ensure correct ordering. This means 5mm, 6mm etc comes before 10mm in BOM.	2020-02-16 21:15:44 +00:00
Martin Budden	3ab934d83e	Typo in screw_knob. foe corrected to for.	2020-02-07 19:58:37 +00:00
Martin Budden	d1324a670e	Added JST-XH connector for pcbs.	2020-01-30 05:45:29 +00:00
Martin Budden	f5fdec613c	Allow setting of color of rocker switch. Defaults to current colors.	2020-01-29 17:46:32 +00:00
Martin Budden	c55b8b6d1c	Parameterised belt colors.	2020-01-29 17:40:34 +00:00
Martin Budden	56ec8e03ad	Added PCB buzzer.	2020-01-29 17:37:01 +00:00
Martin Budden	728b7adf38	Add ability to display filament on spool.	2020-01-14 11:26:21 +00:00
Martin Budden	75747687d9	Parameterised coloring of linear rail carriage.	2020-01-12 10:20:10 +00:00
Martin Budden	03c97e8b6a	Changed rail carriage coloring to be green with red endpiece to match common form.	2020-01-11 14:54:00 +00:00
Martin Budden	de76eb46e7	Initial commit. Set default text file line endings to LF.	2020-01-11 08:21:38 +00:00
Chris Palmer	d703ae4997	Added male screw threads.	2020-01-10 10:26:12 +00:00