Extrusions now default to centered. New parts added to the libtest picture.

Extrusion bracket examples rotated for clearer view and made optional. Added missing description for scs_bearing_blocks. Extrusion no longer shows centre parameter but does show no default cornerHole.
Updated image
2025-09-03 12:22:46 +02:00 · 2020-02-27 17:55:03 +00:00 · 2020-02-27 11:22:02 +00:00 · 2020-02-27 11:18:54 +00:00 · 2020-02-27 11:17:07 +00:00 · 2020-02-27 10:44:00 +00:00
79 changed files with 1237 additions and 361 deletions
--- a/examples/MainsBreakOutBox/assemblies/base_assembled.png
+++ b/examples/MainsBreakOutBox/assemblies/base_assembled.png
--- a/examples/MainsBreakOutBox/assemblies/base_assembled_tn.png
+++ b/examples/MainsBreakOutBox/assemblies/base_assembled_tn.png
--- a/examples/MainsBreakOutBox/assemblies/base_assembly.png
+++ b/examples/MainsBreakOutBox/assemblies/base_assembly.png
--- a/examples/MainsBreakOutBox/assemblies/base_assembly_tn.png
+++ b/examples/MainsBreakOutBox/assemblies/base_assembly_tn.png
--- a/examples/MainsBreakOutBox/assemblies/feet_assembled.png
+++ b/examples/MainsBreakOutBox/assemblies/feet_assembled.png
--- a/examples/MainsBreakOutBox/assemblies/feet_assembled_tn.png
+++ b/examples/MainsBreakOutBox/assemblies/feet_assembled_tn.png
--- a/examples/MainsBreakOutBox/assemblies/feet_assembly.png
+++ b/examples/MainsBreakOutBox/assemblies/feet_assembly.png
--- a/examples/MainsBreakOutBox/assemblies/feet_assembly_tn.png
+++ b/examples/MainsBreakOutBox/assemblies/feet_assembly_tn.png
--- a/examples/MainsBreakOutBox/assemblies/main_assembly.png
+++ b/examples/MainsBreakOutBox/assemblies/main_assembly.png
--- a/examples/MainsBreakOutBox/assemblies/main_assembly_tn.png
+++ b/examples/MainsBreakOutBox/assemblies/main_assembly_tn.png
--- a/examples/MainsBreakOutBox/assemblies/mains_in_assembled.png
+++ b/examples/MainsBreakOutBox/assemblies/mains_in_assembled.png
--- a/examples/MainsBreakOutBox/assemblies/mains_in_assembled_tn.png
+++ b/examples/MainsBreakOutBox/assemblies/mains_in_assembled_tn.png
--- a/examples/MainsBreakOutBox/assemblies/mains_in_assembly.png
+++ b/examples/MainsBreakOutBox/assemblies/mains_in_assembly.png
--- a/examples/MainsBreakOutBox/assemblies/mains_in_assembly_tn.png
+++ b/examples/MainsBreakOutBox/assemblies/mains_in_assembly_tn.png
--- a/examples/MainsBreakOutBox/readme.md
+++ b/examples/MainsBreakOutBox/readme.md
@@ -30,7 +30,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 <a name="Parts_list"></a>
 ## Parts list
 | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Base</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Feet</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Mains&nbsp;In</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Main</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">TOTALS</span> |  |
-|--:|--:|--:|--:|--:|:--|
+|---:|---:|---:|---:|---:|:---|
 |  |  |  |  | | **Vitamins** |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; 4mm shielded jack socket blue |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; 4mm shielded jack socket brown |
@@ -61,14 +61,14 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Base Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |2| Heatfit insert M3|


 ### 3D Printed parts

 | 1 x socket_box.stl |
-|--|
+|---|
 | ![socket_box.stl](stls/socket_box.png) 


@@ -88,7 +88,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Feet Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |4| Nut M3 x 2.4mm nyloc|
 |4| Screw M3 dome x 10mm|
 |8| Washer  M3 x 7mm x 0.5mm|
@@ -97,7 +97,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### 3D Printed parts

 | 4 x foot.stl |
-|--|
+|---|
 | ![foot.stl](stls/foot.png) 


@@ -105,7 +105,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Sub-assemblies

 | 1 x base_assembly |
-|--|
+|---|
 | ![base_assembled](assemblies/base_assembled_tn.png) 


@@ -124,7 +124,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Mains In Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |3| Heatshrink sleeving ID 3.2mm x 15mm - not shown|
 |1| IEC inlet for ATX|
 |2| Nut M3 x 2.4mm nyloc|
@@ -138,7 +138,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Sub-assemblies

 | 1 x feet_assembly |
-|--|
+|---|
 | ![feet_assembled](assemblies/feet_assembled_tn.png) 


@@ -163,7 +163,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Main Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |2| 4mm shielded jack socket blue|
 |1| 4mm shielded jack socket brown|
 |2| 4mm shielded jack socket green|
@@ -178,7 +178,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Sub-assemblies

 | 1 x mains_in_assembly |
-|--|
+|---|
 | ![mains_in_assembled](assemblies/mains_in_assembled_tn.png) 


--- 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>
@@ -64,7 +60,6 @@ include <vitamins/ldrs.scad>
 include <vitamins/geared_steppers.scad>
 include <vitamins/extrusions.scad>
 include <vitamins/sk_brackets.scad>
-include <vitamins/scs_bearing_blocks.scad>

 use <vitamins/jack.scad>
 use <vitamins/meter.scad>
--- a/libtest.png
+++ b/libtest.png
--- a/libtest.scad
+++ b/libtest.scad
@@ -33,6 +33,7 @@ use <tests/components.scad>
 use <tests/d_connectors.scad>
 use <tests/displays.scad>
 use <tests/extrusions.scad>
+use <tests/extrusion_brackets.scad>
 use <tests/fans.scad>
 use <tests/fuseholder.scad>
 use <tests/geared_steppers.scad>
@@ -40,6 +41,7 @@ use <tests/hot_ends.scad>
 use <tests/iecs.scad>
 use <tests/inserts.scad>
 use <tests/jack.scad>
+use <tests/kp_pillow_blocks.scad>
 use <tests/leadnuts.scad>
 use <tests/leds.scad>
 use <tests/ldrs.scad>
@@ -60,8 +62,10 @@ use <tests/ring_terminals.scad>
 use <tests/rockers.scad>
 use <tests/rod.scad>
 use <tests/screws.scad>
+use <tests/scs_bearing_blocks.scad>
 use <tests/sealing_strip.scad>
 use <tests/sheets.scad>
+use <tests/sk_brackets.scad>
 use <tests/spades.scad>
 use <tests/springs.scad>
 use <tests/ssrs.scad>
@@ -94,7 +98,13 @@ use <tests/psu_shroud.scad>
 use <tests/flat_hinge.scad>
 use <tests/pcb_mount.scad>

-x5 = 800;
+x0 = 0;
+x1 = x0 + 100;
+x2 = x1 + 90;
+x3 = x2 + 130;
+x4 = x3 + 200;
+x5 = 850;
+x6 = x5 + 150;

 cable_grommets_y = 0;

@@ -133,13 +143,12 @@ translate([x5 + 60, cable_grommets_y + 200])
 translate([x5, cable_grommets_y + 250])
    handle();

-translate([900, 600])
+translate([950, 600])
    box_test();

 translate([850, 1260])
    bbox_test();

-x0 = 0;
 inserts_y = 0;
 nuts_y = inserts_y + 20;
 washers_y = nuts_y + 100;
@@ -204,10 +213,6 @@ translate([x0, linear_bearings_y]) {
    rods();
 }

-translate([x0+150, linear_bearings_y+30]) {
-    extrusions();
-}
-
 translate([x0 + 10, hot_ends_y])
    hot_ends();

@@ -236,7 +241,6 @@ translate([x0, psus_y]) {
    psu_shrouds();
 }

-x1 = x0 + 100;
 zipties_y = 0;
 bulldogs_y = zipties_y + 40;

@@ -246,7 +250,6 @@ translate([x1, zipties_y])
 translate([x1, bulldogs_y])
    bulldogs();

-x2 = x1 + 90;
 leds_y = 0;
 carriers_y = leds_y + 40;
 spades_y = carriers_y + 40;
@@ -293,8 +296,6 @@ translate([x2, toggles_y])
 translate([x2, components_y])
    components();

-
-x3 = x2 + 150;
 veroboard_y = 0;
 d_connectors_y = veroboard_y + 110;
 iecs_y = d_connectors_y + 80;
@@ -303,6 +304,7 @@ ssrs_y = modules_y + 80;
 blowers_y = ssrs_y + 60;
 batteries_y = blowers_y + 100;
 steppers_y = batteries_y + 70;
+extrusions_y = steppers_y + 100;

 translate([x3, veroboard_y])
    veroboard_test();
