Interface is the same but filenames to be included or used changed.

Changlog upated.

CHANGELOG.md

@@ -3,6 +3,41 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+## [v14.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v14.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v13.5.0...v14.0.0 "diff with v13.5.0")
+*   2021-03-06 [`491c3b4`](https://github.com/nophead/NopSCADlib/commit/491c3b4ea8d2ef51e55fd389f0dc0b9a6b9bd9a4 "show commit") [C.P.](# "Chris Palmer") Updated readme, `lib.scad` and image.
+
+*   2021-03-06 [`3023604`](https://github.com/nophead/NopSCADlib/commit/30236046a81a6251bf2e869f826c881830569c06 "show commit") [M.B.](# "Martin Budden") Renamed `rounded_right_triangle` files to `rounded_triangle`.
+
+*   2021-03-06 [`3c605d6`](https://github.com/nophead/NopSCADlib/commit/3c605d608b3d0b501d1612970ce7976c9540a9a2 "show commit") [C.P.](# "Chris Palmer") Updated path, readme and image
+
+*   2021-03-06 [`93aeb4c`](https://github.com/nophead/NopSCADlib/commit/93aeb4cf2c7edd011019203ac398a911561e7c04 "show commit") [M.B.](# "Martin Budden") Renamed `scs_bearing_blocks` files to `bearing_blocks`.
+
+*   2021-03-06 [`e9554cc`](https://github.com/nophead/NopSCADlib/commit/e9554ccffe5f2a5567859937478ae9c061e30a8f "show commit") [C.P.](# "Chris Palmer") Fixed paths and image.
+
+*   2021-03-06 [`2320cbd`](https://github.com/nophead/NopSCADlib/commit/2320cbdbb866f1e38724919772ac63bc7b887674 "show commit") [M.B.](# "Martin Budden") Renamed `kp_pillow_blocks` files to `pillow_blocks`.
+
+### [v13.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v13.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v13.4.1...v13.5.0 "diff with v13.4.1")
+*   2021-03-06 [`7ce991e`](https://github.com/nophead/NopSCADlib/commit/7ce991e625d857213b2c485f4e16fcf7e573fd11 "show commit") [C.P.](# "Chris Palmer") Updated readme for pulleys on BOM.
+
+*   2021-03-06 [`7c1c8e9`](https://github.com/nophead/NopSCADlib/commit/7c1c8e92f2bb6687e17772ca61c9ee50639bd877 "show commit") [M.B.](# "Martin Budden") Removed green code.
+
+*   2021-03-06 [`d80fc57`](https://github.com/nophead/NopSCADlib/commit/d80fc5709e4dd448353e0770f1ed28b9cf338dfe "show commit") [M.B.](# "Martin Budden") Left pulleys on BOM when `show_pulleys` `true`.
+
+*   2021-03-06 [`54c3b4f`](https://github.com/nophead/NopSCADlib/commit/54c3b4f6007d317b0dae4b45ea254c2d7571113f "show commit") [C.P.](# "Chris Palmer") Fixed path, updated readme and picture.
+
+*   2021-03-06 [`769cb44`](https://github.com/nophead/NopSCADlib/commit/769cb442070a7dcd780593c78e9354c594460454 "show commit") [M.B.](# "Martin Budden") Renamed `core_xy` files.
+
+*   2021-03-06 [`4c12d5f`](https://github.com/nophead/NopSCADlib/commit/4c12d5fca4f00f68adeb183757d1b445808a192a "show commit") [M.B.](# "Martin Budden") Added parameterised CoreXY.
+
+#### [v13.4.1](https://github.com/nophead/NopSCADlib/releases/tag/v13.4.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v13.4.0...v13.4.1 "diff with v13.4.0")
+*   2021-03-06 [`09956b6`](https://github.com/nophead/NopSCADlib/commit/09956b62190f701fbea0826977ef7de27c39c19f "show commit") [M.B.](# "Martin Budden") Improved resilience of `compare_images`.
+
+*   2021-03-06 [`b83e567`](https://github.com/nophead/NopSCADlib/commit/b83e56713fbde2ac25e9750c369ae9cec4d67913 "show commit") [M.B.](# "Martin Budden") Reordered openscad command line parameters.
+
+*   2021-03-04 [`da4f9fb`](https://github.com/nophead/NopSCADlib/commit/da4f9fbdc31d2ceaa853c2fa0270e6961fde28b9 "show commit") [C.P.](# "Chris Palmer") Typo in `changlog.py` doc string.
+
+*   2021-03-03 [`614e5f3`](https://github.com/nophead/NopSCADlib/commit/614e5f3a72db309a3dee996d7241317556883e8d "show commit") [C.P.](# "Chris Palmer") Issues in the changelog now link to to the issue.
+
 *   2021-03-03 [`a7eae4f`](https://github.com/nophead/NopSCADlib/commit/a7eae4f549b51dbe4624a8b67012919cef6cb24a "show commit") [C.P.](# "Chris Palmer") Neater changlog format.
 
 *   2021-03-03 [`7b770ab`](https://github.com/nophead/NopSCADlib/commit/7b770abe12b71fa4b4f7415aa9f46d0f2c9d54f1 "show commit") [C.P.](# "Chris Palmer") Udpated changelog

lib.scad

@@ -26,6 +26,7 @@ include <vitamins/psus.scad>
 include <vitamins/pcbs.scad>
 
 include <vitamins/batteries.scad>
+include <vitamins/bearing_blocks.scad>
 include <vitamins/blowers.scad>
 include <vitamins/bulldogs.scad>
 include <vitamins/buttons.scad>
@@ -37,7 +38,6 @@ include <vitamins/extrusion_brackets.scad>
 include <vitamins/geared_steppers.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
-include <vitamins/kp_pillow_blocks.scad>
 include <vitamins/ldrs.scad>
 include <vitamins/leadnuts.scad>
 include <vitamins/led_meter.scad>
@@ -47,12 +47,12 @@ include <vitamins/mains_sockets.scad>
 include <vitamins/modules.scad>
 include <vitamins/panel_meters.scad>
 include <vitamins/pillars.scad>
+include <vitamins/pillow_blocks.scad>
 include <vitamins/pin_headers.scad>
 include <vitamins/pulleys.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
 include <vitamins/rod.scad>
-include <vitamins/scs_bearing_blocks.scad>
 include <vitamins/shaft_couplings.scad>
 include <vitamins/sheets.scad>
 include <vitamins/sk_brackets.scad>
@@ -89,7 +89,7 @@ use <utils/gears.scad>
 use <utils/hanging_hole.scad>
 use <utils/fillet.scad>
 use <utils/rounded_polygon.scad>
-use <utils/rounded_right_triangle.scad>
+use <utils/rounded_triangle.scad>
 use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>

libtest.scad

@@ -43,6 +43,7 @@ include <lib.scad>
 
 use <tests/ball_bearings.scad>
 use <tests/batteries.scad>
+use <tests/bearing_blocks.scad>
 use <tests/belts.scad>
 use <tests/blowers.scad>
 use <tests/bulldogs.scad>
@@ -64,7 +65,6 @@ use <tests/hot_ends.scad>
 use <tests/IECs.scad>
 use <tests/inserts.scad>
 use <tests/jack.scad>
-use <tests/KP_pillow_blocks.scad>
 use <tests/leadnuts.scad>
 use <tests/LDRs.scad>
 use <tests/LEDs.scad>
@@ -80,6 +80,7 @@ use <tests/opengrab.scad>
 use <tests/panel_meters.scad>
 use <tests/PCBs.scad>
 use <tests/pillars.scad>
+use <tests/pillow_blocks.scad>
 use <tests/press_fit.scad>
 use <tests/PSUs.scad>
 use <tests/pulleys.scad>
@@ -88,7 +89,6 @@ use <tests/ring_terminals.scad>
 use <tests/rockers.scad>
 use <tests/rod.scad>
 use <tests/screws.scad>
-use <tests/SCS_bearing_blocks.scad>
 use <tests/sealing_strip.scad>
 use <tests/shaft_couplings.scad>
 use <tests/sheets.scad>

readme.md

@@ -22,30 +22,30 @@ A list of changes classified as breaking, additions or fixes is maintained in [C
 <table><tr>
 <th align="left"> Vitamins A-I </th><th align="left"> Vitamins J-Q </th><th align="left"> Vitamins R-Z </th><th align="left"> Printed </th><th align="left"> Utilities </th><th align="left"> Core Utilities </th></tr>
 <tr><td> <a href = "#Axials">Axials</a> </td><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#BOM">BOM</a> </td></tr>
-<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#KP_pillow_blocks">KP_pillow_blocks</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
-<tr><td> <a href = "#Batteries">Batteries</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 = "#Catenary">Catenary</a> </td><td> <a href = "#Global">Global</a> </td></tr>
-<tr><td> <a href = "#Belts">Belts</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 = "#Polyholes">Polyholes</a> </td></tr>
-<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#LEDs">LEDs</a> </td><td> <a href = "#SCS_bearing_blocks">SCS_bearing_blocks</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#Bulldogs">Bulldogs</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 = "#Sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#Buttons">Buttons</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> <a href = "#Teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#Cable_strips">Cable_strips</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 = "#Cameras">Cameras</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 = "#Circlips">Circlips</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 = "#Components">Components</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 = "#DIP">DIP</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 = "#D_connectors">D_connectors</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 = "#Displays">Displays</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 = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Rounded_right_triangle">Rounded_right_triangle</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#Pocket_handle">Pocket_handle</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Pillars">Pillars</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 = "#Hygrometer">Hygrometer</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 = "#IECs">IECs</a> </td><td> <a href = "#Pulleys">Pulleys</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 = "#Inserts">Inserts</a> </td><td></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>
+<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#LDRs">LDRs</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
+<tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#LED_meters">LED_meters</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Catenary">Catenary</a> </td><td> <a href = "#Global">Global</a> </td></tr>
+<tr><td> <a href = "#Bearing_blocks">Bearing_blocks</a> </td><td> <a href = "#LEDs">LEDs</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Camera_housing">Camera_housing</a> </td><td> <a href = "#Core_xy">Core_xy</a> </td><td> <a href = "#Polyholes">Polyholes</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 = "#Carriers">Carriers</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</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 = "#Corner_block">Corner_block</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#SSRs">SSRs</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Gears">Gears</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Magnets">Magnets</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td></td></tr>
+<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Drag_chain">Drag_chain</a> </td><td> <a href = "#Horiholes">Horiholes</a> </td><td></td></tr>
+<tr><td> <a href = "#Cameras">Cameras</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Shaft_couplings">Shaft_couplings</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Layout">Layout</a> </td><td></td></tr>
+<tr><td> <a href = "#Circlips">Circlips</a> </td><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Maths">Maths</a> </td><td></td></tr>
+<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#DIP">DIP</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Pocket_handle">Pocket_handle</a> </td><td> <a href = "#Rounded_triangle">Rounded_triangle</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#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 = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pulleys">Pulleys</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 = "#IECs">IECs</a> </td><td></td><td> <a href = "#Zipties">Zipties</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td></td><td></td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
 </table>
 
 ---
@@ -200,6 +200,68 @@ exposing enough information to make a battery box.
 |   1 | `battery(S25R18650)` |  Cell Samsung 25R 18650 LION |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Bearing_blocks"></a>
+## Bearing_blocks
+SCSnUU and SCSnLUU bearing blocks
+
+[vitamins/bearing_blocks.scad](vitamins/bearing_blocks.scad) Object definitions.
+
+[vitamins/bearing_block.scad](vitamins/bearing_block.scad) Implementation.
+
+[tests/bearing_blocks.scad](tests/bearing_blocks.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `scs_bearing(type)` | Linear bearing used |
+| `scs_block_center_height(type)` | Height of the center of the block |
+| `scs_block_side_height(type)` | Height of the side of the block, this determines the minimum screw length |
+| `scs_circlip(type)` | Circlip used |
+| `scs_hole_offset(type)` | Offset of bearing hole from base of block |
+| `scs_screw(type)` | Screw type |
+| `scs_screw_separation_x(type)` | Screw separation in X direction |
+| `scs_screw_separation_z(type)` | Screw separation in Z direction |
+| `scs_spacer(type)` | Spacer used in long bearings |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `scs_size(type)` | Size of scs bracket bounding block |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `scs_bearing_block(type)` | Draw the specified SCS bearing block |
+| `scs_bearing_block_assembly(type, part_thickness, screw_type, nut_type)` | Assembly with screws and nuts in place |
+| `scs_bearing_block_hole_positions(type)` | Place children at hole positions |
+
+![bearing_blocks](tests/png/bearing_blocks.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|  12 | `nut(M4_nut)` |  Nut M4 x 3.2mm  |
+|  24 | `nut(M5_nut)` |  Nut M5 x 4mm  |
+|   1 | `scs_bearing_block(SCS10LUU)` |  SCS10LUU bearing block |
+|   1 | `scs_bearing_block(SCS10UU)` |  SCS10UU bearing block |
+|   1 | `scs_bearing_block(SCS12LUU)` |  SCS12LUU bearing block |
+|   1 | `scs_bearing_block(SCS12UU)` |  SCS12UU bearing block |
+|   1 | `scs_bearing_block(SCS16LUU)` |  SCS16LUU bearing block |
+|   1 | `scs_bearing_block(SCS16UU)` |  SCS16UU bearing block |
+|   1 | `scs_bearing_block(SCS6UU)` |  SCS6UU bearing block |
+|   1 | `scs_bearing_block(SCS8LUU)` |  SCS8LUU bearing block |
+|   1 | `scs_bearing_block(SCS8UU)` |  SCS8UU bearing block |
+|   4 | `screw(M4_cap_screw, 25)` |  Screw M4 cap x 25mm |
+|   8 | `screw(M4_cap_screw, 30)` |  Screw M4 cap x 30mm |
+|  16 | `screw(M5_cap_screw, 35)` |  Screw M5 cap x 35mm |
+|   8 | `screw(M5_cap_screw, 45)` |  Screw M5 cap x 45mm |
+|  12 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
+|  24 | `washer(M5_washer)` |  Washer  M5 x 10mm x 1mm |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -1309,58 +1371,6 @@ E.g. a "brown" socket for mains live needs to be displayed as "sienna" to look r
 |   1 | `jack_4mm_shielded("brown", 3, "sienna")` |  4mm shielded jack socket brown |
 
 
-<a href="#top">Top</a>
-
----
-<a name="KP_pillow_blocks"></a>
-## KP_pillow_blocks
-KP pillow block bearings
-
-[vitamins/kp_pillow_blocks.scad](vitamins/kp_pillow_blocks.scad) Object definitions.
-
-[vitamins/kp_pillow_block.scad](vitamins/kp_pillow_block.scad) Implementation.
-
-[tests/KP_pillow_blocks.scad](tests/KP_pillow_blocks.scad) Code for this example.
-
-### Properties
-| Function | Description |
-|:--- |:--- |
-| `kp_base_height(type)` | Height of base containing the bolts |
-| `kp_diameter(type)` | Rod hole diameter |
-| `kp_hole_offset(type)` | Rod hole offset |
-| `kp_screw_separation(type)` | Separation of bolts in the base |
-
-### Functions
-| Function | Description |
-|:--- |:--- |
-| `kp_size(type)` | Size of bracket |
-
-### Modules
-| Module | Description |
-|:--- |:--- |
-| `kp_pillow_block(type)` | Draw the KP pillow block |
-| `kp_pillow_block_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef)` | Assembly with fasteners in place |
-| `kp_pillow_block_hole_positions(type)` | Place children at hole positions |
-
-![kp_pillow_blocks](tests/png/kp_pillow_blocks.png)
-
-### Vitamins
-| Qty | Module call | BOM entry |
-| ---:|:--- |:---|
-|   1 | `kp_pillow_block(KP000)` |  KP000 pillow block |
-|   1 | `kp_pillow_block(KP001)` |  KP001 pillow block |
-|   1 | `kp_pillow_block(KP08_15)` |  KP08_15 pillow block |
-|   1 | `kp_pillow_block(KP08_18)` |  KP08_18 pillow block |
-|   2 | `sliding_t_nut(M4_hammer_nut)` |  Nut M4 hammer |
-|   2 | `sliding_t_nut(M4_sliding_t_nut)` |  Nut M4 sliding T |
-|   2 | `sliding_t_nut(M5_sliding_t_nut)` |  Nut M5 sliding T |
-|   2 | `nut(M5_nut, nyloc = undef)` |  Nut M5 x 4mm  |
-|   4 | `screw(M4_cap_screw, 10)` |  Screw M4 cap x 10mm |
-|   4 | `screw(M5_cap_screw, 12)` |  Screw M5 cap x 12mm |
-|   4 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
-|   6 | `washer(M5_washer)` |  Washer  M5 x 10mm x 1mm |
-
-
 <a href="#top">Top</a>
 
 ---
@@ -2444,6 +2454,58 @@ Threaded pillars. Each end can be male or female.
 |   1 | `pillar(M4x17_nylon_pillar)` |  Pillar nylon M/F M4x20 |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Pillow_blocks"></a>
+## Pillow_blocks
+KP pillow block bearings
+
+[vitamins/pillow_blocks.scad](vitamins/pillow_blocks.scad) Object definitions.
+
+[vitamins/pillow_block.scad](vitamins/pillow_block.scad) Implementation.
+
+[tests/pillow_blocks.scad](tests/pillow_blocks.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `kp_base_height(type)` | Height of base containing the bolts |
+| `kp_diameter(type)` | Rod hole diameter |
+| `kp_hole_offset(type)` | Rod hole offset |
+| `kp_screw_separation(type)` | Separation of bolts in the base |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `kp_size(type)` | Size of bracket |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `kp_pillow_block(type)` | Draw the KP pillow block |
+| `kp_pillow_block_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef)` | Assembly with fasteners in place |
+| `kp_pillow_block_hole_positions(type)` | Place children at hole positions |
+
+![pillow_blocks](tests/png/pillow_blocks.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | `kp_pillow_block(KP000)` |  KP000 pillow block |
+|   1 | `kp_pillow_block(KP001)` |  KP001 pillow block |
+|   1 | `kp_pillow_block(KP08_15)` |  KP08_15 pillow block |
+|   1 | `kp_pillow_block(KP08_18)` |  KP08_18 pillow block |
+|   2 | `sliding_t_nut(M4_hammer_nut)` |  Nut M4 hammer |
+|   2 | `sliding_t_nut(M4_sliding_t_nut)` |  Nut M4 sliding T |
+|   2 | `sliding_t_nut(M5_sliding_t_nut)` |  Nut M5 sliding T |
+|   2 | `nut(M5_nut, nyloc = undef)` |  Nut M5 x 4mm  |
+|   4 | `screw(M4_cap_screw, 10)` |  Screw M4 cap x 10mm |
+|   4 | `screw(M5_cap_screw, 12)` |  Screw M5 cap x 12mm |
+|   4 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
+|   6 | `washer(M5_washer)` |  Washer  M5 x 10mm x 1mm |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -2978,68 +3040,6 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |   1 | polysink.stl |
 
 
-<a href="#top">Top</a>
-
----
-<a name="SCS_bearing_blocks"></a>
-## SCS_bearing_blocks
-SCSnUU and SCSnLUU bearing blocks
-
-[vitamins/scs_bearing_blocks.scad](vitamins/scs_bearing_blocks.scad) Object definitions.
-
-[vitamins/scs_bearing_block.scad](vitamins/scs_bearing_block.scad) Implementation.
-
-[tests/SCS_bearing_blocks.scad](tests/SCS_bearing_blocks.scad) Code for this example.
-
-### Properties
-| Function | Description |
-|:--- |:--- |
-| `scs_bearing(type)` | Linear bearing used |
-| `scs_block_center_height(type)` | Height of the center of the block |
-| `scs_block_side_height(type)` | Height of the side of the block, this determines the minimum screw length |
-| `scs_circlip(type)` | Circlip used |
-| `scs_hole_offset(type)` | Offset of bearing hole from base of block |
-| `scs_screw(type)` | Screw type |
-| `scs_screw_separation_x(type)` | Screw separation in X direction |
-| `scs_screw_separation_z(type)` | Screw separation in Z direction |
-| `scs_spacer(type)` | Spacer used in long bearings |
-
-### Functions
-| Function | Description |
-|:--- |:--- |
-| `scs_size(type)` | Size of scs bracket bounding block |
-
-### Modules
-| Module | Description |
-|:--- |:--- |
-| `scs_bearing_block(type)` | Draw the specified SCS bearing block |
-| `scs_bearing_block_assembly(type, part_thickness, screw_type, nut_type)` | Assembly with screws and nuts in place |
-| `scs_bearing_block_hole_positions(type)` | Place children at hole positions |
-
-![scs_bearing_blocks](tests/png/scs_bearing_blocks.png)
-
-### Vitamins
-| Qty | Module call | BOM entry |
-| ---:|:--- |:---|
-|  12 | `nut(M4_nut)` |  Nut M4 x 3.2mm  |
-|  24 | `nut(M5_nut)` |  Nut M5 x 4mm  |
-|   1 | `scs_bearing_block(SCS10LUU)` |  SCS10LUU bearing block |
-|   1 | `scs_bearing_block(SCS10UU)` |  SCS10UU bearing block |
-|   1 | `scs_bearing_block(SCS12LUU)` |  SCS12LUU bearing block |
-|   1 | `scs_bearing_block(SCS12UU)` |  SCS12UU bearing block |
-|   1 | `scs_bearing_block(SCS16LUU)` |  SCS16LUU bearing block |
-|   1 | `scs_bearing_block(SCS16UU)` |  SCS16UU bearing block |
-|   1 | `scs_bearing_block(SCS6UU)` |  SCS6UU bearing block |
-|   1 | `scs_bearing_block(SCS8LUU)` |  SCS8LUU bearing block |
-|   1 | `scs_bearing_block(SCS8UU)` |  SCS8UU bearing block |
-|   4 | `screw(M4_cap_screw, 25)` |  Screw M4 cap x 25mm |
-|   8 | `screw(M4_cap_screw, 30)` |  Screw M4 cap x 30mm |
-|  16 | `screw(M5_cap_screw, 35)` |  Screw M5 cap x 35mm |
-|   8 | `screw(M5_cap_screw, 45)` |  Screw M5 cap x 45mm |
-|  12 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
-|  24 | `washer(M5_washer)` |  Washer  M5 x 10mm x 1mm |
-
-
 <a href="#top">Top</a>
 
 ---
@@ -5574,6 +5574,69 @@ The coordinates of the lowest point on the curve can be retrieved by calling `ca
 ![catenary](tests/png/catenary.png)
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Core_xy"></a>
+## Core_xy
+Parameterised Core XY implementation. Draws the belts and provides utilities for positioning the pulleys.
+
+The belts are positioned according the bottom left "anchor" pulley and the top right drive pulley.
+Implementation has the following features:
+1. The drive and idler pulleys may be different sizes.
+2. The belt separation is parameterised.
+3. The separation of the plain and toothed pulleys on the Y carriages is parameterised, in both the X and the Y direction.
+4. The drive pulleys may be offset in the X and Y directions. If this is done, extra idler pulleys are added. This
+allows flexible positioning of the motors.
+
+[utils/core_xy.scad](utils/core_xy.scad) Implementation.
+
+[tests/core_xy.scad](tests/core_xy.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `coreXY_belt(type)` | Belt type |
+| `coreXY_drive_pulley(type)` | Drive pulley type |
+| `coreXY_lower_belt_colour(type)` | Colour of the lower belt |
+| `coreXY_lower_tooth_colour(type)` | Colour of the lower belt's teeth |
+| `coreXY_plain_idler(type)` | Plain idler type |
+| `coreXY_toothed_idler(type)` | Toothed idler type |
+| `coreXY_upper_belt_colour(type)` | Colour of the upper belt |
+| `coreXY_upper_tooth_colour(type)` | Colour of the upper belt's teeth |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `coreXY_coincident_separation(type)` | Value of x, y separation to make y-carriage pulleys coincident |
+| `coreXY_drive_plain_idler_offset(type)` | Offset of plain drive idler pulley |
+| `coreXY_drive_pulley_x_alignment(type)` | Belt alignment offset of the drive pulley relative to the anchor pulley |
+| `coreXY_drive_toothed_idler_offset(type)` | Offset of toothed drive idler pulley |
+| `coreXY_plain_idler_offset(type)` | Offset of y-carriage plain idler |
+| `coreXY_toothed_idler_offset(type)` | offset of y-carriage toothed idler |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `coreXY(type, size, pos, separation, x_gap, plain_idler_offset = 0, upper_drive_pulley_offset, lower_drive_pulley_offset, show_pulleys = false)` | Wrapper module to draw both belts of a coreXY setup |
+| `coreXY_belts(type, carriagePosition, coreXYPosBL, coreXYPosTR, separation, x_gap = 20, upper_drive_pulley_offset = [0, 0], lower_drive_pulley_offset = [0, 0], show_pulleys = false)` | Draw the coreXY belts |
+| `coreXY_half(type, size, pos, separation_y = 0, x_gap = 0, plain_idler_offset = 0, drive_pulley_offset = [0, 0], show_pulleys = false, lower_belt = false, hflip = false)` | Draw one belt of a coreXY setup |
+
+![core_xy](tests/png/core_xy.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | `belt(GT2x6, [ ... ], [10.0078, 11.69], [0, -24.686])` |  Belt GT2 x 6mm x 742mm |
+|   1 | `belt(GT2x6, [ ... ], [10.0078, 11.69], [0, -24.686])` |  Belt GT2 x 6mm x 852mm |
+|   7 | `pulley(GT2x16_toothed_idler)` |  Pulley GT2 idler 16 teeth |
+|   3 | `pulley(GT2x16_plain_idler)` |  Pulley GT2 idler smooth 9.63mm |
+|   2 | `pulley(GT2x20ob_pulley)` |  Pulley GT2OB 20 teeth |
+|   8 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
+|   4 | `screw(M3_grub_screw, 6)` |  Screw M3 grub x  6mm |
+|   2 | `NEMA(NEMA17M)` |  Stepper motor NEMA17 x 40mm |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -5907,20 +5970,20 @@ Because the tangents need to be calculated to find the length these can be calcu
 <a href="#top">Top</a>
 
 ---
-<a name="Rounded_right_triangle"></a>
-## Rounded_right_triangle
+<a name="Rounded_triangle"></a>
+## Rounded_triangle
 Draw a 3D right triangle with rounded edges. Intended to be embedded in other parts. Can be optionally offset by the filleted amount.
 
-[utils/rounded_right_triangle.scad](utils/rounded_right_triangle.scad) Implementation.
+[utils/rounded_triangle.scad](utils/rounded_triangle.scad) Implementation.
 
-[tests/rounded_right_triangle.scad](tests/rounded_right_triangle.scad) Code for this example.
+[tests/rounded_triangle.scad](tests/rounded_triangle.scad) Code for this example.
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
 | `rounded_right_triangle(x, y, z, fillet, center = true, offset = false)` | Draw a 3D right triangle with rounded edges. |
 
-![rounded_right_triangle](tests/png/rounded_right_triangle.png)
+![rounded_triangle](tests/png/rounded_triangle.png)
 
 
 <a href="#top">Top</a>

tests/bearing_blocks.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-include <../vitamins/scs_bearing_blocks.scad>
+include <../vitamins/bearing_blocks.scad>
 
 use <../utils/layout.scad>
 

tests/core_xy.scad

@@ -0,0 +1,134 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+include <../core.scad>
+include <../vitamins/pulleys.scad>
+include <../vitamins/screws.scad>
+include <../vitamins/stepper_motors.scad>
+include <../vitamins/washers.scad>
+
+include <../utils/core_xy.scad>
+
+
+module coreXY_belts_test() {
+    coreXY_type = coreXY_GT2_20_16;
+    plain_idler = coreXY_plain_idler(coreXY_type);
+    toothed_idler = coreXY_toothed_idler(coreXY_type);
+
+    coreXYPosBL = [0, 0, 0];
+    coreXYPosTR = [200, 150, 0];
+    separation = [0, coreXY_coincident_separation(coreXY_type).y, pulley_height(plain_idler) + washer_thickness(M3_washer)];
+    pos = [100, 50];
+
+    upper_drive_pulley_offset = [40, 10];
+    lower_drive_pulley_offset = [0, 0];
+
+    coreXY_belts(coreXY_type,
+        carriagePosition = pos,
+        coreXYPosBL = coreXYPosBL,
+        coreXYPosTR = coreXYPosTR,
+        separation = separation,
+        x_gap = 10,
+        upper_drive_pulley_offset = upper_drive_pulley_offset,
+        lower_drive_pulley_offset = lower_drive_pulley_offset,
+        show_pulleys = true);
+
+
+    translate([coreXYPosBL.x + separation.x/2, coreXYPosTR.y + upper_drive_pulley_offset.y, separation.z/2]) {
+        // add the upper drive pulley stepper motor
+        translate([coreXY_drive_pulley_x_alignment(coreXY_type) + upper_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
+            NEMA(NEMA17M);
+
+        // add the screws for the upper drive offset idler pulleys if required
+        if (upper_drive_pulley_offset.x > 0) {
+            translate(coreXY_drive_plain_idler_offset(coreXY_type))
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate(coreXY_drive_toothed_idler_offset(coreXY_type))
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+         } else if (upper_drive_pulley_offset.x < 0) {
+            translate([-pulley_od(plain_idler), coreXY_drive_plain_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate([2*coreXY_drive_pulley_x_alignment(coreXY_type), coreXY_drive_toothed_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+        }
+    }
+
+    translate([coreXYPosTR.x - separation.x/2, coreXYPosTR.y + lower_drive_pulley_offset.y, -separation.z/2]) {
+        // add the lower drive pulley stepper motor
+        translate([-coreXY_drive_pulley_x_alignment(coreXY_type) + lower_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
+            NEMA(NEMA17M);
+
+        // add the screws for the lower drive offset idler pulleys if required
+        if (lower_drive_pulley_offset.x < 0) {
+            translate([-coreXY_drive_plain_idler_offset(coreXY_type).x, coreXY_drive_plain_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate(coreXY_drive_toothed_idler_offset(coreXY_type))
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+        } else if (lower_drive_pulley_offset.x > 0) {
+            translate([pulley_od(plain_idler), coreXY_drive_plain_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate([-2*coreXY_drive_pulley_x_alignment(coreXY_type), coreXY_drive_toothed_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+        }
+    }
+
+    // add the screw for the left upper idler pulley
+    translate([coreXYPosBL.x + separation.x/2, coreXYPosBL.y, separation.z])
+        screw(M3_cap_screw, 20);
+
+    // add the screw for the right upper idler pulley
+    translate([coreXYPosTR.x + separation.x/2, coreXYPosBL.y, separation.z])
+        screw(M3_cap_screw, 20);
+
+    if (separation.x != 0) {
+        // add the screw for the left lower idler pulley
+        translate([coreXYPosBL.x - separation.x/2, coreXYPosBL.y, 0])
+            screw(M3_cap_screw, 20);
+
+        // add the screw for the right lower idler pulley
+        translate([coreXYPosTR.x - separation.x/2, coreXYPosBL.y, 0])
+            screw(M3_cap_screw, 20);
+    }
+
+    translate([-separation.x/2, pos.y + coreXYPosBL.y -separation.y/2, -separation.z/2 + pulley_height(plain_idler)/2]) {
+        // add the screw for the left Y carriage toothed idler
+        translate([coreXYPosBL.x, coreXY_toothed_idler_offset(coreXY_type).y, 0])
+            screw(M3_cap_screw, 20);
+        // add the screw for the left Y carriage plain idler
+        translate([coreXYPosBL.x + separation.x + coreXY_plain_idler_offset(coreXY_type).x, separation.y + coreXY_plain_idler_offset(coreXY_type).y, separation.z])
+            screw(M3_cap_screw, 20);
+        // add the screw for the right Y carriage toothed idler
+        translate([coreXYPosTR.x + separation.x, coreXY_toothed_idler_offset(coreXY_type).y, separation.z])
+            screw(M3_cap_screw, 20);
+        // add the screw for the right Y carriage plain idler
+        translate([coreXYPosTR.x - coreXY_plain_idler_offset(coreXY_type).x, separation.y + coreXY_plain_idler_offset(coreXY_type).y, 0])
+            screw(M3_cap_screw, 20);
+    }
+}
+
+if ($preview)
+    coreXY_belts_test();

tests/pillow_blocks.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-include <../vitamins/kp_pillow_blocks.scad>
+include <../vitamins/pillow_blocks.scad>
 
 use <../utils/layout.scad>
 

tests/rounded_triangle.scad

@@ -18,7 +18,7 @@
 //
 
 include <../global_defs.scad>
-use <../utils/rounded_right_triangle.scad>
+use <../utils/rounded_triangle.scad>
 
 
 module rounded_right_triangles() {

utils/core_xy.scad

@@ -0,0 +1,196 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Parameterised Core XY implementation. Draws the belts and provides utilities for positioning the pulleys.
+//!
+//! The belts are positioned according the bottom left "anchor" pulley and the top right drive pulley.
+//! Implementation has the following features:
+//! 1. The drive and idler pulleys may be different sizes.
+//! 2. The belt separation is parameterised.
+//! 3. The separation of the plain and toothed pulleys on the Y carriages is parameterised, in both the X and the Y direction.
+//! 4. The drive pulleys may be offset in the X and Y directions. If this is done, extra idler pulleys are added. This
+//! allows flexible positioning of the motors.
+//
+include <../core.scad>
+include <../vitamins/belts.scad>
+include <../vitamins/pulleys.scad>
+
+
+coreXY_GT2_20_20 = ["coreXY_20_20", GT2x6, GT2x20ob_pulley, GT2x20_toothed_idler, GT2x20_plain_idler, [0, 0, 1], [0, 0, 0.5, 1], [0, 1, 0], [0, 0.5, 0, 1] ];
+coreXY_GT2_20_16 = ["coreXY_20_16", GT2x6, GT2x20ob_pulley, GT2x16_toothed_idler, GT2x16_plain_idler, [0, 0, 1], [0, 0, 0.5, 1], [0, 1, 0], [0, 0.5, 0, 1] ];
+coreXY_GT2_16_16 = ["coreXY_16_16", GT2x6, GT2x16_pulley,   GT2x16_toothed_idler, GT2x16_plain_idler, [0, 0, 1], [0, 0, 0.5, 1], [0, 1, 0], [0, 0.5, 0, 1] ];
+
+function coreXY_belt(type)                  = type[1]; //! Belt type
+function coreXY_drive_pulley(type)          = type[2]; //! Drive pulley type
+function coreXY_toothed_idler(type)         = type[3]; //! Toothed idler type
+function coreXY_plain_idler(type)           = type[4]; //! Plain idler type
+function coreXY_upper_belt_colour(type)     = type[5]; //! Colour of the upper belt
+function coreXY_upper_tooth_colour(type)    = type[6]; //! Colour of the upper belt's teeth
+function coreXY_lower_belt_colour(type)     = type[7]; //! Colour of the lower belt
+function coreXY_lower_tooth_colour(type)    = type[8]; //! Colour of the lower belt's teeth
+
+// used to offset the position of the drive pulley and the y-carriage plain idler pulley
+// relative to the anchor pulley so that the belts align properly
+function coreXY_drive_pulley_x_alignment(type) = //! Belt alignment offset of the drive pulley relative to the anchor pulley
+    (pulley_od(coreXY_drive_pulley(type)) - pulley_od(coreXY_toothed_idler(type))) / 2;
+function coreXY_coincident_separation(type) = //! Value of x, y separation to make y-carriage pulleys coincident
+    [ -coreXY_plain_idler_offset(type).x, -(pulley_od(coreXY_plain_idler(type)) + pulley_od(coreXY_toothed_idler(type)))/2, 0 ];
+function coreXY_plain_idler_offset(type)    = //! Offset of y-carriage plain idler
+    [ (pulley_od(coreXY_plain_idler(type)) + pulley_od(coreXY_drive_pulley(type))) / 2 + coreXY_drive_pulley_x_alignment(type), pulley_od(coreXY_plain_idler(type))/2, 0 ];
+function coreXY_toothed_idler_offset(type)  = //! offset of y-carriage toothed idler
+    [ 0, -pulley_pr(coreXY_toothed_idler(type)), 0 ];
+// helper functions for positioning idlers when the stepper motor drive pulley is offset
+function coreXY_drive_toothed_idler_offset(type) = //! Offset of toothed drive idler pulley
+    [ 0, coreXY_drive_pulley_x_alignment(type), 0 ];
+function coreXY_drive_plain_idler_offset(type) = //! Offset of plain drive idler pulley
+    [ coreXY_plain_idler_offset(type).x, -(pulley_od(coreXY_plain_idler(type)) + pulley_od(coreXY_drive_pulley(type))) / 2, 0 ];
+
+
+module coreXY_half(type, size, pos, separation_y = 0, x_gap = 0, plain_idler_offset = 0, drive_pulley_offset = [0, 0], show_pulleys = false, lower_belt = false, hflip = false) { //! Draw one belt of a coreXY setup
+
+    // y-carriage toothed pulley
+    p0_type = coreXY_toothed_idler(type);
+    p0 = [ size.x / 2, -size.y / 2 - pulley_od(p0_type) / 2 + pos.y - separation_y / 2 ];
+
+    // bottom right toothed idler pulley
+    p1_type = p0_type;
+    p1 = [ size.x / 2, -size.y / 2 ];
+
+    // bottom left anchor toothed idler pulley
+    p2_type = p0_type;
+    p2 = [ -size.x / 2, -size.y / 2 ];
+
+    // stepper motor drive pulley
+    p3d_type = coreXY_drive_pulley(type);
+    p3d = [ -size.x / 2 + coreXY_drive_pulley_x_alignment(type) + drive_pulley_offset.x,
+             size.y / 2 + drive_pulley_offset.y
+    ];
+
+    // toothed idler for offset stepper motor drive pulley
+    p3t_type = coreXY_toothed_idler(type);
+    p3t = [ -size.x / 2 + (drive_pulley_offset.x > 0 ? 0 : 2*coreXY_drive_pulley_x_alignment(type)),
+            size.y / 2 + coreXY_drive_pulley_x_alignment(type) + drive_pulley_offset.y
+    ];
+
+    // y-carriage plain pulley
+    p4_type = coreXY_plain_idler(type);
+    p4 = [ -size.x / 2 + pulley_od(p4_type) / 2 + pulley_od(p3d_type) / 2 + coreXY_drive_pulley_x_alignment(type) + plain_idler_offset,
+           -size.y / 2 + pulley_od(p4_type) / 2 + pos.y + separation_y / 2
+    ];
+
+    // plain idler for offset stepper motor drive pulley
+    p3p_type = p4_type;
+    p3p = [ drive_pulley_offset.x > 0 ? p4.x : -p0.x - pulley_od(p0_type),
+            size.y / 2 - pulley_od(p3p_type) / 2 - pulley_od(p3d_type) / 2 + drive_pulley_offset.y
+    ];
+
+    // dummy pulleys for y separation
+    p5_type = p4_type;
+    p5 = [ pos.x - size.x / 2, -size.y / 2 + pos.y + separation_y / 2 ];
+    p6_type = p0_type;
+    p6 = [ pos.x - size.x / 2, -size.y / 2 + pos.y - separation_y / 2 ];
+
+    module show_pulleys(show_pulleys) {// Allows the pulley colour to be set for debugging
+        if (is_list(show_pulleys))
+            color(show_pulleys)
+                children();
+        else if (show_pulleys)
+            children();
+    }
+
+    show_pulleys(show_pulleys) {
+        translate(p0)
+            pulley_assembly(p0_type); // y-carriage toothed pulley
+        translate(p1)
+            pulley_assembly(p1_type); // bottom right toothed idler pulley
+        translate(p2)
+            pulley_assembly(p2_type); // bottom left anchor toothed idler pulley
+        translate(p3d)
+            hflip(hflip)
+                pulley_assembly(p3d_type); // top left stepper motor drive pulley
+        if (drive_pulley_offset.x) { // idler pulleys for offset stepper motor drive pulley
+            translate(p3t)
+                pulley_assembly(p3t_type); // toothed idler
+            translate(p3p)
+                pulley_assembly(p3p_type); // plain idler
+        }
+        translate(p4)
+            pulley_assembly(p4_type); // y-carriage plain pulley
+    }
+
+    path0a = [
+        [ p0.x, p0.y, pulley_od(p0_type) / 2 ],
+        [ p1.x, p1.y, pulley_od(p1_type) / 2 ],
+        [ p2.x, p2.y, pulley_od(p2_type) / 2 ]
+    ];
+    path0b = [
+        [ p3d.x, p3d.y, pulley_od(p3d_type) / 2 ],
+        [ p4.x, p4.y, -pulley_od(p4_type) / 2 ]
+    ];
+    path0c = [
+        [ p3t.x, p3t.y, pulley_od(p3t_type) / 2 ],
+        [ p3d.x, p3d.y, pulley_od(p3d_type) / 2 ],
+        [ p3p.x, p3p.y, -pulley_od(p3p_type) / 2 ],
+        [ p4.x, p4.y, -pulley_od(p4_type) / 2 ]
+    ];
+    path0d = [
+        [ p3p.x, p3p.y, -pulley_od(p3p_type) / 2 ],
+        [ p3d.x, p3d.y, pulley_od(p3d_type) / 2 ],
+        [ p3t.x, p3t.y, pulley_od(p3t_type) / 2 ],
+        [ p4.x, p4.y, -pulley_od(p4_type) / 2 ]
+    ];
+    path1 = [ // use eps for corner radius to get sharp corners so this part of the belt is deleted by the gap
+        [ p5.x, p5.y, eps ],
+        [ p6.x, p6.y, eps ]
+    ];
+
+    belt = coreXY_belt(type);
+
+    path0 = drive_pulley_offset.x == 0 ? concat(path0a, path0b) : drive_pulley_offset.x > 0 ? concat(path0a, path0c) : concat(path0a, path0d);
+    path = separation_y == 0 ? path0 : concat(path0, path1);
+
+    belt(type = belt,
+        points = path,
+        gap = [ x_gap + eps, abs(separation_y) + 2 ],
+        gap_pos = [ pos.x - size.x / 2, pos.y - size.y / 2 + belt_pitch_height(belt) - belt_thickness(belt) / 2 ],
+        belt_colour  = lower_belt ? coreXY_lower_belt_colour(type) : coreXY_upper_belt_colour(type),
+        tooth_colour = lower_belt ? coreXY_lower_tooth_colour(type) : coreXY_upper_tooth_colour(type));
+}
+
+module coreXY(type, size, pos, separation, x_gap, plain_idler_offset = 0, upper_drive_pulley_offset, lower_drive_pulley_offset, show_pulleys = false) { //! Wrapper module to draw both belts of a coreXY setup
+    translate([size.x / 2 - separation.x / 2, size.y / 2, -separation.z / 2]) {
+        // lower belt
+        hflip()
+            explode(25)
+                coreXY_half(type, size, [size.x - pos.x - separation.x, pos.y], separation.y, x_gap, plain_idler_offset, [-lower_drive_pulley_offset.x, lower_drive_pulley_offset.y], show_pulleys, lower_belt = true, hflip = true);
+        // upper belt
+        translate([separation.x, 0, separation.z])
+            explode(25)
+                coreXY_half(type, size, [pos.x, pos.y], separation.y, x_gap, plain_idler_offset, upper_drive_pulley_offset, show_pulleys, lower_belt = false, hflip=false);
+    }
+}
+
+module coreXY_belts(type, carriagePosition, coreXYPosBL, coreXYPosTR, separation, x_gap = 20, upper_drive_pulley_offset = [0, 0], lower_drive_pulley_offset = [0, 0], show_pulleys = false) { //! Draw the coreXY belts
+    assert(coreXYPosBL.z == coreXYPosTR.z);
+
+    coreXYSize = coreXYPosTR - coreXYPosBL;
+    translate(coreXYPosBL)
+        coreXY(type, coreXYSize, [carriagePosition.x - coreXYPosBL.x + separation.x / 2, carriagePosition.y - coreXYPosBL.y], separation = separation, x_gap = x_gap, plain_idler_offset = 0, upper_drive_pulley_offset = upper_drive_pulley_offset, lower_drive_pulley_offset = lower_drive_pulley_offset, show_pulleys = show_pulleys);
+}

utils/rounded_triangle.scad

@@ -21,7 +21,6 @@
 //! Draw a 3D right triangle with rounded edges. Intended to be embedded in other parts. Can be optionally offset by the filleted amount.
 //
 include <../utils/core/core.scad>
-include <..//utils/core/rounded_rectangle.scad>
 
 module rounded_right_triangle(x, y, z, fillet, center = true, offset = false) { //! Draw a 3D right triangle with rounded edges.
     fillet = max(fillet, eps);

vitamins/bearing_blocks.scad

@@ -40,4 +40,4 @@ SCS16LUU  = ["SCS16LUU",  9, 19, 25, 50, 85, 38.5, 32.5, 36, 60, 7,    M5_cap_sc
 scs_bearing_blocks = [SCS6UU, SCS8UU,  SCS10UU, SCS12UU, SCS16UU];
 scs_bearing_blocks_long = [SCS8LUU,  SCS10LUU, SCS12LUU, SCS16LUU];
 
-use <scs_bearing_block.scad>
+use <bearing_block.scad>

vitamins/pillow_blocks.scad

@@ -31,4 +31,4 @@ KP001 =   ["KP001",    12, 19, 71, 56, 16, 7.0,  6, 38, 14.5, 4, 32, M6_clearanc
 
 kp_pillow_blocks = [KP08_15, KP08_18, KP000, KP001];
 
-use <kp_pillow_block.scad>
+use <pillow_block.scad>