Merge branch 'jeroenrnl-SBR'

open_bearing_theta() now derived from open_bearing_width().
Moved things around for better test images.
2025-09-06 05:12:54 +02:00 · 2023-07-22 17:35:34 +01:00 · 2023-07-22 17:34:22 +01:00 · 2023-07-22 16:37:35 +01:00 · 2023-07-22 16:36:11 +01:00 · 2023-07-22 16:35:50 +01:00
42 changed files with 895 additions and 176 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,34 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.


+#### [v21.5.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.5.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.5.0...v21.5.1 "diff with v21.5.0")
+*   2023-06-29 [`5899ffe`](https://github.com/nophead/NopSCADlib/commit/5899ffe88f7952108ce928a5a6188b4aad5044c5 "show commit") [C.](# "Chris") More typos in comments.
+
+*   2023-06-28 [`b051311`](https://github.com/nophead/NopSCADlib/commit/b05131145caf500cd9198b1e9b9fafc69506b50f "show commit") [C.](# "Chris") Comment typo.
+
+### [v21.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.4.1...v21.5.0 "diff with v21.4.1")
+*   2023-05-08 [`c3f3d62`](https://github.com/nophead/NopSCADlib/commit/c3f3d629b1ff79d40cc5ad3efcb33e940d6c8056 "show commit") [C.P.](# "Chris Palmer") Added PanelDue V3.
+
+*   2023-05-08 [`c7ba052`](https://github.com/nophead/NopSCADlib/commit/c7ba052ccf24d764aa6460d4559e92596c9e4cf4 "show commit") [C.P.](# "Chris Palmer") Added SMD QFP package.
+
+*   2023-05-08 [`c2c5f50`](https://github.com/nophead/NopSCADlib/commit/c2c5f509860b909ca8fca5ffcc65dbef2f7177c5 "show commit") [C.P.](# "Chris Palmer") Can now used `smd_res()` to draw chokes.
+
+*   2023-05-08 [`d0ae8ca`](https://github.com/nophead/NopSCADlib/commit/d0ae8ca216108f53c9b8e60896ea9b59b845b7e0 "show commit") [C.P.](# "Chris Palmer") Added the ability to have more than one grid on a PCB.
+
+*   2023-05-08 [`e81dcfd`](https://github.com/nophead/NopSCADlib/commit/e81dcfdbd8163ce8e2db450f3a20c296c21327a8 "show commit") [C.P.](# "Chris Palmer") Added right angle option to box headers.
+
+#### [v21.4.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.4.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.4.0...v21.4.1 "diff with v21.4.0")
+*   2023-05-08 [`06a286d`](https://github.com/nophead/NopSCADlib/commit/06a286dc989e9cc8cf7918049cd16a862b1a9b94 "show commit") [C.P.](# "Chris Palmer") Fixed missing BOM entry for JST connectors.
+Fixed default colour for JST connectors.
+Corrected BOM entry to show right angle options on Molex and pin headers.
+
+*   2023-05-08 [`f5496c3`](https://github.com/nophead/NopSCADlib/commit/f5496c373a1ab8ae47d07cc0a52d76e4299876cc "show commit") [C.P.](# "Chris Palmer") Fixed typo in `smd_diode(DO214AC)` package name.
+
+### [v21.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.3.1...v21.4.0 "diff with v21.3.1")
+*   2023-05-01 [`5e24a32`](https://github.com/nophead/NopSCADlib/commit/5e24a32a0b422e8032c3c5d377c1a756ff6f1022 "show commit") [C.P.](# "Chris Palmer") Added ESP32 camera.
+
+*   2023-05-01 [`fbd8d8c`](https://github.com/nophead/NopSCADlib/commit/fbd8d8c7cdff0bd7de0d42aa74bf0ab6551c205b "show commit") [C.P.](# "Chris Palmer") Added `smd_coax`
+
 #### [v21.3.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.3.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.3.0...v21.3.1 "diff with v21.3.0")
 *   2023-04-29 [`b1592f5`](https://github.com/nophead/NopSCADlib/commit/b1592f51d4b16a125d9b28edae56f758fcac2f02 "show commit") [C.P.](# "Chris Palmer") Fixed `bom.py,` `views.py` and `tests.py` so that vitamin descriptions can contain more than one colon.

@@ -61,8 +89,6 @@ This changelog is generated by `changelog.py` using manually added semantic vers

 *   2023-02-01 [`abf1f1a`](https://github.com/nophead/NopSCADlib/commit/abf1f1ab3f3eddc2f274df649e8481a4117901eb "show commit") [C.P.](# "Chris Palmer") PCB blocks can now have rounded edges for more realistic cans.

-*   2023-02-01 [`df06d1f`](https://github.com/nophead/NopSCADlib/commit/df06d1f57fff64cd6da20684f8371da204f69a82 "show commit") [C.P.](# "Chris Palmer") Updated changelog.
-
 ### [v20.23.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.23.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.22.0...v20.23.0 "diff with v20.22.0")
 *   2023-02-01 [`470d6d6`](https://github.com/nophead/NopSCADlib/commit/470d6d6216b1cef8ce6cafd4b14300edb62eac4a "show commit") [C.P.](# "Chris Palmer") Started radial components with crystals.

@@ -104,7 +130,7 @@ This changelog is generated by `changelog.py` using manually added semantic vers
 *   2023-01-24 [`77e948f`](https://github.com/nophead/NopSCADlib/commit/77e948f43c911442211bcbf6d1b1520184d2c70b "show commit") [C.P.](# "Chris Palmer") Added can bus connectors to OpenGrab model.
 Tweaked some PCB component positions.

-*   2023-01-24 [`543cdb4`](https://github.com/nophead/NopSCADlib/commit/543cdb4e01d38308a06d4368ebabadb85c696567 "show commit") [C.P.](# "Chris Palmer") Incresed the clearance of holes made for pin header.
+*   2023-01-24 [`543cdb4`](https://github.com/nophead/NopSCADlib/commit/543cdb4e01d38308a06d4368ebabadb85c696567 "show commit") [C.P.](# "Chris Palmer") Increased the clearance of holes made for pin header.

 ### [v20.19.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.19.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.18.1...v20.19.0 "diff with v20.18.1")
 *   2023-01-12 [`ebd50ba`](https://github.com/nophead/NopSCADlib/commit/ebd50bae535283b94b310ee74c9b98b2e3b7f8be "show commit") [C.P.](# "Chris Palmer") Added SMD diodes, inductors and potentiometers.
@@ -139,8 +165,6 @@ Client code now calls `dxf()` so that the generated files can be used to speed u

 * Change comment about nut sizes from radius to diameter.

-*   2022-09-29 [`d95e1e6`](https://github.com/nophead/NopSCADlib/commit/d95e1e64edba4ef51852a1e72d00497154c80c88 "show commit") [C.](# "Chris") Udated changelog.
-
 ### [v20.14.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.14.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.13.0...v20.14.0 "diff with v20.13.0")
 *   2022-09-29 [`f1737d2`](https://github.com/nophead/NopSCADlib/commit/f1737d257b54957772ab6faea102f8ddb829119b "show commit") [C.](# "Chris") Updated images and readme.

@@ -540,7 +564,7 @@ Lead length removed from TO220 and TO247 vitamin string.
 Mainly text spacing changes.

 *   2021-09-27 [`9b5ec6a`](https://github.com/nophead/NopSCADlib/commit/9b5ec6af1aba313df6812a5313470ebb7e8fbdd7 "show commit") [C.P.](# "Chris Palmer") Fixed new `rounded_polygon` to work with last OpenSCAD release.
-Trainling commas in `let()`.
+Trailing commas in `let()`.

 *   2021-09-27 [`50958b0`](https://github.com/nophead/NopSCADlib/commit/50958b064d5a6d5ca3fd6525a8c3d3a2c5b20199 "show commit") [C.P.](# "Chris Palmer") Added `$show_plugs` to show crude reprentations of housings on `pin_headers` and Molex KK headers.

@@ -1202,7 +1226,7 @@ Updated pics and readme.
 *   2020-12-28 [`f6f4fcc`](https://github.com/nophead/NopSCADlib/commit/f6f4fcc7e84e40669446708e2352ea68c49b7961 "show commit") [M.B.](# "Martin Budden") Added `M5_cs_cap` screw

 #### [v10.21.1](https://github.com/nophead/NopSCADlib/releases/tag/v10.21.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v10.21.0...v10.21.1 "diff with v10.21.0")
-*   2020-12-28 [`ba586b3`](https://github.com/nophead/NopSCADlib/commit/ba586b368582db163af143ebb60afed270f77b1c "show commit") [C.P.](# "Chris Palmer") Example images update to match new contersink screws and teardrops.
+*   2020-12-28 [`ba586b3`](https://github.com/nophead/NopSCADlib/commit/ba586b368582db163af143ebb60afed270f77b1c "show commit") [C.P.](# "Chris Palmer") Example images update to match new countersink screws and teardrops.

 ### [v10.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v10.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v10.20.1...v10.21.0 "diff with v10.20.1")
 *   2020-12-28 [`8d22940`](https://github.com/nophead/NopSCADlib/commit/8d22940506df525ac52ef6f8a00ea03661f3b682 "show commit") [C.P.](# "Chris Palmer") Project blurb can now be split with into sections with markdown horizontal rules
@@ -1480,7 +1504,7 @@ Reverted the jst header pin position change.

 *   2020-09-20 [`933fea6`](https://github.com/nophead/NopSCADlib/commit/933fea687c54d7d8ec48fe92aae12ffca0666789 "show commit") [C.P.](# "Chris Palmer") Removed debug code

-*   2020-09-19 [`a7803b1`](https://github.com/nophead/NopSCADlib/commit/a7803b1efbf92c5e27f3171d7e2a92634fa2d84f "show commit") [C.P.](# "Chris Palmer") Improved numerical accuarcy of catenary calculations.
+*   2020-09-19 [`a7803b1`](https://github.com/nophead/NopSCADlib/commit/a7803b1efbf92c5e27f3171d7e2a92634fa2d84f "show commit") [C.P.](# "Chris Palmer") Improved numerical accuracy of catenary calculations.

 ### [v9.7.0](https://github.com/nophead/NopSCADlib/releases/tag/v9.7.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v9.6.1...v9.7.0 "diff with v9.6.1")
 *   2020-09-19 [`1255e71`](https://github.com/nophead/NopSCADlib/commit/1255e712719ce66fd3b231e5c212ea69b0bb9f1c "show commit") [C.P.](# "Chris Palmer") Added catenary curves.
--- a/libtest.png
+++ b/libtest.png
--- a/libtest.scad
+++ b/libtest.scad
@@ -96,6 +96,7 @@ use <tests/rails.scad>
 use <tests/ring_terminals.scad>
 use <tests/rockers.scad>
 use <tests/rod.scad>
+use <tests/SBR_rails.scad>
 use <tests/screws.scad>
 use <tests/sealing_strip.scad>
 use <tests/servo_motors.scad>
@@ -144,7 +145,7 @@ x1 = x0 + 110;
 x2 = x1 + 90;
 x3 = x2 + 130;
 x4 = x3 + 200;
-x5 = 850;
+x5 = 900;
 x6 = x5 + 150;

 cable_grommets_y = 0;
@@ -233,8 +234,8 @@ tubings_y = sealing_strip_y + 20;
 pillars_y = tubings_y + 20;
 ball_bearings_y = pillars_y + 40;
 pulleys_y = ball_bearings_y + 40;
-leadnuts_y = pulleys_y + 60;
-linear_bearings_y = leadnuts_y + 50;
+leadnuts_y = pulleys_y + 35;
+linear_bearings_y = leadnuts_y + 65;
 steppers_y = linear_bearings_y + 110;
 sheets_y = steppers_y + 55;
 pcbs_y = sheets_y + 60;
@@ -289,7 +290,9 @@ translate([x0 + 120, leadnuts_y])
    leadnuthousings();

 translate([x0, linear_bearings_y]) {
-    linear_bearings();
+    translate([0, -30])
+        linear_bearings();
+
    rods();
 }

@@ -397,7 +400,7 @@ blowers_y = ssrs_y + 60;
 hot_ends_y = blowers_y + 100;
 batteries_y = hot_ends_y + 55;
 panel_meters_y = batteries_y + 70;
-extrusions_y = panel_meters_y + 80;
+extrusions_y = panel_meters_y + 100;

 translate([x3, veroboard_y])
    veroboard_test();
@@ -465,11 +468,11 @@ rails_y = belts_y + 200;
 extrusion_brackets_y = rails_y + 250;
 sk_brackets_y = extrusion_brackets_y + 80;
 kp_pillow_blocks_y = sk_brackets_y + 60;
-scs_bearing_blocks_y = kp_pillow_blocks_y + 60;
+bearing_blocks_y = kp_pillow_blocks_y + 60;
 box_sections_y = batteries_y;
-BLDC_y = scs_bearing_blocks_y + 120;
-pot_y = BLDC_y + 40;
-cable_strip_y = pot_y + 50;
+BLDC_y = bearing_blocks_y + 180;
+pot_y = bearing_blocks_y;
+cable_strip_y = sheets_y + 30;

 translate([0, transformers_y])
    servo_motors();
@@ -484,9 +487,13 @@ translate([x4 + 200, belts_y + 58]) {
 translate([x4 + 175, belts_y, -20])
    drag_chains();

-translate([x4, rails_y + 130])
+translate([x4, rails_y + 130]) {
    rails();

+    translate([305, 0])
+        sbr_rails();
+}
+
 translate([x4, cable_strip_y])
    cable_strips();

@@ -502,8 +509,8 @@ translate([x4, extrusion_brackets_y])
 translate([x1, swiss_clips_y + 50])
    shaft_couplings();

-translate([x4, scs_bearing_blocks_y])
-    scs_bearing_blocks();
+translate([x4, bearing_blocks_y])
+    bearing_blocks();

 translate([x4, BLDC_y])
    bldc_motors();
--- a/readme.md
+++ b/readme.md
@@ -26,29 +26,29 @@ A list of changes classified as breaking, additions or fixes is maintained in [C
 <tr><td> <a href = "#BLDC_motors">BLDC_motors</a> </td><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Cable_clip">Cable_clip</a> </td><td> <a href = "#Catenary">Catenary</a> </td><td> <a href = "#Global">Global</a> </td></tr>
 <tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#LDRs">LDRs</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Core_xy">Core_xy</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
 <tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#LED_meters">LED_meters</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Camera_housing">Camera_housing</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#Bearing_blocks">Bearing_blocks</a> </td><td> <a href = "#LEDs">LEDs</a> </td><td> <a href = "#SK_brackets">SK_brackets</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#SMDs">SMDs</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Gears">Gears</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#SSRs">SSRs</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td></td></tr>
-<tr><td> <a href = "#Box_sections">Box_sections</a> </td><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Horiholes">Horiholes</a> </td><td></td></tr>
-<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Magnets">Magnets</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Drag_chain">Drag_chain</a> </td><td> <a href = "#Layout">Layout</a> </td><td></td></tr>
-<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Servo_motors">Servo_motors</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Maths">Maths</a> </td><td></td></tr>
-<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Shaft_couplings">Shaft_couplings</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
-<tr><td> <a href = "#Cameras">Cameras</a> </td><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#Circlips">Circlips</a> </td><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
-<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
-<tr><td> <a href = "#DIP">DIP</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Knob">Knob</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#LED_bezel">LED_bezel</a> </td><td> <a href = "#Rounded_triangle">Rounded_triangle</a> </td><td></td></tr>
-<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</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 = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Terminals">Terminals</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 = "#Extrusions">Extrusions</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Pocket_handle">Pocket_handle</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Fastons">Fastons</a> </td><td> <a href = "#Photo_interrupters">Photo_interrupters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Washers">Washers</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Potentiometers">Potentiometers</a> </td><td> <a href = "#Wire">Wire</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
-<tr><td></td><td></td><td></td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Bearing_blocks">Bearing_blocks</a> </td><td> <a href = "#LEDs">LEDs</a> </td><td> <a href = "#SBR_rails">SBR_rails</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#SK_brackets">SK_brackets</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Gears">Gears</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#SMDs">SMDs</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td></td></tr>
+<tr><td> <a href = "#Box_sections">Box_sections</a> </td><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#SSRs">SSRs</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Horiholes">Horiholes</a> </td><td></td></tr>
+<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Magnets">Magnets</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Drag_chain">Drag_chain</a> </td><td> <a href = "#Layout">Layout</a> </td><td></td></tr>
+<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Maths">Maths</a> </td><td></td></tr>
+<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Servo_motors">Servo_motors</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#Cameras">Cameras</a> </td><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Shaft_couplings">Shaft_couplings</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#Circlips">Circlips</a> </td><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#DIP">DIP</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Knob">Knob</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#LED_bezel">LED_bezel</a> </td><td> <a href = "#Rounded_triangle">Rounded_triangle</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</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 = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</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 = "#Extrusions">Extrusions</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Terminals">Terminals</a> </td><td> <a href = "#Pocket_handle">Pocket_handle</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Fastons">Fastons</a> </td><td> <a href = "#Photo_interrupters">Photo_interrupters</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Potentiometers">Potentiometers</a> </td><td> <a href = "#Washers">Washers</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Wire">Wire</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td></td><td></td><td> <a href = "#Zipties">Zipties</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
 </table>

 ---
@@ -263,6 +263,14 @@ SCSnUU and SCSnLUU bearing blocks
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| `sbr_bearing(type)` | Linear bearing used |
+| `sbr_circlip(type)` | Circlip used |
+| `sbr_hole_offset(type)` | Offset of bearing hole from base of *rail* |
+| `sbr_screw(type)` | Screw type |
+| `sbr_screw_separation_x(type)` | Screw separation in X direction |
+| `sbr_screw_separation_z(type)` | Screw separation in Z direction |
+| `sbr_side_height(type)` | Height of side above *rail* |
+| `sbr_spacer(type)` | Spacer used in long bearings |
 | `scs_bearing(type)` | Linear bearing used |
 | `scs_block_center_height(type)` | Height of the center of the block |
 | `scs_block_side_height(type)` | Height of the side of the block, this determines the minimum screw length |
@@ -276,11 +284,16 @@ SCSnUU and SCSnLUU bearing blocks
 ### Functions
 | Function | Description |
 |:--- |:--- |
+| `sbr_size(type)` | Size of SBR bracket bounding block |
 | `scs_size(type)` | Size of scs bracket bounding block |

 ### Modules
 | Module | Description |
 |:--- |:--- |
+| `right_trapezoid(base, top, height, h = 0, center = true)` | A right angled trapezoid with the 90&deg; corner at the origin. 3D when `h` is nonzero, otherwise 2D |
+| `sbr_bearing_block(type)` | Draw the specified SBR bearing block |
+| `sbr_bearing_block_assembly(type, part_thickness, screw_type)` | Assembly with screws in place |
+| `sbr_bearing_block_hole_positions(type)` | Place children at hole positions |
 | `scs_bearing_block(type)` | Draw the specified SCS bearing block |
 | `scs_bearing_block_assembly(type, part_thickness, screw_type, nut_type)` | Assembly with screws and nuts in place |
 | `scs_bearing_block_hole_positions(type)` | Place children at hole positions |
@@ -292,6 +305,7 @@ SCSnUU and SCSnLUU bearing blocks
 | ---:|:--- |:---|
 |  12 | `nut(M4_nut)` |  Nut M4 x 3.2mm  |
 |  24 | `nut(M5_nut)` |  Nut M5 x 4mm  |
+|   1 | `sbr_bearing_block(SBR16UU)` |  SBR16UU bearing block |
 |   1 | `scs_bearing_block(SCS10LUU)` |  SCS10LUU bearing block |
 |   1 | `scs_bearing_block(SCS10UU)` |  SCS10UU bearing block |
 |   1 | `scs_bearing_block(SCS12LUU)` |  SCS12LUU bearing block |
@@ -303,6 +317,7 @@ SCSnUU and SCSnLUU bearing blocks
 |   1 | `scs_bearing_block(SCS8UU)` |  SCS8UU bearing block |
 |   4 | `screw(M4_cap_screw, 25)` |  Screw M4 cap x 25mm |
 |   8 | `screw(M4_cap_screw, 30)` |  Screw M4 cap x 30mm |
+|   4 | `screw(M5_cap_screw, 16)` |  Screw M5 cap x 16mm |
 |  16 | `screw(M5_cap_screw, 35)` |  Screw M5 cap x 35mm |
 |   8 | `screw(M5_cap_screw, 45)` |  Screw M5 cap x 45mm |
 |  12 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
@@ -741,6 +756,11 @@ Circlips aka tapered retaining rings.
 | `circlip_d5(type)` | Plier hole diameter |
 | `circlip_thickness(type)` | Thickness |

+### Functions
+| Function | Description |
+|:--- |:--- |
+| `circlip_closed_angle(type)` | Closed angle |
+
 ### Modules
 | Module | Description |
 |:--- |:--- |
@@ -756,6 +776,7 @@ Circlips aka tapered retaining rings.
 |   3 | `circlip(circlip_19i)` |  Circlip internal 19mm |
 |   3 | `circlip(circlip_21i)` |  Circlip internal 21mm |
 |   3 | `circlip(circlip_28i)` |  Circlip internal 28mm |
+|   3 | `circlip(circlip_28iw)` |  Circlip internal 28mm (wide opening) |


 <a href="#top">Top</a>
@@ -1928,11 +1949,13 @@ LMnUU linear bearings.
 | `bearing_groove_spacing(type)` | Spacing between grooves, outer to outer, ie includes the grooves themselves |
 | `bearing_length(type)` | Total length |
 | `bearing_rod_dia(type)` | Internal diameter |
+| `open_bearing_width(type)` | For open bearings, the width of the opening at the rod |

 ### Functions
 | Function | Description |
 |:--- |:--- |
 | `bearing_radius(type)` | Outside radius |
+| `open_bearing_theta(type)` | For open bearings, the angle of the opening |

 ### Modules
 | Module | Description |
@@ -1950,6 +1973,7 @@ LMnUU linear bearings.
 |   1 | `linear_bearing(LM12UU)` |  Linear bearing LM12UU |
 |   1 | `linear_bearing(LM16LUU)` |  Linear bearing LM16LUU |
 |   1 | `linear_bearing(LM16UU)` |  Linear bearing LM16UU |
+|   1 | `linear_bearing(LM16UUOP)` |  Linear bearing LM16UUOP |
 |   1 | `linear_bearing(LM3LUU)` |  Linear bearing LM3LUU |
 |   1 | `linear_bearing(LM3UU)` |  Linear bearing LM3UU |
 |   1 | `linear_bearing(LM4LUU)` |  Linear bearing LM4LUU |
@@ -2441,7 +2465,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `pcb_component(type, name, index = 0)` | Return the component specified by name and index |
 | `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_grid_pos(type, x, y, z = 0, i = 0)` | Returns a pcb grid position |
 | `pcb_screw(type, cap = hs_cap)` | Mounting screw type |
 | `pcb_size(type)` | Length, width and thickness in a vector |

@@ -2467,7 +2491,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `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_grid(type, x, y, z = 0, i = 0)` | Positions children at specified grid position |
 | `pcb_grid_components(type, components, cutouts = false, angle = undef)` | Draw list of components on the PCB grid for perf board |
 | `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 |
@@ -2492,6 +2516,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | ---:|:--- |:---|
 |   1 | `potentiometer(BTT_encoder)` |  BTT_encoder |
 |   1 | `box_header(2p54header, 4, 2)` |  Box header 4 x 2 |
+|   1 | `box_header(2p54header, 4, 2, right_angle = true)` |  Box header 4 x 2 right angle  |
 |   1 | `rd_xtal(ACT1100, "40MHz")` |  Crystal ACT1100 40MHz |
 |   1 | `rd_xtal(ACT1700, "80MHz")` |  Crystal ACT1700 80MHz |
 |   1 | `rd_xtal(C_002RX, "60KHz")` |  Crystal C_002RX 60KHz |
@@ -2499,12 +2524,15 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `rd_xtal(HC49_4H, "10MHz")` |  Crystal HC49_4H 10MHz |
 |   1 | `d_plug(DCONN9, pcb = true)` |  D-type 9 way PCB mount plug |
 |   1 | `dil_socket(12, 15.24)` |  DIL socket 24 x 0.6" |
-|   1 | `smd_diode(DO241AC)` |  DO241AC package SS34 |
+|   1 | `smd_diode(DO214AC)` |  DO214AC package SS34 |
 |   1 | `hdmi(hdmi_full)` |  HDMI socket |
 |   1 | `pdip(24, 27C32, w = 15.24)` |  IC 27C32 PDIP24 |
 |   1 | `pdip(8, NE555)` |  IC NE555 PDIP8 |
 |   1 | `idc_transition(2p54header, 5)` |  IDC transition header 5 x 2 |
 |   1 | `smd_inductor(IND2525)` |  IND2525 package 4R7 |
+|   1 | `jst_xh_header(jst_ph_header, 2)` |  JST PH connector 2 way |
+|   1 | `jst_xh_header(jst_xh_header, 2)` |  JST XH connector 2 way |
+|   1 | `jst_xh_header(jst_zh_header, 2)` |  JST ZH connector 2 way |
 |   1 | `potentiometer(KY_040_encoder)` |  KY_040_encoder |
 |   1 | `led(LED10mm, "yellow")` |  LED 10 mm yellow |
 |   1 | `led(LED3mm)` |  LED 3 mm red |
@@ -2513,8 +2541,11 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `microswitch(small_microswitch)` |  Microswitch DM1-00P-110-3 |
 |   1 | `hdmi(hdmi_mini)` |  Mini HDMI socket |
 |   1 | `molex_254(2)` |  Molex KK header 2 way |
+|   1 | `molex_254(2, right_angle = 1)` |  Molex KK header 2 way right angle |
+|   1 | `molex_254(2, right_angle = -1)` |  Molex KK header 2 way right angle |
 |   1 | `pin_header(2p54header, 4, 1)` |  Pin header 4 x 1 |
 |   1 | `pin_header(2p54header, 5, 1)` |  Pin header 5 x 1 |
+|   1 | `pin_header(2p54header, 5, 1, right_angle = true)` |  Pin header 5 x 1 right_angle |
 |   1 | `pin_socket(2p54header, 4, 1)` |  Pin socket 4 x 1 |
 |   1 | `pin_socket(2p54header, 6, 1)` |  Pin socket 6 x 1 |
 |   2 | `pin_socket(2p54header, 8, 1)` |  Pin socket 8 x 1 |
@@ -2535,6 +2566,8 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `smd_capacitor(CAP0603)` |  SMD capacitor 0603 10nF |
 |   1 | `smd_capacitor(CAP0805)` |  SMD capacitor 0805 100nF |
 |   1 | `smd_capacitor(CAP1206)` |  SMD capacitor 1206 1uF |
+|   1 | `smd_qfp(QFP50P1200X1200X160_64N)` |  SMD chip: ATSAM4S4BA, package : QFP50P1200X1200X160_64N |
+|   1 | `smd_resistor(L2012C, 1u)` |  SMD choke 0805 1u |
 |   1 | `smd_coax(U_FL_R_SMT_1)` |  SMD coax connector type: U_FL_R_SMT_1 |
 |   1 | `smd_resistor(RES0402, 1)` |  SMD resistor 0402 1 0.0625W |
 |   1 | `smd_resistor(RES0502, 10)` |  SMD resistor 0502 10 0.05W |
@@ -2616,7 +2649,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `pcb_component(type, name, index = 0)` | Return the component specified by name and index |
 | `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_grid_pos(type, x, y, z = 0, i = 0)` | Returns a pcb grid position |
 | `pcb_screw(type, cap = hs_cap)` | Mounting screw type |
 | `pcb_size(type)` | Length, width and thickness in a vector |

@@ -2642,7 +2675,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `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_grid(type, x, y, z = 0, i = 0)` | Positions children at specified grid position |
 | `pcb_grid_components(type, components, cutouts = false, angle = undef)` | Draw list of components on the PCB grid for perf board |
 | `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 |
@@ -2694,11 +2727,12 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `molex_254(3)` |  Molex KK header 3 way - not shown |
 |  20 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
 |  34 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  40 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|  43 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(OPZ2)` |  Orange Pi Zero 2 |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 - not shown |
 |   1 | `pcb(PSU12V1A)` |  PSU 12V 1A - not shown |
+|   1 | `pcb(PanelDue_v3)` |  Panel Due v3.0a LCD Display interface |
 |   1 | `pcb(PERF60x40)` |  Perfboard 60 x 40mm |
 |   1 | `pcb(PERF70x30)` |  Perfboard 70 x 30mm |
 |   1 | `pcb(PERF70x50)` |  Perfboard 70 x 50mm |
@@ -2716,12 +2750,13 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |  12 | `screw(M2_cap_screw, 20)` |  Screw M2 cap x 20mm |
 |   2 | `screw(M2p5_cap_screw, 16)` |  Screw M2.5 cap x 16mm |
 |   8 | `screw(M2p5_cap_screw, 25)` |  Screw M2.5 cap x 25mm |
-|  12 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
+|   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
+|   4 | `screw(M2p5_cap_screw, 35)` |  Screw M2.5 cap x 35mm |
 |   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
 |   8 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
 |  17 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
 |  15 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
-|   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
+|  11 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
 |   4 | `screw(M4_cap_screw, 20)` |  Screw M4 cap x 20mm |
 |   4 | `screw(M4_cap_screw, 25)` |  Screw M4 cap x 25mm |
 |   1 | `pcb(XIAO)` |  Seeeduino XIAO |
@@ -2732,7 +2767,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  20 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |  34 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  40 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  43 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |

@@ -2748,13 +2783,14 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer25140.stl |
 |   4 | pcb_spacer25150_2.stl |
 |   4 | pcb_spacer25160_2.stl |
-|   4 | pcb_spacer25190.stl |
 |   4 | pcb_spacer25200.stl |
 |   4 | pcb_spacer25210.stl |
+|   4 | pcb_spacer25220.stl |
 |   2 | pcb_spacer2550.stl |
 |   4 | pcb_spacer2590.stl |
 |   4 | pcb_spacer30170.stl |
 |   4 | pcb_spacer30180.stl |
+|   3 | pcb_spacer30190.stl |
 |   8 | pcb_spacer3050.stl |
 |   9 | pcb_spacer3060.stl |
 |   7 | pcb_spacer3070.stl |
@@ -2938,9 +2974,9 @@ Pin headers and sockets, etc.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `box_header(type, cols = 1, rows = 1, smt = false, cutout = false)` | Draw box header |
+| `box_header(type, cols = 1, rows = 1, smt = false, cutout = false, right_angle = false)` | Draw box header |
 | `idc_transition(type, cols = 5, skip = [], cutout = false)` | Draw IDC transition header |
-| `jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_colour = false, smt = false)` | Draw JST XH connector |
+| `jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_colour = false, smt = false)` | Draw JST XH, PH or ZH connector |
 | `pin(type, length = undef)` | Draw a header pin |
 | `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 |
@@ -2951,8 +2987,22 @@ Pin headers and sockets, etc.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | `box_header(2p54header, 10, 2)` |  Box header 10 x 2 |
+|   1 | `box_header(2p54header, 10, 2, right_angle = true)` |  Box header 10 x 2 right angle  |
 |   1 | `box_header(2p54header, 8, 1)` |  Box header 8 x 1 |
+|   1 | `box_header(2p54header, 8, 1, right_angle = true)` |  Box header 8 x 1 right angle  |
 |   1 | `idc_transition(2p54header, 10)` |  IDC transition header 10 x 2 |
+|   1 | `jst_xh_header(jst_ph_header, 2)` |  JST PH connector 2 way |
+|   1 | `jst_xh_header(jst_ph_header, 2, right_angle = true)` |  JST PH connector 2 way right_angle |
+|   1 | `jst_xh_header(jst_ph_header, 5)` |  JST PH connector 5 way |
+|   1 | `jst_xh_header(jst_ph_header, 5, right_angle = true)` |  JST PH connector 5 way right_angle |
+|   1 | `jst_xh_header(jst_xh_header, 2)` |  JST XH connector 2 way |
+|   1 | `jst_xh_header(jst_xh_header, 2, right_angle = true)` |  JST XH connector 2 way right_angle |
+|   1 | `jst_xh_header(jst_xh_header, 5)` |  JST XH connector 5 way |
+|   1 | `jst_xh_header(jst_xh_header, 5, right_angle = true)` |  JST XH connector 5 way right_angle |
+|   1 | `jst_xh_header(jst_zh_header, 2)` |  JST ZH connector 2 way |
+|   1 | `jst_xh_header(jst_zh_header, 2, right_angle = true)` |  JST ZH connector 2 way right_angle |
+|   1 | `jst_xh_header(jst_zh_header, 5)` |  JST ZH connector 5 way |
+|   1 | `jst_xh_header(jst_zh_header, 5, right_angle = true)` |  JST ZH connector 5 way right_angle |
 |   1 | `pin_header(2p54header, 10, 2)` |  Pin header 10 x 2 |
 |   1 | `pin_header(2p54header, 3, 1, right_angle = true)` |  Pin header 3 x 1 right_angle |
 |   1 | `pin_header(2p54header, 3, 2, right_angle = true)` |  Pin header 3 x 2 right_angle |
@@ -2993,7 +3043,7 @@ Potentiometers and rotary encoders
 | `pot_spigot_x(type)` | Spigot offset from the shaft centre |
 | `pot_thread_d(type)` | Nomininal thread diameter |
 | `pot_thread_h(type)` | Height of threaded part |
-| `pot_thread_p(type)` | Thread pritch |
+| `pot_thread_p(type)` | Thread pitch |
 | `pot_wafer(type)` | Width, diameter and thickness of the track wafer plus true if curved |
 | `pot_washer(type)` | Outside diameter and thickness of the washer |

@@ -3458,6 +3508,49 @@ These items are symmetrical, so by default the origin is in the centre but it ca
 |   1 | `studding(8, 80)` |  Threaded rod M8 x 80mm |


+<a href="#top">Top</a>
+
+---
+<a name="SBR_rails"></a>
+## SBR_rails
+SBR rails
+
+The rails are drawn from the center of the rod.
+`sbr_rail_center_height(type)` can be used to determine where the bottom of the rail is.
+
+[vitamins/sbr_rails.scad](vitamins/sbr_rails.scad) Object definitions.
+
+[vitamins/sbr_rail.scad](vitamins/sbr_rail.scad) Implementation.
+
+[tests/SBR_rails.scad](tests/SBR_rails.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `sbr_rail_base_width(type)` | Width of the rail base |
+| `sbr_rail_carriage(type)` | Carriage to use with this rail |
+| `sbr_rail_center_height(type)` | Height of the center above the bottom of the rail |
+| `sbr_rail_diameter(type)` | Diameter of the rod |
+| `sbr_rail_screw(type)` | Screw to fasten this rail |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `sbr_rail(type , l)` | Draw an SBR rail |
+| `sbr_screw_locations(type, l)` | Linear locations of screws |
+| `sbr_screw_positions(type, l)` | Screw positions |
+
+![sbr_rails](tests/png/sbr_rails.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | `sbr_rail(16, 200)` |  SBR16 rail, length 200mm |
+|   1 | `sbr_bearing_block(SBR16UU)` |  SBR16UU bearing block |
+|   4 | `screw(M5_cap_screw, 12)` |  Screw M5 cap x 12mm |
+|   4 | `screw(M5_cap_screw, 18)` |  Screw M5 cap x 18mm |
+
+
 <a href="#top">Top</a>

 ---
@@ -3486,7 +3579,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 | `screw_radius(type)` | Nominal radius |
 | `screw_socket_af(type)` | Socket across flats |
 | `screw_socket_depth(type)` | Socket or slot depth |
-| `screw_thread_diameter(type)` | Thread diameter, if different from nominal diamter |
+| `screw_thread_diameter(type)` | Thread diameter, if different from nominal diameter |
 | `screw_washer(type)` | Default washer |

 ### Functions
@@ -3874,8 +3967,14 @@ E.g. 475A is 4.7uF 10V on the parts list.
 | `smd_pot_flat(type)` | Flat at the back of the wiper |
 | `smd_pot_size(type)` | Base length, width and height |
 | `smd_pot_wiper(type)` | Wiper diameter, offset, thickness, height, d1, d2, d3, d4 |
+| `smd_qfp_body_size(type)` | Size of the body |
+| `smd_qfp_gullwing(type)` | Gullwing S, L, R1, R2 |
+| `smd_qfp_pin_size(type)` | Pins dimensions |
+| `smd_qfp_pins(type)` | Number of pins |
+| `smd_qfp_pitch(type)` | Pin pitch |
+| `smd_qfp_slant(type)` | Angle of the slope |
 | `smd_res_end_cap(type)` | End cap width |
-| `smd_res_power(type)` | Power rating in Watts |
+| `smd_res_power(type)` | Power rating in Watts, 0 for choke |
 | `smd_res_size(type)` | Body length, width and height |
 | `smd_soic_lead_pitch(type)` | Lead pitch |
 | `smd_soic_lead_size(type)` | Lead width, foot depth, lead thickness |
@@ -3912,6 +4011,7 @@ E.g. 475A is 4.7uF 10V on the parts list.
 | `smd_inductor(type, value)` | Draw an SMD inductor |
 | `smd_led(type, colour, cutout)` | Draw an SMD LED with specified `colour` |
 | `smd_pot(type, value)` | Draw an SMD pot |
+| `smd_qfp(type, value)` | Draw and SMD QFP package |
 | `smd_resistor(type, value)` | Draw an SMD resistor with specified value |
 | `smd_soic(type, value)` | Draw an SMD SOIC |
 | `smd_sot(type, value)` | Draw an SMD transistor |
@@ -3922,7 +4022,7 @@ E.g. 475A is 4.7uF 10V on the parts list.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `smd_diode(DO241AC)` |  DO241AC package SS34 |
+|   1 | `smd_diode(DO214AC)` |  DO214AC package SS34 |
 |   1 | `smd_inductor(IND2525)` |  IND2525 package 4R7 |
 |   1 | `smd_led(LED0603, green)` |  SMD LED 0603 green |
 |   1 | `smd_led(LED0805, blue)` |  SMD LED 0805 blue |
@@ -3935,6 +4035,8 @@ E.g. 475A is 4.7uF 10V on the parts list.
 |   1 | `smd_capacitor(CAP0603)` |  SMD capacitor 0603 |
 |   1 | `smd_capacitor(CAP0805)` |  SMD capacitor 0805 |
 |   1 | `smd_capacitor(CAP1206)` |  SMD capacitor 1206 |
+|   1 | `smd_qfp(QFP50P1200X1200X160_64N)` |  SMD chip: ATSAM4S4BA, package : QFP50P1200X1200X160_64N |
+|   1 | `smd_resistor(L2012C, 10u)` |  SMD choke 0805 10u |
 |   1 | `smd_coax(U_FL_R_SMT_1)` |  SMD coax connector type: U_FL_R_SMT_1 |
 |   1 | `smd_resistor(RES0402, 1R0)` |  SMD resistor 0402 1R0 0.0625W |
 |   1 | `smd_resistor(RES0502, 10)` |  SMD resistor 0502 10 0.05W |
--- a/scripts/changelog.py
+++ b/scripts/changelog.py
@@ -80,9 +80,16 @@ def codify(word, url):
            return  '`' + word + '`'
    return word

+typos = [ # Typos that are ambiguous to codespell
+    ('cnc_bit+_r', 'cnc_bit_r'),
+    ('Udated',     'Updated'),
+    ('decription', 'description'),
+    ('Trainling',  'Trailing'),
+]

 def fixup_comment(comment, url):
-    comment = comment.replace('cnc_bit+_r', 'cnc_bit_r')
+    for typo in typos:
+        comment = comment.replace(typo[0], typo[1])
    """ markup code words and fix new paragraphs """
    result = ''
    word = ''
@@ -162,6 +169,6 @@ if __name__ == '__main__':

            # Print commits excluding merges

-            if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull') and not re.match(r'U..ated ch.*log.*', c.comment):
+            if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull') and not re.match(r'U.?.ated ch.*log.*', c.comment):
                print('* %s [`%s`](%s "show commit") %s %s\n' % (c.date, c.hash[:7], url + '/commit/' + c.hash, initials(c.author), fixup_comment(c.comment, url)), file = file)
    do_cmd(('codespell -w -L od ' + filename).split())
--- a/tests/PCB.scad
+++ b/tests/PCB.scad
@@ -65,6 +65,7 @@ test_pcb = ["test_pcb", "Test PCB",
        [ 19,  2,   90, "smd_led", LED1206, "blue"],
        [ 16,  2,   90, "smd_led", LED0805, "red"],
        [ 13,  2,   90, "smd_led", LED0603, "orange"],
+        [ 10,  2,  -90, "smd_res", L2012C, "1u"],
        [ 19,  6,  -90, "smd_res", RES1206, "1M"],
        [ 16,  6,  -90, "smd_res", RES0805, "1K"],
        [ 13,  6,  -90, "smd_res", RES0603, "100"],
@@ -78,23 +79,27 @@ test_pcb = ["test_pcb", "Test PCB",
        [ 19, 16,  -90, "smd_tant", TANT_C, "107C"],
        [ 13, 16,  -90, "smd_tant", TANT_B, "106A"],
        [  7, 16,  -90, "smd_tant", TANT_A, "105e"],
-        [ 32,  3,  -90, "smd_diode",DO241AC, "SS34"],
+        [ 32,  3,  -90, "smd_diode",DO214AC, "SS34"],
        [ 26,  2,  -90, "smd_pot", TC33X1, "10K"],
        [ 26,  6,  -90, "smd_coax",U_FL_R_SMT_1],

        [ 26, 10,  -90, "smd_sot", SOT23, "2N7000"],
        [ 28, 16,  -90, "smd_sot", SOT223, "LM117"],

+        [ 30, 30,  -90, "smd_qfp", QFP50P1200X1200X160_64N, "ATSAM4S4BA"],
+
        [ 45,  35,   0, "2p54header", 4, 1],
        [ 60,  35,   0, "2p54header", 5, 1, false, "blue" ],
+        [ 60,  40, 180, "2p54header", 5, 1, false, undef, true],
        [ 80,  33,   0, "2p54boxhdr", 4, 2],
+        [ 80,  40,   0, "2p54boxhdr", 4, 2, false, true, true],
        [ 45,  30,   0, "2p54socket", 4, 1, false, 0, false, "red" ],
        [ 60,  30,   0, "2p54socket", 6, 1],

-        [ 59,  50, 180, "led", LED3mm, "red"],
-        [ 66,  50, 180, "led", LED5mm, "orange"],
-        [ 77,  50, 180, "led", LED8mm, "blue"],
-        [ 90,  50, 180, "led", LED10mm, "yellow"],
+        [ 59,  60, 180, "led", LED3mm, "red"],
+        [ 66,  60, 180, "led", LED5mm, "orange"],
+        [ 77,  60, 180, "led", LED8mm, "blue"],
+        [ 90,  60, 180, "led", LED10mm, "yellow"],
        [ 10,  35, 180, "rj45"],
        [  7,  50, 180, "usb_vAx1"],
        [  8,  65, 180, "usb_A"],
@@ -139,11 +144,16 @@ test_pcb = ["test_pcb", "Test PCB",
        [ 95,  15, -90, "flat_flex"],
        [ 87,  15, -90, "flat_flex", true],

-        [ 50,  50,   0, "molex_hdr", 2],
-        [ 50,  60,   0, "jst_xh", 2],
-        [ 50,  70, 180, "term254", 3],
-        [ 63,  70, 180, "term254", 3, undef, grey(20)],
-        [ 75,  70, 180, "gterm508",2, undef, "blue"],
+        [ 47,  55,   0, "molex_hdr", 2],
+        [ 51,  48,   0, "molex_hdr", 2, 1],
+        [ 51,  41,   0, "molex_hdr", 2, -1],
+        [ 45,  65,   0, "jst_xh", 2],
+        [ 54,  65,   0, "jst_ph", 2],
+        [ 61,  65,   0, "jst_zh", 2],
+
+        [ 50,  75, 180, "term254", 3],
+        [ 63,  75, 180, "term254", 3, undef, grey(20)],
+        [ 75,  75, 180, "gterm508",2, undef, "blue"],

        [ 50,  90, 180, "gterm35", 4, [1,2]],
        [ 63,  90, 180, "gterm35", 4, [1,2], "red"],
--- a/tests/SBR_rails.scad
+++ b/tests/SBR_rails.scad
@@ -0,0 +1,46 @@
+//
+// NopSCADlib Copyright Chris Palmer 2023
+// 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/sbr_rails.scad>
+
+use <../utils/layout.scad>
+use <../vitamins/bearing_block.scad>
+
+length = 200;
+sheet = 3;
+
+module sbr_rails()
+    layout([for(r = sbr_rails) sbr_rail_base_width(r)], 10)
+        rotate([90, 180,0]) {
+            rail = sbr_rails[$i];
+            sbr_rail(rail, length);
+            carriage = sbr_rail_carriage(rail);
+            screw = sbr_rail_screw(rail);
+
+            sbr_bearing_block_assembly(carriage, sheet);
+
+            sbr_screw_positions(rail, length)
+                explode(20)
+                    rotate([90,0,0])
+                        screw(sbr_rail_screw(rail), 18);
+
+         }
+
+if($preview)
+    sbr_rails();
--- a/tests/SMDs.scad
+++ b/tests/SMDs.scad
@@ -23,7 +23,7 @@ include <../vitamins/smds.scad>

 module smds() {
    layout([for(r = smd_resistors) smd_res_size(r).x], 1)
-        smd_resistor(smd_resistors[$i], ["1R0", "10", "100", "10M", "100K"][$i % 5]);
+        smd_resistor(smd_resistors[$i], ["1R0", "10", "100", "10M", "100K", "10u"][$i % 6]);

    translate([0, 3])
        layout([for(l = smd_leds) smd_led_size(l).x], 1)
@@ -68,6 +68,11 @@ module smds() {
        layout([for(i = smd_inductors) smd_inductor_leads(i).x], 1)
            let(i = smd_inductors[$i])
                smd_inductor(i, "4R7");
+
+    translate([20, 6])
+         layout([for(q = smd_qfps) smd_qfp_body_size(q).x], 3)
+            let(q = smd_qfps[$i])
+                smd_qfp(q, ["ATSAM4S4BA"][$i]);
 }

 if($preview)
--- a/tests/bearing_blocks.scad
+++ b/tests/bearing_blocks.scad
@@ -24,12 +24,26 @@ use <../utils/layout.scad>
 module scs_bearing_blocks()
    layout([for(s = scs_bearing_blocks) scs_size(s).x], 10) {
        part_thickness = 5;
-        scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);
+        translate([0, 60])
+            scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);

        if($i > 0) // skip $i==0, since no SCS6LUU long variant to match SCS6UU
-            translate([0, 60])
+            translate([0, 120])
                scs_bearing_block_assembly(scs_bearing_blocks_long[$i - 1], part_thickness);
    }

-if($preview)
+module sbr_bearing_blocks()
+    layout([for(s = sbr_bearing_blocks) sbr_size(s).x], 10) {
+        part_thickness = 5;
+        sbr_bearing_block_assembly(sbr_bearing_blocks[$i], part_thickness);
+    }
+
+module bearing_blocks() {
    scs_bearing_blocks();
+
+    translate([190, 0])
+        sbr_bearing_blocks();
+}
+
+if($preview)
+    bearing_blocks();
--- a/tests/circlips.scad
+++ b/tests/circlips.scad
@@ -22,7 +22,7 @@ use <../utils/layout.scad>
 include <../vitamins/circlips.scad>

 module circlips(all = false)
-    layout([for(c = circlips) circlip_d3(c)], 10, false) let(c = circlips[$i]) {
+    layout([for(c = circlips) circlip_d3(c)], 5, false) let(c = circlips[$i]) {
        gap = circlip_d3(c) + 2;

        internal_circlip(c, 1);
--- a/tests/linear_bearings.scad
+++ b/tests/linear_bearings.scad
@@ -21,13 +21,18 @@ use <../utils/layout.scad>

 include <../vitamins/linear_bearings.scad>

-module linear_bearings()
+module linear_bearings() {
    layout([for(b = linear_bearings) 2 * bearing_radius(b)]) {
-        linear_bearing(linear_bearings[$i]);
-
        translate([0, 30])
+            linear_bearing(linear_bearings[$i]);
+
+        translate([0, 60])
            linear_bearing(long_linear_bearings[$i]);
    }
+    layout([for(b = open_linear_bearings) 2 * bearing_radius(b)])
+        translate([105, 0])
+            linear_bearing(open_linear_bearings[$i]);
+}

 if($preview)
    linear_bearings();
--- a/tests/pin_headers.scad
+++ b/tests/pin_headers.scad
@@ -45,9 +45,15 @@ module pin_headers() {
        translate([0, 50])
            box_header(pin_headers[$i], 8, 1);

+        translate([40, 40])
+            box_header(pin_headers[$i], 8, 1, right_angle = true);
+
        translate([0, 60])
            box_header(pin_headers[$i], 10, 2);

+        translate([40, 60])
+            box_header(pin_headers[$i], 10, 2, right_angle = true);
+
        translate([0, 70])
            pin_socket(pin_headers[$i], 8, 1);

--- a/tests/png/bearing_blocks.png
+++ b/tests/png/bearing_blocks.png
--- a/tests/png/bezier.png
+++ b/tests/png/bezier.png
--- a/tests/png/circlips.png
+++ b/tests/png/circlips.png
--- a/tests/png/displays.png
+++ b/tests/png/displays.png
--- a/tests/png/fan_guard.png
+++ b/tests/png/fan_guard.png
--- a/tests/png/green_terminals.png
+++ b/tests/png/green_terminals.png
--- a/tests/png/linear_bearings.png
+++ b/tests/png/linear_bearings.png
--- a/tests/png/panel_meters.png
+++ b/tests/png/panel_meters.png
--- a/tests/png/pcb.png
+++ b/tests/png/pcb.png
--- a/tests/png/pcbs.png
+++ b/tests/png/pcbs.png
--- a/tests/png/pin_headers.png
+++ b/tests/png/pin_headers.png
--- a/tests/png/sbr_rails.png
+++ b/tests/png/sbr_rails.png
--- a/tests/png/smds.png
+++ b/tests/png/smds.png
--- a/tests/png/stepper_motors.png
+++ b/tests/png/stepper_motors.png
--- a/vitamins/bearing_block.scad
+++ b/vitamins/bearing_block.scad
@@ -41,6 +41,17 @@ function scs_circlip(type)              = type[15]; //! Circlip used
 function scs_spacer(type)               = type[16]; //! Spacer used in long bearings


+function sbr_size(type)                 = [type[4],type[6],type[5]]; //! Size of SBR bracket bounding block
+function sbr_hole_offset(type)          = type[2]; //! Offset of bearing hole from base of *rail*
+function sbr_side_height(type)          = type[3]; //! Height of side above *rail*
+function sbr_screw(type)                = type[10]; //! Screw type
+function sbr_screw_separation_x(type)   = type[7];  //! Screw separation in X direction
+function sbr_screw_separation_z(type)   = type[8];  //! Screw separation in Z direction
+function sbr_bearing(type)              = type[12]; //! Linear bearing used
+function sbr_circlip(type)              = type[13]; //! Circlip used
+function sbr_spacer(type)               = type[14]; //! Spacer used in long bearings
+
+
 sks_bearing_block_colour = grey(90);

 module scs_bearing_block(type) { //! Draw the specified SCS bearing block
@@ -63,11 +74,6 @@ module scs_bearing_block(type) { //! Draw the specified SCS bearing block
    bearing = scs_bearing(type);
    clip = scs_circlip(type);

-    module right_trapezoid(base, top, height, h = 0, center = true) {//! A right angled trapezoid with the 90&deg; corner at the origin. 3D when `h` is nonzero, otherwise 2D
-        extrude_if(h, center = center)
-            polygon(points = [ [0,0], [base, 0], [top, height], [0, height] ]);
-    }
-
    boltHoleRadius = screw_clearance_radius(S1);
    footHeight = min(0.75, (G - bearing_dia(bearing) - 1.5) / 2); // estimate, not specified on drawings

@@ -169,3 +175,142 @@ module scs_bearing_block_assembly(type, part_thickness, screw_type, nut_type) {
                    washer(washer_type);
    }
 }
+
+/* SBR bearing blocks */
+
+module sbr_bearing_block(type) { //! Draw the specified SBR bearing block
+    vitamin(str("sbr_bearing_block(", type[0], "): ", type[0], " bearing block"));
+
+    T = type[1];
+    h = sbr_hole_offset(type);
+    H = sbr_side_height(type);
+
+    W = sbr_size(type)[0];
+    G = sbr_size(type)[1];
+    M = sbr_size(type)[2];
+    J = sbr_screw_separation_x(type);
+    K = sbr_screw_separation_z(type);
+    S1 = sbr_screw(type);
+    I = type[11];           // screw length
+
+    S2 = type[15];
+    S2L = type[16];
+
+    bearing = sbr_bearing(type);
+    clip = sbr_circlip(type);
+    chamfer = 1.5;
+    A = type[9];            // size of chamfered overhang - vertical
+    Ah = A + chamfer * 2;   // size of chamfered overhand - horizontal - not given in drawings
+
+    width = W - (2 * chamfer);
+    height = G - chamfer;
+
+    boltHoleRadius = screw_radius(S1);
+    setScrewRadius = screw_radius(S2);
+
+    color(sks_bearing_block_colour) {
+        render() difference() {
+            linear_extrude(M, center = true, convexity=2) {
+                cutoutheight = 15; // chosen to fit SBR16, may not work with others
+                bearingRadius = bearing_dia(bearing) / 2;
+                bearingTheta = open_bearing_theta(bearing);
+                bearingOpening = open_bearing_width(bearing);
+                bearingOpeningBig = bearingOpening + (tan(bearingTheta/2) * cutoutheight);
+                // center section with bearing hole
+                difference() {
+                    translate([-width/2, -(H-h - chamfer)])
+                        square([width, height]);
+                    circle(r = bearingRadius);
+                    for(m = [0, 1])
+                        mirror([m, 0, 0])
+                            translate([0, h - (cutoutheight/2) - H + G + 0.1])
+                                right_trapezoid(bearingOpening/2, bearingOpeningBig/2, cutoutheight/2);
+                }
+                // add the sides
+                for(m = [0, 1])
+                    mirror([m, 0, 0]) {
+                        translate([-(W/2) + chamfer, -((H-h))]) {
+                            difference() {
+                                union() {
+                                    right_trapezoid(Ah - chamfer,Ah,chamfer);
+                                    rotate([0,0,90])
+                                        right_trapezoid(A + chamfer,A,chamfer);
+                                }
+                                translate([-(chamfer +0.1), -0.1,0])
+                                    right_trapezoid(chamfer/2 + 0.2, 0, chamfer/2+ 0.2);
+                            }
+                        }
+                    }
+            }
+            // bolt holes
+            for(x = [-J / 2, J / 2])
+                translate([x, h - H + I/2 - 0.1, 0])
+                    rotate([90, 0, 0])
+                        for (y = [-K / 2, K / 2])
+                            translate([0, y])
+                                cylinder(r = boltHoleRadius, h=I + 0.1, center=true);
+
+            // set screw holes
+            translate([-width/2 + S2L/2 - 0.1,0,0])
+                rotate([0,90,0])
+                    cylinder(r = setScrewRadius, h=S2L, center=true);
+
+            translate([0,-(H-h) + chamfer + S2L/2 -0.1,0])
+                rotate([0,90,90])
+                    cylinder(r = setScrewRadius, h=S2L, center=true);
+
+        }
+    }
+    not_on_bom() no_explode() {
+        spacer = sbr_spacer(type);
+        for(end = spacer ? [-1, 1] : 0)
+            translate_z(end * (bearing_length(bearing) + spacer) / 2)
+                rotate([0,0,-90])
+                    linear_bearing(bearing);
+
+        for(end = [-1, 1])
+            translate_z(end * ((spacer ? 2 * bearing_length(bearing) + spacer : bearing_length(bearing)) + circlip_thickness(clip)) / 2)
+                rotate(180)
+                    internal_circlip(clip);
+
+        translate([-width/2 - 0.1,0,0])
+            rotate([0,90,180])
+               screw(S2, S2L);
+        translate([0,-(H-h) + chamfer - 0.1,0])
+            rotate([0,90,270])
+                screw(S2, S2L);
+    }
+}
+
+module sbr_bearing_block_hole_positions(type) { //! Place children at hole positions
+    y = sbr_hole_offset(type) - sbr_side_height(type);
+    screw_separation_x = sbr_screw_separation_x(type);
+    screw_separation_z = sbr_screw_separation_z(type);
+
+    for(x = [-screw_separation_x, screw_separation_x], z = [-screw_separation_z, screw_separation_z])
+        translate([x / 2, y, z / 2])
+            rotate([-90, 0, 0])
+                children();
+}
+
+module sbr_bearing_block_assembly(type, part_thickness, screw_type) { //! Assembly with screws in place
+
+    I = type[11]; // screw length
+    sbr_bearing_block(type);
+    screw_type = is_undef(screw_type) ? sbr_screw(type) : screw_type;
+    G = sbr_size(type)[1];
+
+    screw_length = screw_shorter_than(I + part_thickness);
+
+    translate([0,-part_thickness,0])
+        sbr_bearing_block_hole_positions(type)
+            rotate([0,180,0])
+                screw(screw_type, screw_length);
+}
+
+/* Generic bearing block functions */
+
+module right_trapezoid(base, top, height, h = 0, center = true) {//! A right angled trapezoid with the 90&deg; corner at the origin. 3D when `h` is nonzero, otherwise 2D
+    extrude_if(h, center = center)
+        polygon(points = [ [0,0], [base, 0], [top, height], [0, height] ]);
+}
--- a/vitamins/bearing_blocks.scad
+++ b/vitamins/bearing_blocks.scad
@@ -36,8 +36,12 @@ SCS10LUU  = ["SCS10LUU",  8, 13, 20, 40, 68, 26,   21, 28,   45, 6,    M5_cap_sc
 SCS12LUU  = ["SCS12LUU",  8, 15, 21, 42, 70, 28,   24, 30.5, 50, 5.75, M5_cap_screw, 4.3, 12, LM12UU, circlip_21i, 4];
 SCS16LUU  = ["SCS16LUU",  9, 19, 25, 50, 85, 38.5, 32.5, 36, 60, 7,    M5_cap_screw, 4.3, 12, LM16UU, circlip_28i, 4];

+//                        T  h   H   W   M   G     J   K   A  S1            I   LB                         S2             S2L
+SBR16UU   = ["SBR16UU",  16, 25, 45, 45, 45, 33,   32, 30, 9, M5_cap_screw, 12, LM16UUOP, circlip_28iw, 0, M5_grub_screw, 5];

 scs_bearing_blocks = [SCS6UU, SCS8UU,  SCS10UU, SCS12UU, SCS16UU];
 scs_bearing_blocks_long = [SCS8LUU,  SCS10LUU, SCS12LUU, SCS16LUU];

+sbr_bearing_blocks = [SBR16UU];
+
 use <bearing_block.scad>
--- a/vitamins/circlip.scad
+++ b/vitamins/circlip.scad
@@ -32,14 +32,14 @@ function circlip_thickness(type) = type[4];     //! Thickness
 function circlip_a(type)         = type[5];     //! Size of the lugs
 function circlip_b(type)         = type[6];     //! Widest part of the taper
 function circlip_d5(type)        = type[7];     //! Plier hole diameter
+function circlip_closed_angle(type)    = is_undef(type[8]) ? 25 : type[8];     //! Closed angle

 circlip_colour = grey(20);
-closed_angle = 25;

 module internal_circlip(type, open = 0) { //! Draw specified internal circlip, open = 0, for nominal size installed, 1 for relaxed uninstalled, -1 for squeezed to install
    d1 = circlip_d1(type);
-
-    vitamin(str("circlip(", type[0], "): Circlip internal ", d1, "mm"));
+    wide = is_undef(type[8]) ? "" : " (wide opening)";
+    vitamin(str("circlip(", type[0], "): Circlip internal ", d1, "mm",wide));
    d3 = circlip_d3(type);
    d2 = circlip_d2(type);
    a = circlip_a(type);
@@ -50,7 +50,7 @@ module internal_circlip(type, open = 0) { //! Draw specified internal circlip, o
    or = od / 2;
    c = (d3 - d1);

-    angle = (od - d1) / d1 * 360 + closed_angle;
+    angle = (od - d1) / d1 * 360 + circlip_closed_angle(type);
    tab_angle = 360 * a / PI / od;
    p = [0, -or + b / 2, 1] * rot3_z(angle / 2 + tab_angle);
    pitch = (or - a / 2);
--- a/vitamins/circlips.scad
+++ b/vitamins/circlips.scad
@@ -22,7 +22,8 @@ circlip_15i = ["circlip_15i", 15, 15.7, 16.2, 1.0, 3.7, 2.0, 1.7];
 circlip_19i = ["circlip_19i", 19, 20.0, 20.5, 1.0, 4.1, 2.2, 2.0];
 circlip_21i = ["circlip_21i", 21, 22.0, 22.5, 1.0, 4.2, 2.4, 2.0];
 circlip_28i = ["circlip_28i", 28, 29.4, 30.1, 1.2, 4.8, 2.9, 2.0];
+circlip_28iw = ["circlip_28iw", 28, 29.4, 30.1, 1.2, 4.8, 2.9, 2.0, 100]; // with wide opening

-circlips = [circlip_12i, circlip_15i, circlip_19i, circlip_21i, circlip_28i];
+circlips = [circlip_12i, circlip_15i, circlip_19i, circlip_21i, circlip_28i, circlip_28iw];

 use <circlip.scad>
--- a/vitamins/linear_bearing.scad
+++ b/vitamins/linear_bearing.scad
@@ -23,6 +23,7 @@
 include <../utils/core/core.scad>

 use <../utils/tube.scad>
+use <../utils/sector.scad>

 bearing_colour = grey(70);
 groove_colour = grey(60);
@@ -36,6 +37,10 @@ function bearing_groove_length(type)    = type[4];   //! Groove length
 function bearing_groove_dia(type)       = type[5];   //! Groove diameter
 function bearing_groove_spacing(type)   = type[6];   //! Spacing between grooves, outer to outer, ie includes the grooves themselves

+function open_bearing_width(type)       = type[7]; //! For open bearings, the width of the opening at the rod
+function open_bearing_theta(type)       = 2 * asin(open_bearing_width(type) / bearing_rod_dia(type)); //! For open bearings, the angle of the opening
+
+
 function bearing_radius(type)  = bearing_dia(type) / 2; //! Outside radius

 module linear_bearing(type) { //! Draw specified linear bearing
@@ -50,21 +55,34 @@ module linear_bearing(type) { //! Draw specified linear bearing
    gs = bearing_groove_spacing(type);
    offset = (length-gs)/2;

+    module cut_tube(or, ir, h, center = true)
+        linear_extrude(h, center = center, convexity = 5)
+            difference() {
+                ring(or = or, ir = ir);
+
+                // Open bearing
+                if (!is_undef(type[7])) {
+                    theta = open_bearing_theta(type);
+
+                    sector(or + 1, 180 - theta / 2, 180 + theta / 2);
+                }
+            }
+
    if(gs==0) {
        color(bearing_colour) tube(or = or, ir = casing_ir, h = length);
    } else {
        translate_z(-length/2) {
-            color(bearing_colour) tube(or = or, ir = casing_ir, h = offset, center = false);
-            color(groove_colour) translate_z(offset) tube(or = gr, ir = casing_ir, h = gl,center = false);
-            color(bearing_colour) translate_z(offset+gl) tube(or = or, ir = casing_ir, h = gs-2*gl, center = false);
-            color(groove_colour) translate_z(offset+gs-gl) tube(or = gr, ir = casing_ir, h = gl, center = false);
-            color(bearing_colour) translate_z(offset+gs) tube(or = or, ir = casing_ir, h = offset, center = false);
+            color(bearing_colour)                           cut_tube(or = or, ir = casing_ir, h = offset, center = false);
+            color(groove_colour)  translate_z(offset)       cut_tube(or = gr, ir = casing_ir, h = gl,center = false);
+            color(bearing_colour) translate_z(offset+gl)    cut_tube(or = or, ir = casing_ir, h = gs-2*gl, center = false);
+            color(groove_colour)  translate_z(offset+gs-gl) cut_tube(or = gr, ir = casing_ir, h = gl, center = false);
+            color(bearing_colour) translate_z(offset+gs)    cut_tube(or = or, ir = casing_ir, h = offset, center = false);
        }
    }
    rod_r =  bearing_rod_dia(type) / 2;
    color(seal_colour)
-        tube(or = casing_ir, ir = rod_r + eps, h = length - 0.5);
+        cut_tube(or = casing_ir, ir = rod_r + eps, h = length - 0.5);

    color(seal_colour * 0.8)
-        tube(or = rod_r * 1.12, ir = rod_r, h = length);
+        cut_tube(or = rod_r * 1.12, ir = rod_r, h = length);
 }
--- a/vitamins/linear_bearings.scad
+++ b/vitamins/linear_bearings.scad
@@ -20,25 +20,27 @@
 //
 // Linear bearings
 //
-//                     L  od  id   gl    gd    gs
-LM16UU  = ["LM16UU",  37, 28, 16, 1.6, 27.0, 26.5];
-LM16LUU = ["LM16LUU", 70, 28, 16, 1.6, 27.0, 53.0];
-LM12UU  = ["LM12UU",  30, 21, 12, 1.3, 20.0, 23.0];
-LM12LUU = ["LM12LUU", 57, 21, 12, 1.3, 20.0, 46.0];
-LM10UU  = ["LM10UU",  29, 19, 10, 1.3, 18.0, 22.0];
-LM10LUU = ["LM10LUU", 55, 19, 10, 1.3, 18.0, 44.0];
-LM8UU   = ["LM8UU",   24, 15,  8, 1.1, 14.3, 17.5];
-LM8LUU  = ["LM8LUU",  45, 15,  8, 1.1, 14.3, 35.0];
-LM6UU   = ["LM6UU",   19, 12,  6, 1.1, 11.5, 13.5];
-LM6LUU  = ["LM6LUU",  35, 12,  6, 1.1, 11.5, 27.0];
-LM5UU   = ["LM5UU",   15, 10,  5, 1.1,  9.5, 10.2];
-LM5LUU  = ["LM5LUU",  28, 10,  5, 1.1,  9.5, 20.4];
-LM4UU   = ["LM4UU",   12,  8,  4,   0,    0,    0];
-LM4LUU  = ["LM4LUU",  23,  8,  4,   0,    0,    0];
-LM3UU   = ["LM3UU",   10,  7,  3,   0,    0,    0];
-LM3LUU  = ["LM3LUU",  19,  7,  3,   0,    0,    0];
+//                      L  od  id   gl    gd    gs   h1
+LM16UU   = ["LM16UU",   37, 28, 16, 1.6, 27.0, 26.5];
+LM16LUU  = ["LM16LUU",  70, 28, 16, 1.6, 27.0, 53.0];
+LM16UUOP = ["LM16UUOP", 37, 28, 16, 1.6, 27.0, 26.5, 11];
+LM12UU   = ["LM12UU",   30, 21, 12, 1.3, 20.0, 23.0];
+LM12LUU  = ["LM12LUU",  57, 21, 12, 1.3, 20.0, 46.0];
+LM10UU   = ["LM10UU",   29, 19, 10, 1.3, 18.0, 22.0];
+LM10LUU  = ["LM10LUU",  55, 19, 10, 1.3, 18.0, 44.0];
+LM8UU    = ["LM8UU",    24, 15,  8, 1.1, 14.3, 17.5];
+LM8LUU   = ["LM8LUU",   45, 15,  8, 1.1, 14.3, 35.0];
+LM6UU    = ["LM6UU",    19, 12,  6, 1.1, 11.5, 13.5];
+LM6LUU   = ["LM6LUU",   35, 12,  6, 1.1, 11.5, 27.0];
+LM5UU    = ["LM5UU",    15, 10,  5, 1.1,  9.5, 10.2];
+LM5LUU   = ["LM5LUU",   28, 10,  5, 1.1,  9.5, 20.4];
+LM4UU    = ["LM4UU",    12,  8,  4,   0,    0,    0];
+LM4LUU   = ["LM4LUU",   23,  8,  4,   0,    0,    0];
+LM3UU    = ["LM3UU",    10,  7,  3,   0,    0,    0];
+LM3LUU   = ["LM3LUU",   19,  7,  3,   0,    0,    0];

 linear_bearings      = [LM3UU,  LM4UU,  LM5UU,  LM6UU,  LM8UU,  LM10UU,  LM12UU,  LM16UU];
 long_linear_bearings = [LM3LUU, LM4LUU, LM5LUU, LM6LUU, LM8LUU, LM10LUU, LM12LUU, LM16LUU];
+open_linear_bearings = [LM16UUOP];

 use <linear_bearing.scad>
--- a/vitamins/pcb.scad
+++ b/vitamins/pcb.scad
@@ -62,14 +62,14 @@ function pcb_size(type) = [pcb_length(type), pcb_width(type), pcb_thickness(type
 function pcb_component(type, name, index = 0) = //! Return the component specified by name and index
    [for(component = pcb_components(type)) if(component[3] == name) component][index];

-function pcb_grid_pos(type, x, y, z = 0) = //! Returns a pcb grid position
+function pcb_grid_pos(type, x, y, z = 0, i = 0) = //! Returns a pcb grid position
    let(grid = pcb_grid(type))
-        [-pcb_size(type).x / 2 + grid.x + x * (is_undef(grid[5]) ? 2.54 : grid[5]),
-         -pcb_size(type).y / 2 + grid.y + y * (is_undef(grid[6]) ? 2.54 : grid[6]),
+        [-pcb_size(type).x / 2 + grid[i]     + x * (is_undef(grid[i + 5]) ? 2.54 : grid[i + 5]),
+         -pcb_size(type).y / 2 + grid[i + 1] + y * (is_undef(grid[i + 6]) ? 2.54 : grid[i + 6]),
          pcb_size(type).z + z];

-module pcb_grid(type, x, y, z = 0)  //! Positions children at specified grid position
-    translate(pcb_grid_pos(type, x, y, z))
+module pcb_grid(type, x, y, z = 0, i = 0)  //! Positions children at specified grid position
+    translate(pcb_grid_pos(type, x, y, z, i))
        children();

 // allows negative ordinates to represent offsets from the far edge
@@ -929,12 +929,11 @@ module molex_254_housing(ways) { //! Draw a Molex KK housing
            for(side = [-1, 1])
                translate([-depth / 2 - tab.x / 2, side * (pitch / 2 - tab.y / 4) * ways, tab.z / 2])
                    cube(tab, center = true);
-
        }
 }

 module molex_254(ways, right_angle = 0, skip = undef) { //! Draw molex KK header, set `right_angle` to 1 for normal right angle version or -1 for inverted right angle version.
-    vitamin(str("molex_254(", ways, "): Molex KK header ", ways, " way"));
+    vitamin(str("molex_254(", ways, arg(right_angle, 0, "right_angle"), arg(skip, undef, "skip"), "): Molex KK header ", ways, " way", right_angle ? " right angle" : ""));
    pitch = 2.54;
    width = ways * pitch - 0.1;
    depth = 6.35;
@@ -945,7 +944,7 @@ module molex_254(ways, right_angle = 0, skip = undef) { //! Draw molex KK header
    above = 9;
    pin_w = 0.64;
    r = 1;
-    a = right_angle ? width / 2 - r - pin_w / 2 : above;
+    a = right_angle ? depth / 2 - r - pin_w / 2 : above;
    ra_offset = 2.2;

    color("white")
@@ -974,7 +973,7 @@ module molex_254(ways, right_angle = 0, skip = undef) { //! Draw molex KK header

                    l = above + ra_offset - r - pin_w / 2;
                    if(right_angle) {
-                        translate([-l / 2 - r - pin_w / 2, 0, width / 2])
+                        translate([-l / 2 - r - pin_w / 2, 0, depth / 2])
                            cube([l, pin_w, pin_w], center = true);

                        translate([-r - pin_w / 2, 0, a])
@@ -1093,7 +1092,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
                                        pin_header(2p54header, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
        if(show(comp, "2p54joiner"))    pin_header(2p54joiner, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
        if(show(comp, "2p54boxhdr")) let($show_plugs = show_plugs && param(7, true))
-                                        box_header(2p54header, comp[4], comp[5], param(6, false), cutouts);
+                                        box_header(2p54header, comp[4], comp[5], param(6, false), cutouts, param(8, false));
        if(show(comp, "2p54socket"))    pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7, 0), param(8, false), cutouts, param(9, undef));
        if(show(comp, "chip"))          chip(comp[4], comp[5], comp[6], param(7, grey(30)), cutouts);
        if(show(comp, "rj45"))          rj45(cutouts);
@@ -1140,8 +1139,9 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
            if(show(comp, "link"))          wire_link(l = comp[4], h = param(5, 1), d = param(6, 0.8), tail = param(7, 3), sleeve = param(8, false));
            if(show(comp, "D_plug"))        translate_z(d_pcb_offset(comp[4])) d_plug(comp[4], pcb = true);
            if(show(comp, "molex_hdr"))     molex_254(comp[4], param(5, 0), param(6, undef));
-            if(show(comp, "jst_xh"))        jst_xh_header(jst_xh_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
-            if(show(comp, "jst_ph"))        jst_xh_header(jst_ph_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
+            if(show(comp, "jst_xh"))        jst_xh_header(jst_xh_header, comp[4], param(5, false), param(6, false), param(7, undef));
+            if(show(comp, "jst_ph"))        jst_xh_header(jst_ph_header, comp[4], param(5, false), param(6, false), param(7, undef));
+            if(show(comp, "jst_zh"))        jst_xh_header(jst_zh_header, comp[4], param(5, false), param(6, false), param(7, undef));
            if(show(comp, "potentiometer")) let(pot = param(4, BTT_encoder)) translate_z(pot_size(pot).z) vflip() potentiometer(pot, shaft_length = param(5, undef));
            if(show(comp, "buzzer"))        buzzer(param(4, 9), param(5, 12), param(6, grey(20)));
            if(show(comp, "smd_res"))       smd_resistor(comp[4], comp[5]);
@@ -1153,6 +1153,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
            if(show(comp, "smd_inductor"))  smd_inductor(comp[4], comp[5]);
            if(show(comp, "smd_pot"))       smd_pot(comp[4], comp[5]);
            if(show(comp, "smd_coax"))      smd_coax(comp[4]);
+            if(show(comp, "smd_qfp"))       smd_qfp(comp[4], comp[5]);
            if(show(comp, "vero_pin"))      vero_pin(param(4, false));
            if(show(comp, "terminal"))      terminal_block(comp[5], comp[4]);
            if(show(comp, "text"))          color("white") linear_extrude(eps) resize([comp[4], comp[5]]) text(comp[6], font = param(7, "Liberation Mono"), valign = "center", halign = "center");
@@ -1212,14 +1213,16 @@ module pcb_cutouts(type, angle = undef)  //! Make cut outs to clear components o

 module pcb_grid_positions(type) {
    grid =  pcb_grid(type);
-    x0 = grid.x;
-    y0 = grid.y;
+    for(i = [0 : 7 : len(grid) - 1]) {
+        x0 = grid[i];
+        y0 = grid[i + 1];

-    cols = is_undef(grid[2]) ? round((pcb_length(type) - 2 * x0) / inch(0.1)) : grid[2] - 1;
-    rows = is_undef(grid[3]) ? round((pcb_width(type) - 2 * y0) / inch(0.1))  : grid[3] - 1;
-    for(x = [0 : cols], y = [0 : rows])
-        pcb_grid(type, x, y)
-            children();
+        cols = is_undef(grid[i + 2]) ? round((pcb_length(type) - 2 * x0) / inch(0.1)) : grid[i + 2] - 1;
+        rows = is_undef(grid[i + 3]) ? round((pcb_width(type) - 2 * y0) / inch(0.1))  : grid[i + 3] - 1;
+        for(x = [0 : cols], y = [0 : rows])
+            pcb_grid(type, x, y, i = i)
+                children();
+    }
 }

 module pcb(type) { //! Draw specified PCB
--- a/vitamins/pcbs.scad
+++ b/vitamins/pcbs.scad
@@ -662,7 +662,7 @@ ArduinoUno3 = ["ArduinoUno3", "Arduino Uno R3", 68.58, 53.34, 1.6, 0, 3.3, 0, "#
     [18.7,   25.8,  0,  "rd_xtal", HC49_4H],
     [7.5,    17.2,  90, "smd_sot", SOT223],
     [7.9,    26.5,  90, "smd_sot", SOT23],
-     [21.3,    2.7,  0,  "smd_diode", DO241AC],
+     [21.3,    2.7,  0,  "smd_diode", DO214AC],
     [27.8,   34.6,  0,  "smd_led", LED0805, "red"],
     [27.8,   37,    0,  "smd_led", LED0805, "red"],
     [27.8,   42.3,  0,  "smd_led", LED0805, "red"],
@@ -796,7 +796,7 @@ MP1584EN = ["MP1584EN", "MP1584EN 3A buck converter", 22, 17, 1.25, 0, 1, [2, 2]
      [6.2, 2.1,  0, "smd_cap", CAP0603, 0.5],
      [9.2, 3.5,  0, "smd_res", RES0603, "104"],
      [9.2, 2.1,  0, "smd_res", RES0603, "104"],
-      [6.3, 14.4, 0, "smd_diode",DO241AC, "SS34"],
+      [6.3, 14.4, 0, "smd_diode",DO214AC, "SS34"],
      [12.1, 4.9, 0, "smd_cap", CAP0603, 0.5],
      [15.8, 4.9, 0, "smd_cap", CAP0603, 0.5],
      [14.5, 10, 90, "smd_inductor", IND2525, "4R7"],
@@ -858,7 +858,8 @@ ESP_01 = [
        [ -6.6,  -5.8,   0, "block", 0.7, 7.5,  0.1,  gold ],
        [ -4.8,  -2.3,   0, "block", 8.8, 0.7,  0.1,  gold ],
    ],
-    [] // accessories
+    [], // accessories
+    [2.8 - 1.27, 3.54, 2, 4, silver, 2.54, 2.54] // grid
 ];

 XIAO = [
@@ -977,12 +978,73 @@ L9110S = ["L9110S", "L9110S 2-Channel motor driver module", 29.2, 23, 1.6, 0, 3,
    ],
    []];

+PanelDue_v3 = ["PanelDue_v3", "Panel Due v3.0a LCD Display interface", 53, 73, 1.2, 0, 3.2, 0, "#2140BE", false, [[5,5], [5, -5], [43.7, 37.2]],
+   [
+    [ 45.0, 26.5,  45, "buzzer",     6, 12],
+    [ 32.8, 36.5,  90, "2p54socket", 20, 2],
+    [ 31.3,  5.9, 180, "molex_hdr",   4, 1],
+    [ 38.0, 53.2, -90, "2p54boxhdr",  5, 2, false, true, true],
+    [ 40.8, 67.4,   0, "button_6mm"],
+    [ 45.1, 16.5,   0, "button_6mm"],
+    [ 51.2, 68.0,   0, "usb_uA"],
+    [ 13.6, 35.2,   0, "smd_qfp", QFP50P1200X1200X160_64N, "ATSAM4S4BA"],
+    [ 14.6, 7.9,  180, "smd_sot", SOT223],
+    [ 23.2, 14,     0, "smd_sot", SOT23],
+    [ 31.7, 65,   180, "smd_diode", DO214AC],
+    [ 24.9, 3.8,  180, "smd_diode", DO214AC],
+    [ 1.9, 33,    -90, "smd_cap", CAP0603, 0.5],
+    [ 1.9, 28.9,   90, "smd_cap", CAP0603, 0.5],
+    [ 14.6, 13.2,   0, "smd_cap", CAP0805, 0.85],
+    [ 20.3, 57.5,  90, "smd_res", RES0603],
+    [ 18.1, 57.5,  90, "smd_res", RES0603],
+    [ 27.6, 57,     0, "smd_res", RES0603],
+    [ 27.3, 7.2,    0, "smd_res", RES0603],
+    [ 27.3, 9.7,    0, "smd_res", RES0603],
+    [ 18.5, 11.5,  90, "smd_cap", CAP0805, 0.85],
+    [ 32.5, 71.2, 180, "smd_cap", CAP0603, 0.5],
+    [ 14.1, 25.1,  90, "smd_cap", CAP0603, 0.5],
+    [ 4.2,  36.9,   0, "smd_cap", CAP0603, 0.5],
+    [ 7.7,  28.4,  90, "smd_cap", CAP0603, 0.5],
+    [ 22.0, 34.6,   0, "smd_cap", CAP0603, 0.5],
+    [ 11.4, 44.5,  90, "smd_cap", CAP0603, 0.5],
+    [ 22.1, 31.2,   0, "smd_cap", CAP0603, 0.5],
+    [ 12.0, 25.5,  90, "smd_cap", CAP0603, 0.5],
+    [ 16.2, 24.2,  90, "smd_cap", CAP0603, 0.85],
+    [  9.3, 44.5,  90, "smd_cap", CAP0603, 0.85],
+    [  5.3, 34.9,   0, "smd_cap", CAP0603, 0.5],
+    [ 37.5, 61.9,  90, "smd_res", RES0603, "0"],
+    [  4.8, 26.5,   0, "smd_cap", CAP0603, 0.85],
+    [  3.3, 24.5,   0, "smd_res", RES0603, "1"],
+    [  4.8, 30.8,  90, "chip", 5, 3.2, 1.1],
+    [  6.9, 24.5,   0, "smd_res", L2012C],
+    [ 21.8,  7.4,   0, "smd_res", L2012C],
+    [ 40.8, 71.9,   0, "text",  6, 1.42, "Erase"],
+    [ 51.4, 16.5,  90, "text",  6, 1.42, "Reset"],
+    [ 51.4, 52.2,  90, "text", 7.4, 1.42, "CONN_SD"],
+    [ 2.7,  9.7,    0, "text",   4, 1.27, "GND"],
+    [ 8.0,  9.7,    0, "text",   4, 1.27, "3.3V"],
+    [ 38.1, 21.2,   0, "text",   4, 1.42, "3.3V"],
+    [ 40.7, 12.2,   0, "text",   2, 1.42, "5V"],
+    [ 49.8, 9.8,    0, "text",   3, 1.27, "Din"],
+    [ 50.3, 7.3,    0, "text",   4, 1.27, "Dout"],
+    [ 49.8, 4.7,    0, "text",   3, 1.27, "Gnd"],
+    [ 49.8, 2.2,    0, "text",   3, 1.27, "+5V"],
+   ],
+    [],
+    [6,               60.8 - inch(0.3), 1, 4, silver, 2.54, 2.54, // X4
+     38,              16.1 - inch(0.1), 1, 3, silver, 2.54, 2.54, // JP1
+     3.1,             12,               2, 1, silver, 4.6,  2.54, // test points
+     31.3,            5.9 - inch(0.15), 1, 4, silver, 2.54, 2.64, // X1
+     38 - inch(0.05), 53.2 - inch(0.2), 2, 5, silver, 2.54, 2.54, // X5
+     32.8- inch(0.05),36.5 - inch(0.95),2, 20, silver, 2.54, 2.54, // X3
+    ],
+   ];

 tiny_pcbs = [XIAO, MP1584EN, TP4056, ESP_01, LIPO_fuel_gauge];

 big_pcbs = [BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];

-pcbs = [RAMPSEndstop, MT3608, KY_040, L9110S, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, OPZ2, RPI3A, RPI3, RPI4];
+pcbs = [RAMPSEndstop, MT3608, KY_040, L9110S, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, OPZ2, PanelDue_v3, RPI3A, RPI3, RPI4];

 pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1, PI_IO, ExtruderPCB];

--- a/vitamins/pin_header.scad
+++ b/vitamins/pin_header.scad
@@ -74,8 +74,11 @@ module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cu

        translate_z(smt ? 3.5 - h : 0) {
            for(x = [0 : cols - 1], y = [0 : rows - 1]) {
+                py = pitch * (y - (rows - 1) / 2);
+                pin = [pitch * (x - (cols - 1) / 2), py, py + width / 2]; // Position of pin joint
+
                // Vertical part of the pin
-                translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2)])
+                translate([pin.x, pin.y])
                    if(right_angle)
                        pin(type, hdr_pin_below(type) + (y + 0.5) * pitch);
                    else
@@ -84,11 +87,12 @@ module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cu
                if(right_angle) {
                    w = hdr_pin_width(type);
                    // Horizontal part of the pin
-                    rotate([-90, 0, 180])
-                        translate([pitch * (x - (cols - 1) / 2), -pitch * (y - (rows - 1) / 2) - width / 2, hdr_pin_below(type) - (y - (rows - 1) / 2) * pitch])
-                            pin(type, hdr_pin_length(type) - hdr_pin_below(type) + ra_offset + pitch / 2 + (y - 0.5) * pitch);
+                    translate([pin.x, pin.y - hdr_pin_below(type), pin.z])
+                        rotate([-90, 0, 180])
+                            pin(type, hdr_pin_length(type) - hdr_pin_below(type) + ra_offset + y * pitch);
+
                    // corner
-                    translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2) - w / 2, pitch * (y - (rows - 1) / 2) + width / 2 - w / 2])
+                    translate([pin.x, pin.y - w / 2, pin.z - w / 2])
                        rotate([0, -90, 0])
                            color(hdr_pin_colour(type))
                                rotate_extrude(angle = 90, $fn = 32)
@@ -119,7 +123,7 @@ module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cu
    }
 }

-module box_header(type, cols = 1, rows = 1, smt = false, cutout = false) { //! Draw box header
+module box_header(type, cols = 1, rows = 1, smt = false, cutout = false, right_angle = false) { //! Draw box header
    pitch = hdr_pitch(type);
    size = hdr_box_size(type);
    w = cols * pitch + 7.62;
@@ -127,36 +131,63 @@ module box_header(type, cols = 1, rows = 1, smt = false, cutout = false) { //! D
    h = size.z;
    t = hdr_box_wall(type);
    base = h - 6.4;
+    ra_offset = 2.4;

    if(cutout)
        dogbone_rectangle([cols * pitch + 2 * panel_clearance, rows * pitch + 2 * panel_clearance, 100], center = false);
    else {
-        vitamin(str("box_header(", type[0], ", ", cols, ", ", rows, arg(smt, false, "smt"), "): Box header ", cols, " x ", rows));
+        vitamin(str("box_header(", type[0], ", ", cols, ", ", rows, arg(smt, false, "smt"), arg(right_angle, false, "right_angle"), "): Box header ", cols, " x ", rows, right_angle ? " right angle " : ""));

        translate_z(smt ? 3.5 - h : 0) {
-            for(x = [0 : cols - 1], y = [0 : rows - 1])
-                translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), 0])
-                    pin(type, hdr_pin_length(type) - pitch + base);
+            for(x = [0 : cols - 1], y = [0 : rows - 1]) {
+                py = -pitch * (y - (rows - 1) / 2);
+                pin = [pitch * (x - (cols - 1) / 2), py, l / 2 - py]; // Position of pin joint

-            color(hdr_base_colour(type)) {
-                linear_extrude(base)
-                    square([w, l], center = true);
+                translate([pin.x, pin.y])
+                    if(right_angle)
+                        pin(type, hdr_pin_below(type) + pin.z);
+                    else
+                        pin(type, hdr_pin_length(type) - pitch + base);

-                linear_extrude(h)
-                    difference() {
-                        square([w, l], center = true);
+                if(right_angle) {
+                    pw = hdr_pin_width(type);
+                    // Horizontal part of the pin
+                    translate([pin.x, pin.y + hdr_pin_below(type), pin.z])
+                        rotate([-90, 0, 0])
+                            pin(type, hdr_pin_length(type) - hdr_pin_below(type) + ra_offset + y * pitch);

-                        square([w - t, l - t], center = true);
-
-                        translate([0, -l / 2])
-                            square([4.5, 4.5], center = true);
-                    }
+                    // corner
+                    translate([pin.x, pin.y + pw / 2,  pin.z - pw / 2])
+                        rotate([0, -90, 180])
+                            color(hdr_pin_colour(type))
+                                rotate_extrude(angle = 90, $fn = 32)
+                                    translate([0, -pw / 2])
+                                        square(pw);
+                }
            }
-            if(show_plugs)
-                color(housing_colour)
-                    translate_z(base)
-                        linear_extrude(housing_height)
-                            square([cols * pitch, rows * pitch], center = true);
+
+            translate([0, right_angle ? ra_offset + (rows - 1) * pitch / 2 : 0, right_angle ? l / 2 : 0])
+                rotate([right_angle ? -90 : 0, 0, 0]) {
+                    color(hdr_base_colour(type)) {
+                        linear_extrude(base)
+                            square([w, l], center = true);
+
+                        linear_extrude(h)
+                            difference() {
+                                square([w, l], center = true);
+
+                                square([w - t, l - t], center = true);
+
+                                translate([0, -l / 2])
+                                    square([4.5, 4.5], center = true);
+                            }
+                    }
+                    if(show_plugs)
+                        color(housing_colour)
+                            translate_z(base)
+                                linear_extrude(housing_height)
+                                    square([cols * pitch, rows * pitch], center = true);
+                }
        }
    }
 }
@@ -242,9 +273,11 @@ module pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt
    }
 }

-module jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_colour = false, smt = false) { //! Draw JST XH connector
-    colour = colour ? colour : hdr_base_colour(type);
-    pin_colour = pin_colour ? pin_colour : hdr_pin_colour(type);
+module jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_colour = false, smt = false) { //! Draw JST XH, PH or ZH connector
+    series = chr([ord(type[0][4]) - 32, ord(type[0][5]) - 32]);
+    vitamin(str("jst_xh_header(", type[0], ", ", pin_count, arg(right_angle, false, "right_angle"), arg(colour, false, "colour"), arg(smt, false, "smt"), "): JST ", series, " connector ",
+                pin_count, " way", right_angle ? " right_angle" :""));
+
    pitch = hdr_pitch(type);
    size = hdr_box_size(type) + [(pin_count - 1) * pitch, 0, 0];
    pinOffsetX = hdr_box_size(type).x / 2;                          // Offset from last pin to box edge
@@ -255,6 +288,7 @@ module jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_c
    ra_z = ra_h - size.y / 2;
    ra_extra = ra_h - size.y;                                   // thicker base for right angle version
    pinWidth = hdr_pin_width(type);
+    pin_colour = pin_colour ? pin_colour : hdr_pin_colour(type);

    module jst_xh_socket(type, pin_count, ra = false) {
        module wall() {
@@ -308,7 +342,7 @@ module jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_c
            }
    } // end module

-    color(colour)
+    color(colour ? colour : hdr_base_colour(type))
        if(right_angle)
            translate([0, -ra_box_offset, ra_z])
                rotate([-90, 0, 180])
--- a/vitamins/pin_headers.scad
+++ b/vitamins/pin_headers.scad
@@ -27,9 +27,9 @@
 2p54header  = ["2p54header",   2.54, 11.6, 3.2, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ];
 2p54joiner =  ["2p54joiner",   2.54, 6.86, 2.5, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ]; // Cropped pins for joining PCBs

-jst_xh_header = ["jst_xh_header",2.5,  10, 3.4, 0.64, gold,   grey(90), 0,   [4.9, 5.75, 7],   0.8, 0.525, 0.6,  6.1];
-jst_ph_header = ["jst_ph_header",2.0,   9, 3.4, 0.64, silver, grey(90), 0,   [3.9, 4.5,  6],   0.6, 0.55,  0.25, 4.8];
-jst_zh_header = ["jst_zh_header",1.5, 7.4, 3.4, 0.5 , silver, grey(90), 0,   [3.0, 3.5,4.5],   0.5, 0.45,  0.25, 3.7];
+jst_xh_header = ["jst_xh_header",2.5,  10, 3.4, 0.64, gold,   "white", 0,   [4.9, 5.75, 7],   0.8, 0.525, 0.6,  6.1];
+jst_ph_header = ["jst_ph_header",2.0,   9, 3.4, 0.64, silver, "white", 0,   [3.9, 4.5,  6],   0.6, 0.55,  0.25, 4.8];
+jst_zh_header = ["jst_zh_header",1.5, 7.4, 3.4, 0.5 , silver, "white", 0,   [3.0, 3.5,4.5],   0.5, 0.45,  0.25, 3.7];

 pin_headers = [ 2p54header ];

--- a/vitamins/potentiometer.scad
+++ b/vitamins/potentiometer.scad
@@ -32,7 +32,7 @@ function pot_face(type)     = type[2];  //! Faceplate rib width, plate depth and
 function pot_wafer(type)    = type[3];  //! Width, diameter and thickness of the track wafer plus true if curved
 function pot_gangs(type)    = type[4];  //! Number of gangs for mult-gang pot
 function pot_thread_d(type) = type[5];  //! Nomininal thread diameter
-function pot_thread_p(type) = type[6];  //! Thread pritch
+function pot_thread_p(type) = type[6];  //! Thread pitch
 function pot_thread_h(type) = type[7];  //! Height of threaded part
 function pot_boss_d(type)   = type[8];  //! Boss diameter
 function pot_boss_h(type)   = type[9];  //! Boss height
--- a/vitamins/sbr_rail.scad
+++ b/vitamins/sbr_rail.scad
@@ -0,0 +1,123 @@
+//
+// NopSCADlib Copyright Chris Palmer 2023
+// 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/>.
+//
+
+//
+//! SBR rails
+//!
+//! The rails are drawn from the center of the rod.
+//! `sbr_rail_center_height(type)` can be used to determine where the bottom of the rail is.
+//
+include <../utils/core/core.scad>
+use <bearing_block.scad>
+use <linear_bearing.scad>
+use <rod.scad>
+use <screw.scad>
+
+function sbr_rail_diameter(type)        = type[1]; //! Diameter of the rod
+function sbr_rail_center_height(type)   = type[2]; //! Height of the center above the bottom of the rail
+function sbr_rail_base_width(type)      = type[3]; //! Width of the rail base
+function sbr_rail_carriage(type)        = type[5]; //! Carriage to use with this rail
+function sbr_rail_screw(type)           = type[7]; //! Screw to fasten this rail
+
+module sbr_rail(type , l) { //! Draw an SBR rail
+    base_colour = grey(70);
+    screw_colour = grey(10);
+    d = sbr_rail_diameter(type);
+    h = sbr_rail_center_height(type);
+    B = sbr_rail_base_width(type);
+    T = type[4];
+    C = type[8];
+    S2 = sbr_rail_screw(type);
+
+    S3 = type[9];   // Screw that fastens the rod to the base
+    S3L = type[10]; // length of that screw
+
+    h1 = open_bearing_width(sbr_bearing(sbr_rail_carriage(type)));
+
+    vitamin(str("sbr_rail(", d, ", ", l, "): SBR", d, " rail, length ", l, "mm"));
+
+    not_on_bom()
+        no_explode()
+            rod(d, l, center=true);
+
+    base = (h1/2 + C/2) /2;  // guess, not clear from drawings
+
+    color(base_colour)
+        difference() {
+            linear_extrude(l - 5, center=true, convexity=2)
+                translate([0,h-(T/2),0])
+                    polygon([
+                        [-h1/2, -T/2],
+                        [-h1/2 - T/2, T/2],
+                        [-B/2, T/2],
+                        [-B/2, -T/2],
+                        [-base, -T/2],
+                        [-d/4, -h+(d/2)],
+                        [d/4, -h+(d/2)],
+                        [base, -T/2],
+                        [B/2, -T/2],
+                        [B/2, T/2],
+                        [h1/2 + T/2, T/2],
+                        [h1/2, -T/2],
+                    ]);
+            sbr_screw_locations(type, l)
+                translate([0,h-T+0.01,0])
+                    rotate([90,0,0])
+                        cylinder(r=screw_clearance_radius(S3), h=S3L, center=true);
+            sbr_screw_positions(type, l)
+                translate([0,T/2,0])
+                    rotate([90,0,0])
+                        cylinder(r=screw_clearance_radius(S2), h=T+0.1, center=true);
+
+        }
+
+    not_on_bom()
+        no_explode()
+            color(screw_colour)
+                sbr_screw_locations(type, l)
+                    translate([0,h-T,0])
+                        rotate([270,0,0])
+                            screw(S3, S3L);
+}
+
+module sbr_screw_locations(type, l) { //! Linear locations of screws
+    P = type[6];
+
+    count = floor(l / P);
+    first = (l - count * P)/2;
+    N = first == 0 ? P/2 : first;  // we don't want screws right on the edge
+
+    for (x = [N:P:l])
+        translate([0,0,l/2 - x])
+            children();
+}
+
+module sbr_screw_positions(type, l) { //! Screw positions
+    h = type[2];
+    T = type[4];
+    C = type[8];
+    S2 = sbr_rail_screw(type);
+
+    for (x = [-C/2, C/2])
+        translate([x,h-T, 0])
+            sbr_screw_locations(type, l)
+                children();
+
+
+}
--- a/vitamins/sbr_rails.scad
+++ b/vitamins/sbr_rails.scad
@@ -0,0 +1,31 @@
+//
+// NopSCADlib Copyright Chris Palmer 2023
+// 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/bearing_blocks.scad>
+
+//
+// SBR Rails
+//
+
+//                        d  h   B   T  carriage P    S2            C   S3            S3L
+SBR16S     = ["SBR16S",  16, 25, 40, 5, SBR16UU, 150, M5_cap_screw, 30, M5_cap_screw, 18  ];
+
+sbr_rails = [SBR16S];
+
+use <sbr_rail.scad>
--- a/vitamins/screw.scad
+++ b/vitamins/screw.scad
@@ -41,7 +41,7 @@ function screw_washer(type)           = type[9];     //! Default washer
 function screw_nut(type)              = type[10];    //! Default nut
 function screw_pilot_hole(type)       = type[11];    //! Pilot hole radius for wood screws, tap radius for machine screws
 function screw_clearance_radius(type) = type[12];    //! Clearance hole radius
-function screw_thread_diameter(type)  = type[13];    //! Thread diameter, if different from nominal diamter
+function screw_thread_diameter(type)  = type[13];    //! Thread diameter, if different from nominal diameter
 function screw_nut_radius(type) = screw_nut(type) ? nut_radius(screw_nut(type)) : 0; //! Radius of matching nut
 function screw_boss_diameter(type) = max(washer_diameter(screw_washer(type)) + 1, 2 * (screw_nut_radius(type) + 3 * extrusion_width)); //! Boss big enough for nut trap and washer
 function screw_head_depth(type, d = 0) =             //! How far a counter sink head will go into a straight hole diameter d
--- a/vitamins/smd.scad
+++ b/vitamins/smd.scad
@@ -99,11 +99,16 @@ module smd_led(type, colour, cutout) { //! Draw an SMD LED with specified `colou

 function smd_res_size(type)    = type[1]; //! Body length, width and height
 function smd_res_end_cap(type) = type[2]; //! End cap width
-function smd_res_power(type)   = type[3]; //! Power rating in Watts
+function smd_res_power(type)   = type[3]; //! Power rating in Watts, 0 for choke

 module smd_resistor(type, value) { //! Draw an SMD resistor with specified value
    size = smd_res_size(type);
-    vitamin(str("smd_resistor(", type[0], ", ", value, "): SMD resistor ", smd_size(size), " ", value, " ", smd_res_power(type), "W"));
+    power = smd_res_power(type);
+    call = str("smd_resistor(", type[0], ", ", value, "): SMD ");
+    if(power)
+        vitamin(str(call, "resistor ", smd_size(size), " ", value, " ", power, "W"));
+    else
+        vitamin(str(call, "choke ", smd_size(size), " ", value));

    t = 0.04;
    cap = smd_res_end_cap(type);
@@ -578,3 +583,63 @@ module smd_coax(type) { //! Draw an SMD coaxial connector
            cube([contact.x, contact.y / 2, tube_wall]);
    }
 }
+
+function smd_qfp_body_size(type) = type[1]; //! Size of the body
+function smd_qfp_slant(type)     = type[2]; //! Angle of the slope
+function smd_qfp_pins(type)      = type[3]; //! Number of pins
+function smd_qfp_pitch(type)     = type[4]; //! Pin pitch
+function smd_qfp_pin_size(type)  = type[5]; //! Pins dimensions
+function smd_qfp_gullwing(type)  = type[6]; //! Gullwing S, L, R1, R2
+
+module smd_qfp(type, value) { //! Draw and SMD QFP package
+    vitamin(str("smd_qfp(", type[0], "): SMD chip: ", value, ", package : ", type[0]));
+
+    size = smd_qfp_body_size(type);
+    offset = size.z / 2 * tan(smd_qfp_slant(type));
+    d = 3 * offset;
+    pitch = smd_qfp_pitch(type);
+    pin = smd_qfp_pin_size(type);
+    pins =  smd_qfp_pins(type);
+    g = smd_qfp_gullwing(type);
+    s = g[0]; // length of top flat
+    l = g[1]; // length of bottom flat
+    r1 = g[2]; // top radius
+    r2 = g[3] + pin.z / 2; // bottom radius
+    pz = -size.z / 2 + pin.z / 2;
+    gullwing = rounded_path([[-1, 0, 0], [s, 0, 0], r1, [pin.x - l + r2, 0, pz], r2, [pin.x, 0, pz]], $fn = 32);
+
+    color(grey(20))
+        hull() {
+            translate_z(size.z / 2)
+                linear_extrude(eps)
+                    offset(delta = d, chamfer = true)
+                        offset(-d)
+                            square([size.x, size.y], center = true);
+
+            translate_z(size.z - eps)
+                linear_extrude(eps)
+                    offset(-offset)
+                        square([size.x, size.y], center = true);
+
+            linear_extrude(eps)
+                offset(-offset)
+                    square([size.x, size.y], center = true);
+        }
+
+    color(silver)
+        for(a = [0 : 90: 270])
+            rotate(a)
+                for(i = [0 : pins / 4 - 1])
+                    translate([size.x / 2, (i - (pins / 4 - 1) / 2) * pitch, size.z / 2])
+                        sweep(gullwing, rectangle_points(pin.y, pin.z));
+
+    color("white")
+        translate_z(size.z)
+            linear_extrude(eps) {
+                resize([size.x * 0.9, size.y / 8])
+                    text(value, halign = "center", valign = "center");
+
+                translate([(-(pins / 4 - 1) * pitch) / 2, (-(pins / 4 - 1) * pitch) / 2])
+                    circle(r = pin.y, $fn = 32);
+            }
+}
--- a/vitamins/smds.scad
+++ b/vitamins/smds.scad
@@ -32,8 +32,9 @@ RES0502 = ["RES0502", [1.3, 0.6, 0.38], 0.2, 1/20];
 RES0603 = ["RES0603", [1.6, 0.8, 0.45], 0.3, 1/10];
 RES0805 = ["RES0805", [2.0, 1.2, 0.45], 0.4, 1/8];
 RES1206 = ["RES1206", [3.1, 1.6, 0.6],  0.5, 1/4];
+L2012C  = ["L2012C",  [2.0, 1.25,0.9],  0.5, 0];

-smd_resistors = [RES0402, RES0502, RES0603, RES0805, RES1206];
+smd_resistors = [RES0402, RES0502, RES0603, RES0805, RES1206, L2012C];

 CAP0402 = ["CAP0402", [1.0, 0.5], 0.2];
 CAP0502 = ["CAP0502", [1.3, 0.6], 0.2];
@@ -55,9 +56,9 @@ SOIC18 = ["SOIC18", [11.40,7.50, 2.00], 0.10, 1.20, 1.27, 10.30, [0.31, .50, 0.2

 smd_soics = [SOIC8, SOIC14, SOIC16, SOIC18];

-DO241AC = ["DO241AC", [4.0, 2.5, 2.0], 0.1, 1, [4.8, 1.2, 0.15, 2], grey(20)];
+DO214AC = ["DO214AC", [4.0, 2.5, 2.0], 0.1, 1, [4.8, 1.2, 0.15, 2], grey(20)];

-smd_diodes = [DO241AC];
+smd_diodes = [DO214AC];

 TANT_A = ["TANT_A", [3.0, 1.6, 1.6], 0.1, 0.8,  [3.2, 1.2, 0.08, 1.1], ["#E9D769", "#E9B44A"]];
 TANT_B = ["TANT_B", [3.3, 2.8, 1.9], 0.1, 0.95, [3.5, 2.2, 0.08, 1.4], ["#E9D769", "#E9B44A"]];
@@ -78,4 +79,8 @@ U_FL_R_SMT_1 = ["U_FL_R_SMT_1", [2.6, 2.6, 0.35], 0.2, [2, 1.7, 1.25], [1.86, 0.

 smd_coaxs = [U_FL_R_SMT_1];

+QFP50P1200X1200X160_64N = ["QFP50P1200X1200X160_64N", [10, 10, 1.6], 12, 64, 0.5, [1, 0.2, 0.1], [0.2, 0.6, 0.1, 0.1]];
+
+smd_qfps = [ QFP50P1200X1200X160_64N ];
+
 use <smd.scad>
Author	SHA1	Message	Date
Chris	568d63dd14	Merge branch 'jeroenrnl-SBR'	2023-07-22 17:35:34 +01:00
Chris	e3cde64b61	open_bearing_theta() now derived from open_bearing_width().	2023-07-22 17:34:22 +01:00
Chris	e61ce02414	Moved things around for better test images.	2023-07-22 16:37:35 +01:00
Chris	f8e125654e	Rendred the 3D difference.	2023-07-22 16:36:11 +01:00
Chris	62b1511c82	Removed 3D difference for speed.	2023-07-22 16:35:50 +01:00
Jeroen Roos	84d98a1081	Added SBR rails This change adds - SBR rails. For now only SBR16 - The bearing block that goes with it (SBR16UU) - An 'open' linear bearing (LM16UUOP) that is used by the bearing block - A 28mm circlip that has a wider opening than then normal circlip. (circlip_28iw)	2023-06-30 12:57:13 +02:00
Chris	8efbb1d441	Updated changelog.	2023-06-29 11:20:45 +01:00
Chris	5899ffe88f	More typos in comments.	2023-06-29 10:43:15 +01:00
Chris	b05131145c	Comment typo.	2023-06-28 23:04:15 +01:00
Chris Palmer	5da0f97485	Updated changelog.	2023-05-08 20:19:50 +01:00
Chris Palmer	c3f3d629b1	Added PanelDue V3.	2023-05-08 20:14:18 +01:00
Chris Palmer	c7ba052ccf	Added SMD QFP package.	2023-05-08 20:13:53 +01:00
Chris Palmer	c2c5f50986	Can now used smd_res() to draw chokes.	2023-05-08 20:07:18 +01:00
Chris Palmer	d0ae8ca216	Added the ability to have more than one grid on a PCB.	2023-05-08 19:56:53 +01:00
Chris Palmer	e81dcfdbd8	Added right angle option to box headers.	2023-05-08 19:52:51 +01:00
Chris Palmer	06a286dc98	Fixed missing BOM entry for JST connectors. Fixed default colour for JST connectors. Corrected BOM entry to show right angle options on Molex and pin headers.	2023-05-08 19:51:29 +01:00
Chris Palmer	f5496c373a	Fixed typo in smd_diode(DO214AC) package name.	2023-05-08 19:42:05 +01:00
Chris Palmer	1c6d3d8e95	Updated changelog.	2023-05-01 12:22:10 +01:00