@@ -343,16 +345,22 @@ translate([x3, batteries_y])
 translate([x2, steppers_y])  // interloper
    stepper_motors();

+translate([x2, extrusions_y]) {
+    extrusions();
+}
+
 translate([x3, transformers_y])
    transformers();


-x4 = x3 + 220;
 belts_y = 0;
 rails_y = belts_y + 200;
-cable_strips_y = rails_y + 300;
+extrusion_brackets_y = rails_y + 250;
+sk_brackets_y = extrusion_brackets_y + 80;
+kp_pillow_blocks_y = sk_brackets_y + 50;
+scs_bearing_blocks_y = kp_pillow_blocks_y + 60;

-translate([x4 + 112, belts_y + 58]) {
+translate([x4 + 130, belts_y + 58]) {
    belt_test();

    translate([0, 60])
@@ -362,9 +370,22 @@ translate([x4 + 112, belts_y + 58]) {
 translate([x4, rails_y + 130])
    rails();

-translate([x4, cable_strips_y])
-    cable_strips();
+translate([780, 0])
+    rotate(90)
+        cable_strips();
+
+translate([x4, kp_pillow_blocks_y])
+    kp_pillow_blocks();
+
+translate([x4, sk_brackets_y])
+    sk_brackets();
+
+translate([x4, extrusion_brackets_y])
+    extrusion_brackets();
+
+translate([x4, scs_bearing_blocks_y])
+    scs_bearing_blocks();
+

-x6 = x5 + 150;
 translate([x6, 125])
    light_strips();
--- 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/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,33 +21,35 @@ 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 = "#Scs_bearing_blocks">Scs_bearing_blocks</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 = "#Sealing_strip">Sealing_strip</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 = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</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 = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Sk_brackets">Sk_brackets</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 = "#Spades">Spades</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 = "#Spools">Spools</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </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 = "#Ldrs">Ldrs</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Zipties">Zipties</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>
@@ -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)``` |  Extrusion E2020 x 20mm |
+|   1 | ```extrusion(E2020, 30)``` |  Extrusion E2020 x 30mm |
+|   1 | ```extrusion(E2020, 40)``` |  Extrusion E2020 x 40mm |
+|   1 | ```extrusion(E2020, 50)``` |  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,7 +669,7 @@ Aluminium  extrusion.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```extrusion(type, length, cornerHole = false)``` | Draw the specified extrusion |
+| ```extrusion(type, length, center = true, cornerHole = false)``` | Draw the specified extrusion |

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

@@ -1087,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>

 ---
@@ -1623,12 +1728,12 @@ 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 | ```hammer_nut(M3_hammer_nut)``` |  Nut M3 hammer |
+|   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 | ```hammer_nut(M4_hammer_nut)``` |  Nut M4 hammer |
+|   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 |
@@ -1709,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>

 ---
@@ -1778,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 |
@@ -1820,15 +2008,13 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   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 |
+|  12 | ```screw(M2p5_cap_screw, 20)``` |  Screw M2.5 cap x 20mm |
+|   4 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
+|   8 | ```screw(M2p5_pan_screw, 25)``` |  Screw M2.5 pan x 25mm |
 |   4 | ```screw(M2p5_pan_screw, 35)``` |  Screw M2.5 pan x 35mm |
 |   8 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
 |   4 | ```screw(M3_cap_screw, 35)``` |  Screw M3 cap x 35mm |
-|   4 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
-|   8 | ```screw(M4_cap_screw, 35)``` |  Screw M4 cap x 35mm |
+|  12 | ```screw(M4_cap_screw, 35)``` |  Screw M4 cap x 35mm |
 |   3 | ```terminal_35(2)``` |  Terminal block 2 way 3.5mm |
 |   2 | ```green_terminal(gt_2p54, 4)``` |  Terminal block 4 way 0.1" |
 |   1 |  |  USB A to Mini B lead |
@@ -1841,24 +2027,24 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
-|   4 | pcb_spacer20130.stl |
 |   4 | pcb_spacer20140.stl |
 |   4 | pcb_spacer20150.stl |
 |   4 | pcb_spacer20160.stl |
-|   4 | pcb_spacer25100_2.stl |
+|   4 | pcb_spacer20170.stl |
+|   4 | pcb_spacer25100.stl |
 |   4 | pcb_spacer25110_2.stl |
 |   4 | pcb_spacer25120_2.stl |
-|   4 | pcb_spacer25230.stl |
+|   4 | pcb_spacer25130_2.stl |
 |   4 | pcb_spacer25240.stl |
-|   4 | pcb_spacer2570.stl |
+|   4 | pcb_spacer2550.stl |
 |   4 | pcb_spacer2580.stl |
 |   4 | pcb_spacer2590.stl |
-|   4 | pcb_spacer30170.stl |
 |   4 | pcb_spacer30180.stl |
-|   4 | pcb_spacer30220.stl |
-|   4 | pcb_spacer40190.stl |
+|   4 | pcb_spacer30190.stl |
+|   4 | pcb_spacer30230.stl |
 |   4 | pcb_spacer40200.stl |
 |   4 | pcb_spacer40210.stl |
+|   4 | pcb_spacer40220.stl |


 <a href="#top">Top</a>
@@ -1941,8 +2127,8 @@ Pin headers and sockets, etc.
 | ```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)

@@ -2286,6 +2472,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.

@@ -2413,6 +2601,9 @@ Machine screws and wood screws with various head styles.
 ---
 <a name="Scs_bearing_blocks"></a>
 ## Scs_bearing_blocks
+SCSnUU and SCSnLUU 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.
@@ -2586,7 +2777,7 @@ SK shaft support brackets
 | Module | Description |
 |:--- |:--- |
 | ```sk_bracket(type)``` | SK shaft support bracket |
-| ```sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef)``` | Assembly with fasteners in place |
+| ```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)
@@ -2594,17 +2785,21 @@ SK shaft support brackets
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   2 | ```extrusion(E2020, 20)``` |  Extrusion E2020 x 20mm |
+|   2 | ```extrusion(E3030, 20)``` |  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 |
-|   4 | ```nut(M5_nut, nyloc = undef)``` |  Nut M5 x 4mm  |
+|   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 |
-|   6 | ```screw(M5_cap_screw, 16)``` |  Screw M5 cap x 16mm |
-|   2 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
-|  10 | ```washer(M5_washer)``` |  Washer  M5 x 10mm x 1mm |
+|   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>
@@ -2693,6 +2888,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.

@@ -2721,7 +2918,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)

@@ -5076,11 +5273,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/doc_scripts.py
+++ b/scripts/doc_scripts.py
@@ -40,7 +40,7 @@ These are located in the ```scripts``` subdirectory, which needs to be added to
 They should work with both Python 2 and Python 3.

 | Script  | Function  |
-|:--|:--|''', file = doc_file)
+|:---|:---|''', file = doc_file)
        for file in os.listdir('scripts'):
            if file.endswith('.py'):
                blurb = ''
--- 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/readme.md
+++ b/scripts/readme.md
@@ -5,7 +5,7 @@ These are located in the ```scripts``` subdirectory, which needs to be added to
 They should work with both Python 2 and Python 3.

 | Script  | Function  |
-|:--|:--|
+|:---|:---|
 | ```bom.py``` | Generates BOM files for the project. |
 | ```c14n_stl.py``` | OpenSCAD produces randomly ordered STL files. This script re-orders them consistently so that GIT can tell if they have changed or not. |
 | ```doc_scripts.py``` | Makes this document and doc/usage.md. |
--- a/scripts/views.py
+++ b/scripts/views.py
@@ -124,66 +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 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
+                                    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
@@ -239,7 +240,7 @@ def views(target, do_assemblies = None):
                print('| <span style="writing-mode: vertical-rl; text-orientation: mixed;">%s</span> ' % name, file = doc_file, end = '')
            print('| <span style="writing-mode: vertical-rl; text-orientation: mixed;">TOTALS</span> |  |', file = doc_file)

-            print(('|--:' * len(flat_bom) + '|--:|:--|'), file = doc_file)
+            print(('|---:' * len(flat_bom) + '|---:|:---|'), file = doc_file)

            for t in types:
                if things[t]:
@@ -282,7 +283,7 @@ def views(target, do_assemblies = None):
                if vitamins:
                    print("### Vitamins",         file = doc_file)
                    print("|Qty|Description|",    file = doc_file)
-                    print("|--:|:----------|",    file = doc_file)
+                    print("|---:|:----------|",    file = doc_file)
                    for v in sorted(vitamins, key = lambda s: s.split(":")[-1]):
                        print("|%d|%s|" % (vitamins[v], v.split(":")[1]),     file = doc_file)
                    print("\n", file = doc_file)
@@ -296,7 +297,7 @@ def views(target, do_assemblies = None):
                        print('%s %d x %s |' % ('\n|' if not (i % 3) else '', printed[p], p), file = doc_file, end = '')
                        if (i % 3) == 2 or i == len(printed) - 1:
                            n = (i % 3) + 1
-                            print('\n|%s' % ('--|' * n), file =  doc_file)
+                            print('\n|%s' % ('---|' * n), file =  doc_file)
                            for j in range(n):
                                part = keys[i - n + j + 1]
                                print('| ![%s](stls/%s) %s' % (part, part.replace('.stl','.png'), '|\n' if j == j - 1 else ''), end = '', file = doc_file)
@@ -312,7 +313,7 @@ def views(target, do_assemblies = None):
                        print('%s %d x %s |' % ('\n|' if not (i % 3) else '', routed[r], r), file = doc_file, end = '')
                        if (i % 3) == 2 or i == len(routed) - 1:
                            n = (i % 3) + 1
-                            print('\n|%s' % ('--|' * n), file =  doc_file)
+                            print('\n|%s' % ('---|' * n), file =  doc_file)
                            for j in range(n):
                                part = keys[i - n + j + 1]
                                print('| ![%s](dxfs/%s) %s' % (part, part.replace('.dxf','.png'), '|\n' if j == j - 1 else ''), end = '', file = doc_file)
@@ -328,7 +329,7 @@ def views(target, do_assemblies = None):
                        print('%s %d x %s |' % ('\n|' if not (i % 3) else '', sub_assemblies[a], a), file = doc_file, end = '')
                        if (i % 3) == 2 or i == len(keys) - 1:
                            n = (i % 3) + 1
-                            print('\n|%s' % ('--|' * n), file =  doc_file)
+                            print('\n|%s' % ('---|' * n), file =  doc_file)
                            for j in range(n):
                                a = keys[i - n + j + 1].replace('_assembly', '_assembled')
                                print('| ![%s](assemblies/%s) %s' % (a, a + '_tn.png', '|\n' if j == j - 1 else ''), end = '', file = doc_file)
--- 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() {
--- 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/extrusion_brackets.scad
+++ b/tests/extrusion_brackets.scad
@@ -0,0 +1,65 @@
+//
+// 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(examples = false) {
+    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);
+
+    if(examples) {
+        translate([20, 60, 10]) rotate([90, 0, 180]) {
+            extrusion_inner_corner_bracket(E20_inner_corner_bracket);
+
+            translate([-eWidth / 2, 0, 0])
+                rotate([-90, 0, 0])
+                    extrusion(E2020, 20, false);
+
+            translate([-eWidth, -eWidth / 2, 0])
+                rotate([0, 90, 0])
+                    extrusion(E2020, 40, false);
+        }
+
+        translate([100, 60, 10]) rotate([90, 0, 180]) {
+            extrusion_corner_bracket_assembly(E20_corner_bracket);
+
+            translate([-eWidth / 2, 0, 0])
+                rotate([-90, 0, 0])
+                    extrusion(E2020, 30, false);
+
+            translate([-eWidth, -eWidth / 2, 0])
+                rotate([0, 90, 0])
+                    extrusion(E2020, 50, false);
+        }
+    }
+}
+
+if($preview)
+    extrusion_brackets(true);
--- 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/nuts.scad
+++ b/tests/nuts.scad
@@ -58,10 +58,10 @@ module nuts() {

        translate([0, 80]) {
            if(n == M3_nut)
-                hammer_nut(M3_hammer_nut);
+                sliding_t_nut(M3_hammer_nut);

            if(n == M4_nut)
-                hammer_nut(M4_hammer_nut);
+                sliding_t_nut(M4_hammer_nut);
       }
    }
 }
--- 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/png/ball_bearings.png
+++ b/tests/png/ball_bearings.png
--- a/tests/png/extrusion_brackets.png
+++ b/tests/png/extrusion_brackets.png
--- a/tests/png/kp_pillow_blocks.png
+++ b/tests/png/kp_pillow_blocks.png
--- a/tests/png/pcb.png
+++ b/tests/png/pcb.png
--- a/tests/png/pcbs.png
+++ b/tests/png/pcbs.png
--- a/tests/png/rails.png
+++ b/tests/png/rails.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/teardrops.png
+++ b/tests/png/teardrops.png
--- a/tests/scs_bearing_blocks.scad
+++ b/tests/scs_bearing_blocks.scad
@@ -22,7 +22,7 @@ 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]]) {
+    layout([for(s = scs_bearing_blocks) scs_size(s).x], 10) {
        part_thickness = 5;
        scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);

--- a/tests/sk_brackets.scad
+++ b/tests/sk_brackets.scad
@@ -20,14 +20,20 @@ include <../core.scad>
 use <../utils/layout.scad>

 include <../vitamins/sk_brackets.scad>
+include <../vitamins/extrusions.scad>

 module sk_brackets() {
-    screws = [M5_cap_screw, M5_cap_screw, M4_cap_screw, M5_cap_screw];
-    nuts = [undef, M5_nut, M4_sliding_t_nut, M5_sliding_t_nut];
-    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]);
+    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, false);
+    }
 }

 if($preview)
-    let($show_threads = true)
-        sk_brackets();
+    sk_brackets();
--- a/tests/teardrops.scad
+++ b/tests/teardrops.scad
@@ -22,25 +22,47 @@ include <../core.scad>
 module teardrops() {
    color(pp1_colour)
        rotate([90, 0, -45])
-            linear_extrude(height = 3)
-                difference() {
-                    square(40);
+            difference() {
+                linear_extrude(height = 3) {
+                    difference() {
+                        square([80, 40]);
+
+                        translate([10, 10])
+                            teardrop(h = 0, r = 3);
+
+                        translate([10, 20])
+                            teardrop_plus(h = 0, r = 3);
+
+                        translate([20, 30])
+                            tearslot(h = 0, r = 3, w = 10);
+
+                        translate([30, 15])
+                            vertical_tearslot(h = 0, r =3, l = 10);
+
+                        translate([20, 10])
+                            semi_teardrop(h = 0, r = 3);
+                    }
+                }
+                translate([40, 0, 1.5]) {
+                    h = 3 + eps;
+                    chamfer = 0.5;

                    translate([10, 10])
-                        teardrop(h = 0, r = 3);
+                        teardrop(h = h, r = 3, chamfer = chamfer);

                    translate([10, 20])
-                        teardrop_plus(h = 0, r = 3);
+                        teardrop_plus(h = h, r = 3, chamfer = chamfer);

                    translate([20, 30])
-                        tearslot(h = 0, r = 3, w = 10);
+                        tearslot(h = h, r = 3, w = 10, chamfer = chamfer);

                    translate([30, 15])
-                        vertical_tearslot(h = 0, r =3, l = 10);
+                        vertical_tearslot(h = h, r =3, l = 10, chamfer = chamfer);

                    translate([20, 10])
-                        semi_teardrop(h = 0, r = 3);
+                        semi_teardrop(h = h, r = 3, chamfer = chamfer);
                }
+            }
 }

 teardrops();
--- a/utils/core/teardrops.scad
+++ b/utils/core/teardrops.scad
@@ -21,45 +21,106 @@
 //! For making horizontal holes that don't need support material.
 //! Small holes can get away without it, but they print better with truncated teardrops.
 //
-module 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
-    render(convexity = 5)
-        extrude_if(h, center)
-           hull() {
-                circle4n(r);
-
-                if(truncate)
-                    translate([0, r / 2])
-                        square([2 * r * (sqrt(2) - 1), r], center = true);
-                else
-                    polygon([[0, 0], [eps, 0], [0, r * sqrt(2)]]);
-            }
-
-module semi_teardrop(h, r, d = undef, center = true) //! A semi teardrop in the positive Y domain
-    render(convexity = 5)
-        extrude_if(h, center)
-            intersection() {
-                R = is_undef(d) ? r : d / 2;
-                teardrop(r = R, h = 0);
-
-                sq = R + 1;
-                translate([-sq, 0])
-                    square([2 * sq, sq]);
-            }
-
-module teardrop_plus(h, r, center = true, truncate = true) //! Slightly bigger teardrop to allow for the 3D printing staircase effect
-    teardrop(h, r + layer_height / 4, center, truncate);
-
-module tearslot(h, r, w, center = true) //! A horizontal slot that doesn't need support material
-    extrude_if(h, center)
+module 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
+    module teardrop_2d(r, truncate) {
        hull() {
-            translate([-w/2,0,0]) teardrop(r = r, h = 0);
-            translate([ w/2,0,0]) teardrop(r = r, h = 0);
+            circle4n(r);
+            if(truncate)
+                translate([0, r / 2])
+                    square([2 * r * (sqrt(2) - 1), r], center = true);
+            else
+                polygon([[0, 0], [eps, 0], [0, r * sqrt(2)]]);
        }
+    }
+
+    render(convexity = 5)
+        extrude_if(h, center)
+            teardrop_2d(r, truncate);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            teardrop_2d(r + chamfer / 2, truncate);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                teardrop_2d(r, truncate);
+    }
+}
+
+module semi_teardrop(h, r, d = undef, center = true, chamfer = 0) { //! A semi teardrop in the positive Y domain
+    module semi_teardrop_2d(r, d) {
+        intersection() {
+            R = is_undef(d) ? r : d / 2;
+            teardrop(r = R, h = 0);
+
+            sq = R + 1;
+            translate([-sq, 0])
+                square([2 * sq, sq]);
+        }
+    }
+
+    render(convexity = 5)
+        extrude_if(h, center)
+            semi_teardrop_2d(r, d);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            semi_teardrop_2d(r + chamfer / 2, d);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                semi_teardrop_2d(r, d);
+    }
+}
+
+module teardrop_plus(h, r, center = true, truncate = true, chamfer = 0) //! Slightly bigger teardrop to allow for the 3D printing staircase effect
+    teardrop(h, r + layer_height / 4, center, truncate, chamfer);
+
+module tearslot(h, r, w, center = true, chamfer = 0) { //! A horizontal slot that doesn't need support material
+    module tearslot_2d(r, w) {
+        hull() {
+            translate([-w / 2, 0]) teardrop(r = r, h = 0);
+            translate([w / 2, 0]) teardrop(r = r, h = 0);
+        }
+    }

-module vertical_tearslot(h, r, l, center = true) //! A vertical slot that doesn't need support material
    extrude_if(h, center)
+        tearslot_2d(r, w);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            tearslot_2d(r + chamfer / 2, w);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                tearslot_2d(r, w);
+    }
+}
+
+module vertical_tearslot(h, r, l, center = true, chamfer = 0) { //! A vertical slot that doesn't need support material
+    module vertical_tearslot_2d(r, l) {
        hull() {
            translate([0,  l / 2]) teardrop(0, r, true);
-            translate([0, -l / 2])
-                circle4n(r);
+            translate([0, -l / 2]) circle4n(r);
        }
+    }
+
+    extrude_if(h, center)
+        vertical_tearslot_2d(r, l);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            vertical_tearslot_2d(r + chamfer / 2, l);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                vertical_tearslot_2d(r, l);
+    }
+}
+
+module teardrop_chamfer(h, center, chamfer) { //! Helper module for adding chamfer to a teardrop
+    if(h && chamfer)
+        translate_z(center ? 0 : h / 2)
+            for(m = [0, 1])
+                mirror([0, 0, m])
+                    translate_z((h - eps ) / 2)
+                        hull()
+                            children();
+}
+
--- a/vitamins/ball_bearings.scad
+++ b/vitamins/ball_bearings.scad
@@ -18,7 +18,9 @@
 //
 BB624 = ["624", 4, 13, 5, "blue"];      // 624 ball bearing for idlers
 BB608 = ["608", 8, 22, 7, "OrangeRed"]; // 608 bearings for wades
+BB6200 = ["6200", 10, 30, 9, "black"];  // 6200 bearings for KP pillow blocks
+BB6201 = ["6201", 12, 32, 10, "black"]; // 6201 bearings for KP pillow blocks

-ball_bearings = [BB624, BB608];
+ball_bearings = [BB624, BB608, BB6200, BB6201];

 use <ball_bearing.scad>
--- a/vitamins/extrusion.scad
+++ b/vitamins/extrusion.scad
@@ -43,7 +43,7 @@ module extrusion_cross_section(type, cornerHole) {
        fillet = extrusion_fillet(type);
        cornerSize = (width-channelWidth)/2;
        cornerSquare = (width-extrusion_channel_width_internal(type))/2;
-        cornerHoleDiameter =extrusion_corner_hole(type);
+        cornerHoleDiameter = extrusion_corner_hole(type);

        translate([-width/2,-width/2]) {
            difference() {
@@ -57,7 +57,7 @@ module extrusion_cross_section(type, cornerHole) {
                    translate([fillet,fillet])
                        square([cornerSquare-fillet,cornerSquare-fillet]);
                }
-                if(cornerHole)
+                if(cornerHole && cornerHoleDiameter > 0)
                    translate([cornerSquare/2,cornerSquare/2])
                        circle(d=cornerHoleDiameter);
            }
@@ -117,12 +117,11 @@ module extrusion_cross_section(type, cornerHole) {
                extrusion_center_section(type);
 }

-module extrusion(type, length, cornerHole = false) { //! Draw the specified extrusion
+module extrusion(type, length, center = true, cornerHole = false) { //! Draw the specified extrusion

-    vitamin(str("extrusion(", type[0], ", ", length, "): Extrusion ", type[0], " x ", length, "mm"));
+    vitamin(str("extrusion(", type[0], ", ", length, arg(cornerHole, false, "cornerHole"), "): Extrusion ", type[0], " x ", length, "mm"));

    color(grey90)
-        linear_extrude(height = length)
+        linear_extrude(length, center = center)
            extrusion_cross_section(type, cornerHole);
 }
-
--- a/vitamins/extrusion_bracket.scad
+++ b/vitamins/extrusion_bracket.scad
@@ -0,0 +1,139 @@
+//
+// 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/>.
+//
+
+//! Brackets for joining extrusions at a corner.
+
+include <NopSCADlib/core.scad>
+include <screws.scad>
+include <nuts.scad>
+
+function extrusion_inner_corner_bracket_size(type)             = type[1]; //! Size of inner bracket
+
+module extrusion_inner_corner_bracket(type, grub_screws = true) { //! Inner corner bracket for extrusion
+    vitamin(str("extrusion_inner_corner_bracket(", type[0], ", ", grub_screws, "): Extrusion inner corner bracket ", type[1].z));
+
+    size = extrusion_inner_corner_bracket_size(type);
+    armLength = size.x;
+    bottomTabOffset = 4;
+    topTabOffset = 10;
+    sizeBottom = [armLength - bottomTabOffset, 6, size.z];
+    sizeTop = [armLength - topTabOffset, 6, size.z];
+    tabSizeY1 = 10;
+    tabSizeY2 = 6;
+    tabSizeZ = 3.25;
+    holeRadius = M4_tap_radius;
+
+    translate([-size.z - 0.75, -size.z - 0.75, 0])
+        rotate([-90, 0, 0]) {
+            color("silver") {
+                translate([(armLength + bottomTabOffset) / 2, 0, tabSizeZ])
+                    rotate([0, 180, 0])
+                        extrusionSlidingNut(sizeBottom, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, (bottomTabOffset - armLength) / 2 + 5);
+                translate([tabSizeZ, 0, (armLength + topTabOffset) / 2])
+                    rotate([0, -90, 0])
+                        extrusionSlidingNut(sizeTop, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius,-(topTabOffset - armLength) / 2 - 5);
+                translate([0, -size.z / 2, 0]) {
+                    cube([bottomTabOffset, size.z, size.z]);
+                    cube([size.z, size.z, topTabOffset]);
+                }
+            }
+            if(grub_screws)
+                not_on_bom() no_explode() {
+                    grubScrewLength = 6;
+                    for(angle = [[0, 0, 0], [0, -90, 180]])
+                        rotate(angle)
+                            translate([armLength - 5, 0, size.z])
+                                screw(M3_grub_screw, grubScrewLength);
+                }
+        }
+}
+
+function extrusion_corner_bracket_size(type)             = type[1]; //! Size of bracket
+function extrusion_corner_bracket_base_thickness(type)   = type[2]; //! Thickness of base of bracket
+function extrusion_corner_bracket_side_thickness(type)   = type[3]; //! Thickness of side of bracket
+function extrusion_corner_bracket_hole_offset(type)      = type[4]; //! Hole offset from corner
+
+module extrusion_corner_bracket(type) { //! Corner bracket for extrusion
+echo(type=type);
+    vitamin(str("extrusion_corner_bracket(", type[0], "): Extrusion corner bracket ", type[1].z));
+
+    eSize = extrusion_corner_bracket_size(type).z;
+    cbSize = extrusion_corner_bracket_size(type).x;
+    baseThickness = extrusion_corner_bracket_base_thickness(type);
+
+    module base() {
+        linear_extrude(baseThickness)
+            difference() {
+                translate([0, -eSize / 2, 0])
+                    square([cbSize, eSize]);
+                hull() {
+                    translate([extrusion_corner_bracket_hole_offset(type) + 1.5, 0, 0])
+                        circle(r = M5_clearance_radius);
+                    translate([extrusion_corner_bracket_hole_offset(type) - 1.5, 0, 0])
+                        circle(r = M5_clearance_radius);
+                }
+            }
+    }
+
+    color("silver") {
+        rotate([90, 0, 90])
+            base();
+        translate([0, baseThickness, 0])
+            rotate([90, 0, 0])
+                base();
+        sideThickness = extrusion_corner_bracket_side_thickness(type);
+        for(z = [-eSize / 2, eSize / 2 - sideThickness]) {
+            translate_z(z) {
+                right_triangle(cbSize, cbSize, sideThickness, center = false);
+                cube([5, cbSize, sideThickness]);
+                cube([cbSize, 5, sideThickness]);
+            }
+        }
+    }
+}
+
+module extrusion_corner_bracket_hole_positions(type) { //! Place children at hole positions
+    for(angle = [ [0, 90, 0], [-90, -90, 0] ])
+        rotate(angle)
+            translate([0, extrusion_corner_bracket_hole_offset(type), extrusion_corner_bracket_base_thickness(type)])
+                children();
+}
+
+module 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(type);
+
+    screw_washer_thickness = washer_thickness(screw_washer(screw_type));
+    nut_washer_type = nut_washer(nut_type);
+    nut_washer_thickness = nut_washer_type ? washer_thickness(nut_washer_type) : 0;
+
+    nut_offset = extrusion_corner_bracket_base_thickness(type) + part_thickness;
+    screw_length = max_screw_depth ? screw_shorter_than(extrusion_corner_bracket_base_thickness(type) + screw_washer_thickness + max_screw_depth)
+                                   : screw_longer_than(nut_offset + screw_washer_thickness + nut_washer_thickness + nut_thickness(nut_type));
+
+    extrusion_corner_bracket_hole_positions(type) {
+        screw_and_washer(screw_type, screw_length);
+        translate_z(-nut_offset)
+            vflip()
+                if(nut_washer_type)
+                    nut_and_washer(nut_type);
+                else
+                    rotate(90)
+                        sliding_t_nut(nut_type);
+    }
+}
--- a/vitamins/extrusion_brackets.scad
+++ b/vitamins/extrusion_brackets.scad
@@ -0,0 +1,29 @@
+//
+// 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/>.
+//
+//
+// Extrusion brackets
+//
+
+E20_inner_corner_bracket  = [ "E20_inner_corner_bracket", [25, 25, 4.5] ];
+
+E20_corner_bracket = [ "E20_corner_bracket", [28, 28, 20], 2, 3, 19.5];
+
+
+use <extrusion_bracket.scad>
+
--- a/vitamins/extrusions.scad
+++ b/vitamins/extrusions.scad
@@ -20,10 +20,10 @@
 // Extrusion
 //
 //                   W   H    d1   d2   s  cw   cwi    t  st  f
-E2020  = [ "E2020", 20, 20,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
-E2040  = [ "E2040", 20, 40,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
-E2060  = [ "E2060", 20, 60,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
-E2080  = [ "E2080", 20, 80,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
+E2020  = [ "E2020", 20, 20,  4.2,   3,  8,  6, 12.0,   2,  2, 1 ];
+E2040  = [ "E2040", 20, 40,  4.2,   3,  8,  6, 12.0,   2,  2, 1 ];
+E2060  = [ "E2060", 20, 60,  4.2,   3,  8,  6, 12.0,   2,  2, 1 ];
+E2080  = [ "E2080", 20, 80,  4.2,   3,  8,  6, 12.0,   2,  2, 1 ];
 E3030  = [ "E3030", 30, 30,  6.8, 4.2, 12,  8, 16.5,   2,  2, 1 ];
 E3060  = [ "E3060", 30, 60,  6.8, 4.2, 12,  8, 16.5,   2,  2, 1 ];
 E4040  = [ "E4040", 40, 40, 10.5, 6.0, 15, 10, 20.0, 5.5,  3, 1 ];
--- a/vitamins/iec.scad
+++ b/vitamins/iec.scad
@@ -25,7 +25,7 @@ use <screw.scad>
 use <nut.scad>
 use <washer.scad>
 use <spade.scad>
-include <inserts.scad>
+use <insert.scad>

 function iec_part(type)     = type[1];  //! Description
 function iec_screw(type)    = type[2];  //! Screw type
--- a/vitamins/inserts.scad
+++ b/vitamins/inserts.scad
@@ -36,8 +36,4 @@ F1BM4   = [ "F1BM4",   8.2, 6.3, 5.6, 4,   5.15, 2.3, 6.0, 5.55 ];

 inserts = [ F1BM2, F1BM2p5, F1BM3, F1BM4 ];

-function screw_insert(screw, i = 0) = let(d = screw_radius(screw) * 2)
-     i >= len(inserts) ? undef
-                       : insert_screw_diameter(inserts[i]) == d ? inserts[i]
-                                                                : screw_insert(screw, i + 1);
 use <insert.scad>
--- a/vitamins/kp_pillow_block.scad
+++ b/vitamins/kp_pillow_block.scad
@@ -0,0 +1,119 @@
+//
+// 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/>.
+
+//
+//! KP pillow block bearings
+//
+include <../core.scad>
+use <../utils/tube.scad>
+
+include <screws.scad>
+use <washer.scad>
+use <ball_bearing.scad>
+
+kp_pillow_block_color = grey70;
+
+function kp_diameter(type)        = type[1]; //! Rod hole diameter
+function kp_hole_offset(type)     = type[2]; //! Rod hole offset
+function kp_size(type)            = [type[3],type[8],type[5]]; //! Size of bracket
+function kp_base_height(type)     = type[7]; //! Height of base containing the bolts
+function kp_screw_separation(type) = type[4]; //! Separation of bolts in the base
+
+
+module kp_pillow_block(type) { //! Draw the KP pillow block
+    vitamin(str("kp_pillow_block(", type[0], "): ", type[0], " pillow block"));
+
+    d = kp_diameter(type);
+    H = kp_hole_offset(type);
+    L = kp_size(type)[0];
+    J = kp_screw_separation(type);
+    A = kp_size(type)[2];// sizeZ, includes protruding center
+    N = type[6];
+    H1 = kp_base_height(type);
+    H0 = kp_size(type)[1];
+    K = type[9];
+    S = type[10];
+    b = type[11];
+    bolthole_radius = type[12];
+
+    color(kp_pillow_block_color)
+        translate([0, -H, 0]) {
+            fillet = 1;
+            squareSizeX = (L - H0) / 2 + fillet;
+            rotate([-90, 0, 0])
+                linear_extrude(H1)
+                    difference() {
+                        union() {
+                            for(i = [-L / 2, L / 2 - squareSizeX])
+                                translate([i, -A / 2])
+                                    rounded_square([squareSizeX, A], fillet, center = false);
+                        }
+                        for(i = [-J / 2, J / 2])
+                            translate([i, 0])
+                                circle(r = bolthole_radius);
+                    }
+
+            translate_z(-A / 2) {
+                for(x = [- L / 2 + squareSizeX - fillet, L / 2 - squareSizeX + fillet - 2])
+                    translate([x, 0, 0])
+                        cube([2, H, A]);
+                translate([0 , H, 0])
+                    tube(H0 / 2, b / 2, A, center = false);
+            }
+            stripThickness = 4;
+            translate([-H0 / 2, 0, -stripThickness / 2])
+                linear_extrude(stripThickness) difference() {
+                    square([H0, H]);
+                    translate([H0 / 2, H])
+                        circle(b / 2);
+                }
+        }
+
+    not_on_bom() no_explode()
+        ball_bearing(type[13]);
+}
+
+module kp_pillow_block_hole_positions(type) { //! Place children at hole positions
+    for(x = [-kp_screw_separation(type), kp_screw_separation(type)])
+        translate([x / 2, kp_base_height(type) - kp_hole_offset(type), 0])
+            rotate([-90,0,0])
+                children();
+}
+
+module kp_pillow_block_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef) { //! Assembly with fasteners in place
+    kp_pillow_block(type);
+
+    screw_washer_thickness = washer_thickness(screw_washer(screw_type));
+    nut_type = is_undef(nut_type) ? screw_nut(screw_type) : nut_type;
+    nut_washer_type = nut_washer(nut_type);
+    nut_washer_thickness = nut_washer_type ? washer_thickness(nut_washer_type) : 0;
+
+    nut_offset = kp_base_height(type) + part_thickness;
+    screw_length = screw_shorter_than(nut_offset + screw_washer_thickness +  nut_thickness(nut_type) + nut_washer_thickness);
+
+    kp_pillow_block_hole_positions(type) {
+        screw_and_washer(screw_type, screw_length);
+
+        translate_z(-nut_offset)
+            vflip()
+                if(nut_washer_type)
+                    nut_and_washer(nut_type);
+                else
+                    sliding_t_nut(nut_type);
+    }
+}
--- a/vitamins/kp_pillow_blocks.scad
+++ b/vitamins/kp_pillow_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/>.
+//
+
+//
+//! KP pillow block bearings
+//
+
+include <screws.scad>
+include <ball_bearings.scad>
+
+//                      d   H   L   J   A    N  H1  H0     K  S  b   bolthole             bearing
+KP08_15 = ["KP08_15",   8, 15, 55, 42, 13, 4.5,  5, 29,  0.0, 0, 22, M4_clearance_radius, BB608];
+KP08_18 = ["KP08_18",   8, 18, 55, 42, 13, 4.5,  5, 29,  0.0, 0, 22, M4_clearance_radius, BB608];
+KP000 =   ["KP000",    10, 18, 67, 53, 16, 7.0,  6, 35, 14.0, 4, 30, M6_clearance_radius, BB6200];
+KP001 =   ["KP001",    12, 19, 71, 56, 16, 7.0,  6, 38, 14.5, 4, 32, M6_clearance_radius, BB6201];
+
+kp_pillow_blocks = [KP08_15, KP08_18, KP000, KP001];
+
+use <kp_pillow_block.scad>
--- a/vitamins/mains_socket.scad
+++ b/vitamins/mains_socket.scad
@@ -23,7 +23,7 @@
 include <../core.scad>
 include <screws.scad>
 include <ring_terminals.scad>
-include <inserts.scad>
+use <insert.scad>

 function mains_socket_width(type)  = type[1]; //! Width at the base
 function mains_socket_depth(type)  = type[2]; //! Depth at the base
--- a/vitamins/nut.scad
+++ b/vitamins/nut.scad
@@ -132,7 +132,8 @@ module wingnut(type) { //! Draw a wingnut
 }

 module sliding_t_nut(type) {
-    vitamin(str("sliding_t_nut(", type[0], "): Nut M", nut_size(type), " sliding T"));
+    hammerNut = type[10];
+    vitamin(str("sliding_t_nut(", type[0], "): Nut M", nut_size(type), hammerNut ? " hammer" : " sliding T"));

    size = [type[7], type[2], nut_thickness(type, true)];
    tabSizeY1 = type[8];
@@ -141,20 +142,7 @@ module sliding_t_nut(type) {
    holeRadius  = nut_size(type) / 2;

    color(grey80)
-        extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius);
-}
-
-module hammer_nut(type) {
-    vitamin(str("hammer_nut(", type[0], "): Nut M", nut_size(type), " hammer"));
-
-    size = [type[7], type[2], nut_thickness(type, true)];
-    tabSizeY1 = type[8];
-    tabSizeY2 = type[9];
-    tabSizeZ = nut_thickness(type);
-    holeRadius  = nut_size(type) / 2;
-
-    color(grey80)
-        extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, 0, hammerNut = true);
+        extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, 0, hammerNut);
 }

 module extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, holeOffset = 0, hammerNut = false) {
--- a/vitamins/nuts.scad
+++ b/vitamins/nuts.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 <washers.scad>
 //
 // Nuts
 //
@@ -51,12 +51,12 @@ toggle_nut  =      ["toggle_nut",       6.1, 9.2, 1.5, 1.5,  M6_washer,     1.5]

 M4_wingnut  =      ["M4_wingnut",       4,  10,   3.75,8,    M4_washer,     0, 22, 10, 6, 3];

-//                                                                              sx  ty1 ty2
-M3_sliding_t_nut = ["M3_sliding_t_nut", 3,   6,   3.0, 4.0,  false,         0,  10,  10,  6];
-M4_sliding_t_nut = ["M4_sliding_t_nut", 4,   6,   3.25,4.5,  false,         0,  11,  10,  6];
-M5_sliding_t_nut = ["M5_sliding_t_nut", 5,   6,   3.25,4.5,  false,         0,  11,  10,  7];
-M3_hammer_nut =    ["M3_hammer_nut",    3,   6,   2.75,4.0,  false,         0, 5.5,  10,  6];
-M4_hammer_nut =    ["M4_hammer_nut",    4,   6,   3.25,4.5,  false,         0, 5.5,  10,  6];
+//                                                                              sx  ty1 ty2 hammer
+M3_sliding_t_nut = ["M3_sliding_t_nut", 3,   6,   3.0, 4.0,  false,         0,  10,  10,  6, false];
+M4_sliding_t_nut = ["M4_sliding_t_nut", 4,   6,   3.25,4.5,  false,         0,  11,  10,  6, false];
+M5_sliding_t_nut = ["M5_sliding_t_nut", 5,   6,   3.25,4.5,  false,         0,  11,  10,  7, false];
+M3_hammer_nut =    ["M3_hammer_nut",    3,   6,   2.75,4.0,  false,         0, 5.5,  10,  6, true];
+M4_hammer_nut =    ["M4_hammer_nut",    4,   6,   3.25,4.5,  false,         0, 5.5,  10,  6, true];

 nuts = [M2_nut, M2p5_nut, M3_nut, M4_nut, M5_nut, M6_nut, M8_nut];

--- a/vitamins/pcb.scad
+++ b/vitamins/pcb.scad
@@ -31,6 +31,7 @@ include <microswitches.scad>

 use <../utils/rounded_cylinder.scad>
 use <../utils/dogbones.scad>
+use <../utils/thread.scad>
 use <../utils/tube.scad>
 use <d_connector.scad>

@@ -79,16 +80,21 @@ module chip(length, width, thickness, colour, cutout = false) //! Draw a coloure
        color(colour)
            translate_z(thickness / 2) cube([length, width, thickness], center = true);

+module usb_Ax1(cutout = false) { //! Draw USB type A single socket
+    usb_A(h = 6.5, v_flange_l = 4.5, bar = 0, cutout = cutout);
+}
+
 module usb_Ax2(cutout = false) { //! Draw USB type A dual socket
+    usb_A(h = 15.6, v_flange_l = 12.15, bar = 3.4, cutout = cutout);
+}
+
+module usb_A(h, v_flange_l, bar, cutout) {
    l = 17;
    w = 13.25;
-    h = 15.6;
    flange_t = 0.4;
    h_flange_h = 0.8;
    h_flange_l = 11;
    v_flange_h = 1;
-    v_flange_l = 12.15;
-    bar = 3.4;
    socket_h = (h - 2 * flange_t - bar) / 2;

    translate_z(h / 2)
@@ -203,11 +209,32 @@ module jack(cutout = false) { //! Draw 3.5mm jack

 module buzzer(height, diameter, colour) { //! Draw PCB buzzer with specified height, diameter and color
    color (colour)
-        tube(or = diameter / 2, ir = height > 5 ? 1 : 0.75, h = height);
+        tube(or = diameter / 2, ir = height > 5 ? 1 : 0.75, h = height, center = false);
    color("white")
        cylinder(d = 2, h = max(height - 3 , 0.5));
 }

+module potentiometer(h1, h2) {
+    color("silver") {
+        baseSize = [12, 11, 6];
+        translate_z(baseSize.z / 2)
+            cube(baseSize, center = true);
+        translate_z(baseSize.z) {
+            cylinder(d = 5, h = h1 - 0.5);
+            if (show_threads)
+                male_metric_thread(6, metric_coarse_pitch(5), length = h1 - 0.5, center = false);
+        }
+        translate_z(baseSize.z + h1 - 0.5)
+            cylinder(d = 3, h = 0.5);
+        translate_z(baseSize.z + h1)
+            linear_extrude(h2)
+                difference() {
+                    circle(d=5);
+                    square([0.75,5], center = true);
+                }
+    }
+}
+
 function hdmi_depth(type)     = type[2]; //! Front to back depth
 function hdmi_width1(type)    = type[3]; //! Inside width at the top
 function hdmi_width2(type)    = type[4]; //! Inside width at the bottom
@@ -574,7 +601,7 @@ module flat_flex(cutout = false) { //! Draw flat flexistrip connector as used on
    }
 }

-module terminal_35(ways) { //! Draw 3.5mm terminal block
+module terminal_35(ways, colour = "blue") { //! Draw 3.5mm terminal block
    vitamin(str("terminal_35(", ways, "): Terminal block ", ways, " way 3.5mm"));
    pitch = 3.5;
    width = ways * pitch;
@@ -592,7 +619,7 @@ module terminal_35(ways) { //! Draw 3.5mm terminal block

    module single() {
        screw_r = 1;
-        color("blue") {
+        color(colour) {
            rotate([90, 0, 0])
                linear_extrude(height = pitch, center = true)
                    polygon(points = [
@@ -710,15 +737,17 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
    function show(comp, part) = (comp[3] == part || comp[3] == str("-",part)) && (!cutouts || angle == undef || angle == comp.z);
    function param(n, default = 0) = len(comp) > n ? comp[n] : default;
    rotate(comp.z) {
-        if(show(comp, "2p54header")) pin_header(2p54header, comp[4], comp[5], param(6), cutouts);
+        if(show(comp, "2p54header")) pin_header(2p54header, comp[4], comp[5], param(6), cutouts, colour = param(7, undef));
        if(show(comp, "2p54boxhdr")) box_header(2p54header, comp[4], comp[5], param(6), cutouts);
-        if(show(comp, "2p54socket")) pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7), param(8, false), cutouts);
+        if(show(comp, "2p54socket")) pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7), param(8, false), cutouts, param(9, undef));
        if(show(comp, "chip")) chip(comp[4], comp[5], comp[6], param(7, grey30), cutouts);
        if(show(comp, "rj45")) rj45(cutouts);
+        if(show(comp, "usb_A")) usb_Ax1(cutouts);
        if(show(comp, "usb_Ax2")) usb_Ax2(cutouts);
        if(show(comp, "usb_uA")) usb_uA(cutouts);
        if(show(comp, "usb_B")) usb_B(cutouts);
        if(show(comp, "buzzer")) buzzer(param(4, 9), param(5, 12), param(6, grey20));
+        if(show(comp, "potentiometer")) potentiometer(param(4, 5), param(5, 9));
        if(show(comp, "jack")) jack(cutouts);
        if(show(comp, "barrel_jack")) barrel_jack(cutouts);
        if(show(comp, "hdmi")) hdmi(hdmi_full, cutouts);
@@ -728,10 +757,11 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
        if(show(comp, "D_plug")) if(!cutouts) translate_z(d_pcb_offset(comp[4])) d_plug(comp[4], pcb = true);
        if(show(comp, "molex_hdr")) if(!cutouts) molex_254(comp[4]);
        if(show(comp, "jst_xh")) if(!cutouts) jst_xh_header(jst_xh_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
-        if(show(comp, "term254")) if(!cutouts) green_terminal(gt_2p54,comp[4], comp[5]);
-        if(show(comp, "gterm35")) if(!cutouts) green_terminal(gt_3p5, comp[4], comp[5]);
-        if(show(comp, "gterm635")) if(!cutouts) green_terminal(gt_6p35, comp[4], comp[5]);
-        if(show(comp, "term35")) if(!cutouts) terminal_35(comp[4]);
+        if(show(comp, "term254")) if(!cutouts) green_terminal(gt_2p54,comp[4], comp[5], param(6,"lime"));
+        if(show(comp, "gterm")) if(!cutouts) green_terminal(comp[4], comp[5], comp[6], param(7,"lime"));
+        if(show(comp, "gterm35")) if(!cutouts) green_terminal(gt_3p5, comp[4], comp[5], param(6,"lime"));
+        if(show(comp, "gterm635")) if(!cutouts) green_terminal(gt_6p35, comp[4], comp[5], param(6,"lime"));
+        if(show(comp, "term35")) if(!cutouts) terminal_35(comp[4], param(5,"blue"));
        if(show(comp, "transition")) if(!cutouts) idc_transition(2p54header, comp[4], comp[5]);
        if(show(comp, "block"))
            color(comp[7]) if(!cutouts) translate_z(comp[6] / 2) cube([comp[4], comp[5], comp[6]], center = true);
--- a/vitamins/pcbs.scad
+++ b/vitamins/pcbs.scad
@@ -339,18 +339,19 @@ PERF74x51 = ["PERF74x51", "Perfboard 74 x 51mm", 74, 51, 1.0, 0, 3.0, 0, "sienna

 PSU12V1A = ["PSU12V1A", "PSU 12V 1A", 67, 31, 1.7, 0, 3.9, 0, "green", true, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]], [], []];

-include <microswitches.scad>
-
 RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
-    40.0, 16.0, 1.6, 0, 2.54, 0, "red",  false,
+    40.0, 16.0, 1.6, 0.5, 2.54, 0, "red",  false,
    [
        [2, 2], [2, 13.5], [17, 13.5], [36, 13.5]
    ],
    [
+        [ 12,    8,   -90, "jst_xh", 3, true, "white", "silver"],
        [ 26.5, 12.75,  0, "microswitch", small_microswitch],
+        [ 27.5, 17.5,  15, "chip", 15, 0.5, 4.5, "silver"],
    ],
    []];

-pcbs = [ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591, RAMPSEndstop];
+
+pcbs = [RAMPSEndstop, ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591];

 use <pcb.scad>
--- a/vitamins/pin_header.scad
+++ b/vitamins/pin_header.scad
@@ -43,8 +43,9 @@ module pin(type, length = undef) { //! Draw a header pin
            }
 }

-module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cutout = false) { //! Draw pin header
+module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cutout = false, colour) { //! Draw pin header
    pitch =  hdr_pitch(type);
+    base_colour = colour ? colour : hdr_base_colour(type);
    h = pitch;
    ra_offset = 2.4;
    width = pitch * rows;
@@ -79,7 +80,7 @@ module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cu
            }
            translate([0, right_angle ? -ra_offset - pitch / 2 : 0, right_angle ? width / 2 : 0])
                rotate([right_angle ? 90 : 0, 0, 0])
-                    color(hdr_base_colour(type))
+                    color(base_colour)
                        linear_extrude(height = h)
                            for(x = [0 : cols - 1], y = [0 : rows - 1])
                                translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), pitch / 2])
@@ -160,18 +161,19 @@ module idc_transition(type, cols = 5, skip = [], cutout = false) { //! Draw IDC
    }
 }

-module pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt = false, cutout = false) { //! Draw pin socket
+module pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt = false, cutout = false, colour) { //! Draw pin socket
    pitch = hdr_pitch(type);
    length = pitch * cols + 0.5;
    width = pitch * rows - 0.08;
    depth = height ? height : hdr_socket_depth(type);
+    base_colour = colour ? colour : hdr_base_colour(type);
    ra_offset = 1.5;
    if(cutout)
        ;
    else {
        vitamin(str("pin_socket(", type[0], ", ", cols, ", ", rows, arg(right_angle, false, "right_angle"), arg(height, 0, "height"), arg(smt, false, "smt"),
                               "): Pin socket ", cols, " x ", rows, right_angle ? " right_angle" : ""));
-        color(hdr_base_colour(type))
+        color(base_colour)
            translate([0, right_angle ? -ra_offset - pitch / 2 : 0, right_angle ? width / 2 : 0])
                rotate([right_angle ? 90 : 0, 0, 0])
                    translate_z(depth / 2)
--- a/vitamins/rail.scad
+++ b/vitamins/rail.scad
@@ -133,20 +133,36 @@ module rail(type, length) { //! Draw the specified rail
    vitamin(str("rail(", type[0], ", ", length, "): Linear rail ", type[0], " x ", length, "mm"));

    color(grey90) {
-        linear_extrude(height = height - rail_bore_depth(type)) difference() {
+        linear_extrude(height - rail_bore_depth(type)) difference() {
            square([length, width], center = true);
-
            rail_hole_positions(type, length)
                 circle(d = rail_hole(type));
        }

-        translate_z(rail_height(type) - rail_bore_depth(type))
-            linear_extrude(height = rail_bore_depth(type)) difference() {
-                square([length, width], center = true);
+        translate_z(rail_height(type) - rail_bore_depth(type)) {
+            h1 = rail_bore_depth(type) > 2 ? rail_bore_depth(type) / 3 : rail_bore_depth(type) / 2;
+            h0 = rail_bore_depth(type) > 2 ? (rail_bore_depth(type) - h1) / 2 : 0;
+            h2 = rail_bore_depth(type) - h1 - h0;

+            linear_extrude(h0) difference() {
+                square([length, width], center = true);
                rail_hole_positions(type, length)
                     circle(d = rail_bore(type));
            }
+            translate_z(h0)
+                linear_extrude(h1) difference() {
+                    w1 = max(width - 2, rail_bore(type));
+                    square([length, w1], center = true);
+                    rail_hole_positions(type, length)
+                        circle(d = rail_bore(type));
+                }
+            translate_z(h0 + h1)
+                linear_extrude(h2) difference() {
+                    square([length, width], center = true);
+                    rail_hole_positions(type, length)
+                        circle(d = rail_bore(type));
+                }
+        }
    }
 }

--- a/vitamins/rod.scad
+++ b/vitamins/rod.scad
@@ -19,6 +19,8 @@

 //
 //! 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.
 //
 include <../core.scad>
 use <../utils/thread.scad>
--- a/vitamins/screw.scad
+++ b/vitamins/screw.scad
@@ -25,6 +25,7 @@ include <../core.scad>
 use <washer.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/thread.scad>
+include <inserts.scad>

 function screw_head_type(type)        = type[2];     //! Head style hs_cap, hs_pan, hs_cs, hs_hex, hs_grub, hs_cs_cap, hs_dome
 function screw_radius(type)           = type[3] / 2; //! Nominal radius
@@ -58,6 +59,11 @@ function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns longes

 function screw_smaller_than(d) = d >= 2.5 && d < 3 ? 2.5 : floor(d); // Largest diameter screw less than or equal to specified diameter

+function screw_insert(screw, i = 0) = let(d = screw_radius(screw) * 2)
+     i >= len(inserts) ? undef
+                       : insert_screw_diameter(inserts[i]) == d ? inserts[i]
+                                                                : screw_insert(screw, i + 1);
+
 module screw(type, length, hob_point = 0, nylon = false) { //! Draw specified screw, optionally hobbed or nylon
    description = str("Screw ", nylon ? "Nylon " : "", type[1], length < 10 ? " x  " : " x ", length, "mm", hob_point ? str(", hobbed at ", hob_point) : "");
    vitamin(str("screw(", type[0], "_screw, ", length, arg(hob_point, 0, "hob_point"), arg(nylon, false, "nylon"), "): ", description));
--- a/vitamins/screws.scad
+++ b/vitamins/screws.scad
@@ -20,7 +20,6 @@
 //
 // Screws
 //
-include <washers.scad>
 include <nuts.scad>

 No2_pilot_radius = 1.7 / 2;       // self tapper into ABS
@@ -119,7 +118,7 @@ screw_lists = [

 use <screw.scad>

-screws = [for(list = screw_lists) for(screw = list) screw];
+screws = [for(list = screw_lists) each list];

 function find_screw(type, size, i = 0) =
    i >= len(screws) ? undef
--- a/vitamins/scs_bearing_block.scad
+++ b/vitamins/scs_bearing_block.scad
@@ -18,15 +18,15 @@
 //

 //
-// SCSnUU and SCSnLUU bearing blocks
+//! SCSnUU and SCSnLUU bearing blocks
 //


-include <NopSCADlib/core.scad>
-use <NopSCADlib/vitamins/screw.scad>
-use <NopSCADlib/vitamins/nut.scad>
-use <NopSCADlib/vitamins/washer.scad>
-use <NopSCADlib/vitamins/linear_bearing.scad>
+include <../core.scad>
+use <screw.scad>
+use <nut.scad>
+use <washer.scad>
+use <linear_bearing.scad>

 function scs_size(type)                 = [type[4],type[6],type[5]]; //! Size of scs bracket bounding block
 function scs_hole_offset(type)          = type[2]; //! Offset of bearing hole from base of block
--- a/vitamins/scs_bearing_blocks.scad
+++ b/vitamins/scs_bearing_blocks.scad
@@ -21,9 +21,8 @@
 // SCS bearing blocks
 //

-include <NopSCADlib/core.scad>
-include <NopSCADlib/vitamins/screws.scad>
-include <NopSCADlib/vitamins/linear_bearings.scad>
+include <screws.scad>
+include <linear_bearings.scad>

 //                        T  h   E   W   L   F     G   B     C   K     S1            S2   L1  LB
 SCS6UU    = ["SCS6UU",    6,  9, 15, 30, 25, 18,   15, 20,   15, 5,    M4_cap_screw, 3.4,  8, LM6UU];
--- a/vitamins/sk_bracket.scad
+++ b/vitamins/sk_bracket.scad
@@ -1,5 +1,5 @@
 //
-// NopSCADlib Copyright Chris Palmer 2018
+// NopSCADlib Copyright Chris Palmer 2020
 // nop.head@gmail.com
 // hydraraptor.blogspot.com
 //
@@ -100,7 +100,7 @@ module sk_bracket_hole_positions(type) { //! Place children at hole positions
                children();
 }

-module sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef) { //! Assembly with fasteners in place
+module 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(type);

    screw_type = is_undef(screw_type) ? scs_screw(type) : screw_type;
@@ -110,16 +110,15 @@ module sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw,
    nut_washer_thickness = nut_washer_type ? washer_thickness(nut_washer_type) : 0;

    nut_offset = sk_base_height(type) + part_thickness;
-    screw_length = nut_washer_type ? screw_longer_than(nut_offset + screw_washer_thickness + nut_washer_thickness + nut_thickness(nut_type))
-                                   : screw_shorter_than(nut_offset + screw_washer_thickness + nut_thickness(nut_type) + 2);
-
+    screw_length = max_screw_depth ? screw_shorter_than(sk_base_height(type) + screw_washer_thickness + max_screw_depth)
+                                   : screw_longer_than(nut_offset + screw_washer_thickness + nut_washer_thickness + nut_thickness(nut_type));
    sk_bracket_hole_positions(type) {
        screw_and_washer(screw_type, screw_length);
        translate_z(-nut_offset)
            vflip()
-                if(!nut_washer_type)
-                    sliding_t_nut(nut_type);
-                else
+                if(nut_washer_type)
                    nut_and_washer(nut_type);
+                else
+                    sliding_t_nut(nut_type);
    }
 }
--- a/vitamins/sk_brackets.scad
+++ b/vitamins/sk_brackets.scad
@@ -1,5 +1,5 @@
 //
-// NopSCADlib Copyright Chris Palmer 2018
+// NopSCADlib Copyright Chris Palmer 2020
 // nop.head@gmail.com
 // hydraraptor.blogspot.com
 //
@@ -21,8 +21,7 @@
 // SK shaft support brackets
 //

-include <../core.scad>
-include <../vitamins/screws.scad>
+include <screws.scad>

 //               d   h   E   W   L   F    G   P   B    S  bolthole
 SK8  = ["SK8",   8, 20, 21, 42, 14, 32.8, 6, 18, 32, 5.5, M5_clearance_radius];
@@ -32,4 +31,3 @@ SK16 = ["SK16", 16, 27, 24, 48, 16, 44.0, 8, 25, 38, 5.5, M5_clearance_radius];

 sk_brackets = [SK8,  SK10, SK12, SK16];
 use <sk_bracket.scad>
-
--- a/vitamins/spring.scad
+++ b/vitamins/spring.scad
@@ -19,6 +19,8 @@

 //
 //! 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.
 //
 include <../core.scad>

@@ -64,7 +66,7 @@ function comp_spring(type, l = 0) = //! Calculate the mesh for spring
        profile = circle_points(wire_d / 2 - eps, $fn = 16)
       ) concat(type, [concat(sweep(path, profile), [l])]);

-module comp_spring(type, l = 0) { //! Draw specified spring, l can be set to specify the compressed length.
+module comp_spring(type, l = 0, center = false) { //! Draw specified spring, l can be set to specify the compressed length.
    length = spring_length(type);
    closed = spring_closed(type);
    od = spring_od(type);
@@ -79,14 +81,17 @@ module comp_spring(type, l = 0) { //! Draw specified spring, l can be set to spe

    mesh = len(type) > 9 ? spring_mesh(type) : spring_mesh(comp_spring(type, l));
    assert(l == mesh[2], "can't change the length of a pre-generated spring");
-    color(spring_colour(type))
-        if(ground)
-            clip(zmin = 0, zmax = h)
+    len = l ? l : length;
+    translate_z(center ? - len / 2 : 0) {
+        color(spring_colour(type))
+            if(ground)
+                clip(zmin = 0, zmax = h)
+                    polyhedron(mesh[0], mesh[1]);
+            else
                polyhedron(mesh[0], mesh[1]);
-        else
-            polyhedron(mesh[0], mesh[1]);

-    if($children)
-        translate_z(l)
-            children();
+        if($children)
+            translate_z(len)
+                children();
+    }
 }
--- a/vitamins/veroboard.scad
+++ b/vitamins/veroboard.scad
@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 use <pcb.scad>
-include <../vitamins/screws.scad>
+include <screws.scad>

 function vero_assembly(type)       = type[1];   //! Name of the assembly
 function vero_holes(type)          = type[2];   //! Number of holes in each strip
Author	SHA1	Message	Date
Chris Palmer	6470f1b004	Extrusions now default to centered. New parts added to the libtest picture. Extrusion bracket examples rotated for clearer view and made optional. Added missing description for scs_bearing_blocks. Extrusion no longer shows centre parameter but does show no default cornerHole.	2020-02-27 17:55:03 +00:00
Chris Palmer	29ba402530	Updated image	2020-02-27 11:22:02 +00:00
Chris Palmer	aed4a699f2	Merge branch 'kp_pillow_block_fix' of https://github.com/martinbudden/NopSCADlib into martinbudden-kp_pillow_block_fix	2020-02-27 11:18:54 +00:00
Chris Palmer	10b846c0d5	Updated images	2020-02-27 11:17:07 +00:00
Martin Budden	2de479d691	Fixed incomplete webbing on side of kp_pillow_block.	2020-02-27 10:44:00 +00:00
Chris Palmer	054dab5025	Merge branch 'linear_rail_groove' of https://github.com/martinbudden/NopSCADlib into martinbudden-linear_rail_groove	2020-02-27 10:35:09 +00:00
Chris Palmer	b559319b03	Ensured all Markdown table heading markers have at least three dashes.	2020-02-27 10:15:37 +00:00
Martin Budden	a487ca0f20	Added groove to linear_rail.	2020-02-27 09:47:36 +00:00
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
Martin Budden	4ff6c7d0a8	Unified tnuts and hammer nuts.	2020-02-24 17:40:39 +00:00
Martin Budden	ad3e8d85af	Added scad/printed to stl search path.	2020-02-23 17:54:28 +00:00