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.

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) 
 
 

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();

readme.md

@@ -28,27 +28,28 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <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 = "#Extrusions">Extrusions</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 = "#Fans">Fans</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 = "#Fuseholder">Fuseholder</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 = "#Geared_steppers">Geared_steppers</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 = "#Green_terminals">Green_terminals</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 = "#Hot_ends">Hot_ends</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 = "#Hygrometer">Hygrometer</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 = "#Iecs">Iecs</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 = "#Inserts">Inserts</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 = "#Jack">Jack</a> </td><td> <a href = "#Spools">Spools</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Kp_pillow_blocks">Kp_pillow_blocks</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 = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Pcb_mount">Pcb_mount</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Scs_bearing_blocks">Scs_bearing_blocks</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Sk_brackets">Sk_brackets</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Spools">Spools</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Springs">Springs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Kp_pillow_blocks">Kp_pillow_blocks</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Modules">Modules</a> </td><td></td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -589,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>
 
 ---
@@ -620,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)
 
@@ -1959,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 |
@@ -1980,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>
@@ -2425,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.
 
@@ -2552,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.
@@ -2836,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.
 
@@ -2864,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)
 

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 = ''

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. |

scripts/views.py

@@ -240,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]:
@@ -283,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)
@@ -297,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)
@@ -313,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)
@@ -329,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)

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);

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);
 

tests/sk_brackets.scad

@@ -31,10 +31,9 @@ module sk_brackets() {
         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);
+                extrusion($i < 2 ? E2020 : E3030, 20, false);
     }
 }
 
 if($preview)
-    let($show_threads = true)
-        sk_brackets();
+    sk_brackets();

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);
 }
-

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);
+    }
+}

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>
+

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 ];

vitamins/kp_pillow_block.scad

@@ -72,13 +72,16 @@ module kp_pillow_block(type) { //! Draw the KP pillow block
                 for(x = [- L / 2 + squareSizeX - fillet, L / 2 - squareSizeX + fillet - 2])
                     translate([x, 0, 0])
                         cube([2, H, A]);
-                stripLength = J - 2 * bolthole_radius;
-                stripThickness = 4;
-                translate([-stripLength / 2, 0, (H1 + stripThickness) / 2])
-                    cube([stripLength, H1, stripThickness]);
                 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()

vitamins/pcbs.scad

@@ -352,6 +352,6 @@ RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
     []];
 
 
-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>

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));
+                }
+        }
     }
 }
 

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>

vitamins/scs_bearing_block.scad

@@ -18,7 +18,7 @@
 //
 
 //
-// SCSnUU and SCSnLUU bearing blocks
+//! SCSnUU and SCSnLUU bearing blocks
 //
 
 

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();
+    }
 }