Fixed box_shelf_bracket() horizontal holes.

Added a third child to box_shelf_bracket() to allow custom additions.

CHANGELOG.md

@@ -3,6 +3,24 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v21.16.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.16.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.15.0...v21.16.0 "diff with v21.15.0")
+*   2024-02-19 [`fdb92ec`](https://github.com/nophead/NopSCADlib/commit/fdb92ec263d60a42e04f06abfeec5e1648a12b6b "show commit") [C.P.](# "Chris Palmer") Improved layout to fit into front page view.
+
+*   2024-02-18 [`f6404b9`](https://github.com/nophead/NopSCADlib/commit/f6404b939f714b3121dc6e9737cc24f3b9c64ebb "show commit") [J.R.](# "Jeroen Roos") Added T-Tracks and accessories
+
+### [v21.15.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.15.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.14.0...v21.15.0 "diff with v21.14.0")
+*   2024-02-19 [`30c67e7`](https://github.com/nophead/NopSCADlib/commit/30c67e742bb3603fa41b41e1a144989947e58ad7 "show commit") [C.P.](# "Chris Palmer") Updated the front page image.
+
+*   2024-02-12 [`efb1153`](https://github.com/nophead/NopSCADlib/commit/efb1153e2245fa67193cd7b49ac0926239c3b703 "show commit") [J.R.](# "Jeroen Roos") Add threaded inserts
+
+### [v21.14.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.14.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.13.1...v21.14.0 "diff with v21.13.1")
+*   2024-02-18 [`63a4271`](https://github.com/nophead/NopSCADlib/commit/63a4271c4c1bc97e93e67e8178515be1cfda9e43 "show commit") [C.P.](# "Chris Palmer") Updated libtest image.
+
+*   2024-02-18 [`0edf3a2`](https://github.com/nophead/NopSCADlib/commit/0edf3a2f75d729aa663836878d278226e7bd8094 "show commit") [C.P.](# "Chris Palmer") Cable clips can now handle up to 9 wires, have the nut and bolt flipped or use an insert.
+`cable_radius()` now handles cables with up to 20 wires.
+`cable_bundle()` and `cable_bundle_positions()` now handle bundles up to 9 wires.
+Added `cable_merge()`.
+
 #### [v21.13.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.13.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.13.0...v21.13.1 "diff with v21.13.0")
 *   2024-02-10 [`8540e04`](https://github.com/nophead/NopSCADlib/commit/8540e04a10d83be4ff454fa8999614e5137dd0ab "show commit") [C.P.](# "Chris Palmer") Metal hex pillars now chamfered.
 

libtest.scad

@@ -112,6 +112,7 @@ use <tests/stepper_motors.scad>
 use <tests/Swiss_clips.scad>
 use <tests/toggles.scad>
 use <tests/transformers.scad>
+use <tests/ttracks.scad>
 use <tests/tubings.scad>
 use <tests/veroboard.scad>
 use <tests/washers.scad>
@@ -220,15 +221,12 @@ translate([950, box_y])
     box_test();
 
 
-translate([950, 1525])
-    rotate(-90)
-        bbox_test();
-
 inserts_y = 0;
 nuts_y = inserts_y + 20;
 washers_y = nuts_y + 140;
 screws_y = washers_y + 120;
-circlips_y = screws_y + 180;
+threaded_inserts_y = screws_y + 180;
+circlips_y = threaded_inserts_y + 30;
 springs_y = circlips_y + 20;
 o_rings_y = springs_y;
 sealing_strip_y = springs_y + 20;
@@ -246,6 +244,10 @@ fans_y = displays_y + 110;
 transformers_y = fans_y + 120;
 psus_y = transformers_y + 190;
 
+ttracks_y = pcbs_y + 150;
+translate([840, ttracks_y])
+    ttracks();
+
 translate([x0 + 35, inserts_y])
     inserts();
 
@@ -258,6 +260,9 @@ translate([x0, nuts_y])
 translate([x0, washers_y])
     washers();
 
+translate([x0, threaded_inserts_y])
+    threaded_inserts();
+
 translate([x0, screws_y])
     screws();
 
@@ -467,6 +472,9 @@ translate([370, transformers_y])
 translate([x4, transformers_y])
     no_explode() socket_boxes();
 
+translate([950, transformers_y + 110])
+    rotate(-90)
+        bbox_test();
 
 belts_y = 0;
 rails_y = belts_y + 200;

printed/box.scad

@@ -494,7 +494,8 @@ module box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = un
         for(p = screw_positions)
             multmatrix(p)
                 translate_z(thickness)
-                    children();
+                    let($horizontal = true)
+                        children();
 
     r = box_boss_r(type);
     inset = box_intrusion(type) - r + (r + insert_boss_radius(insert, w) + bezel_clearance / 2) / sqrt(2);
@@ -503,10 +504,11 @@ module box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = un
             for(x = [-1, 1], y = [-1, 1])
                 translate([x * (box_width(type) / 2 - inset), y * (box_depth(type) / 2 - inset)])
                     rotate(45 * x * (2 + y))
-                        children();
+                        let($horizontal = false)
+                            children();
 }
 
-module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts
+module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts, third child is 3D additions.
     w = is_undef(wall) ? box_wall(type) : wall;
     insert = box_shelf_insert(type);
     lip = 2 * insert_boss_radius(insert, w);
@@ -561,9 +563,13 @@ module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a
                                     children(0);
                     }
 
-                hflip()
+                hflip() {
                     box_shelf_screw_positions(type, screw_positions, 0, w)
                         boss();
+
+                    if($children > 2)
+                        children(2);
+                }
             }
             if($children > 1)
                 hflip()
@@ -571,7 +577,7 @@ module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a
 
             hflip()
                 box_shelf_screw_positions(type, screw_positions, 0, w)
-                    insert_hole(insert, counterbore = 1, horizontal = true);
+                    insert_hole(insert, counterbore = 1, horizontal = $horizontal);
         }
 }
 

printed/camera_housing.scad

@@ -383,9 +383,3 @@ module camera_housing(cam) {
         rotate(90)
             camera_bracket(cam);
 }
-
-cam = rpi_camera_v2;
-if($preview)
-    camera_fastened_assembly(cam, 3);
-else
-    camera_housing(cam);

readme.md

@@ -43,13 +43,13 @@ A list of changes classified as breaking, additions or fixes is maintained in [C
 <tr><td> <a href = "#extrusion_brackets">Extrusion_brackets</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 = "#sweep">Sweep</a> </td><td></td></tr>
 <tr><td> <a href = "#extrusions">Extrusions</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 = "#thread">Thread</a> </td><td></td></tr>
 <tr><td> <a href = "#fans">Fans</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> <a href = "#tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#fastons">Fastons</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 = "#fuseholder">Fuseholder</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 = "#gear_motors">Gear_motors</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 = "#geared_steppers">Geared_steppers</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 = "#green_terminals">Green_terminals</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> <a href = "#hot_ends">Hot_ends</a> </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 = "#hygrometer">Hygrometer</a> </td><td></td><td></td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#fastons">Fastons</a> </td><td> <a href = "#pillars">Pillars</a> </td><td> <a href = "#ttracks">Ttracks</a> </td><td> <a href = "#printed_pulleys">Printed_pulleys</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#fuseholder">Fuseholder</a> </td><td> <a href = "#pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#tubings">Tubings</a> </td><td> <a href = "#ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#gear_motors">Gear_motors</a> </td><td> <a href = "#pin_headers">Pin_headers</a> </td><td> <a href = "#variacs">Variacs</a> </td><td> <a href = "#ssr_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#geared_steppers">Geared_steppers</a> </td><td> <a href = "#potentiometers">Potentiometers</a> </td><td> <a href = "#veroboard">Veroboard</a> </td><td> <a href = "#screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#green_terminals">Green_terminals</a> </td><td> <a href = "#pulleys">Pulleys</a> </td><td> <a href = "#washers">Washers</a> </td><td> <a href = "#socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#hot_ends">Hot_ends</a> </td><td></td><td> <a href = "#wire">Wire</a> </td><td> <a href = "#strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#hygrometer">Hygrometer</a> </td><td></td><td> <a href = "#zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -779,6 +779,11 @@ PCB cameras.
 | `camera_lens_offset(type)` | Offset of the lens center from the PCB centre |
 | `camera_pcb(type)` | The PCB part of the camera |
 
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `camera_lens_height(type)` | The height of the lens stack |
+
 ### Modules
 | Module | Description |
 |:--- |:--- |
@@ -982,6 +987,7 @@ D-connectors. Can be any number of ways, male or female, solder buckets, PCB mou
 | Module | Description |
 |:--- |:--- |
 | `d_connector_holes(type)` | Place children at the screw hole positions |
+| `d_hole(type, h = 0, center = true, clearance = 0.2)` | Make a hole to clear the back of d-connector |
 | `d_pillar()` | Draw a pillar for a D-connector |
 | `d_plug(type, socket = false, pcb = false, idc = false)` | Draw specified D plug, which can be IDC, PCB or plain solder bucket |
 | `d_plug_D(length, width, rad)` | D plug D shape |
@@ -1703,6 +1709,8 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 | `insert_ring2_d(type)` | Diameter of the middle ring |
 | `insert_ring3_d(type)` | Diameter of the bottom ring |
 | `insert_screw_diameter(type)` | Screw size |
+| `threaded_insert_chamfer(type)` | Size of the chamfer for threaded inserts |
+| `threaded_insert_pitch(type)` | Pitch of the outer thread for threaded inserts |
 
 ### Functions
 | Function | Description |
@@ -1718,6 +1726,7 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 | `insert_boss(type, z, wall = 2 * extrusion_width)` | Make a boss to take an insert |
 | `insert_hole(type, counterbore = 0, horizontal = false)` | Make a hole to take an insert, `counterbore` is the extra length for the screw |
 | `insert_lug(insert, wall, counter_bore = 0, extension = 0, corner_r = 0, flying = true)` | Make a flying insert lug, see [ssr_shroud](#Ssr_shroud) |
+| `threaded_insert(type)` | Draw specified threaded insert, for use in wood |
 
 ![inserts](tests/png/inserts.png)
 
@@ -1732,6 +1741,14 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 |   1 | `insert(CNCKM4)` |  Heatfit insert M4 x 4mm |
 |   1 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
 |   2 | `insert(CNCKM5)` |  Heatfit insert M5 x 5.8mm |
+|   1 | `threaded_insert(M10x25)` |  Threaded insert M10 x 25mm |
+|   1 | `threaded_insert(M12x30)` |  Threaded insert M12 x 30mm |
+|   1 | `threaded_insert(M16x30)` |  Threaded insert M16 x 30mm |
+|   1 | `threaded_insert(M3x8)` |  Threaded insert M3 x 8mm |
+|   1 | `threaded_insert(M4x10)` |  Threaded insert M4 x 10mm |
+|   1 | `threaded_insert(M5x12)` |  Threaded insert M5 x 12mm |
+|   1 | `threaded_insert(M6x15)` |  Threaded insert M6 x 15mm |
+|   1 | `threaded_insert(M8x18)` |  Threaded insert M8 x 18mm |
 
 
 <a href="#top">Top</a>
@@ -4022,6 +4039,7 @@ When woven sheets (e.g. carbon fibre) are rendered it is necessary to specify th
 |   1 | `sheet(Spring08, 30, 30, 2)` |  Bi-metal saw blade 30mm x 30mm x 0.8mm |
 |   1 | `sheet(Cardboard, 30, 30, 2)` |  Corrugated cardboard 30mm x 30mm x 5mm |
 |   1 | `sheet(Foam20, 30, 30, 2)` |  Foam sponge 30mm x 30mm x 20mm |
+|   1 | `sheet(Sellotape, 30, 30, 2)` |  Sellotape tape 30mm x 30mm x 0.05mm |
 |   1 | `sheet(DiBond, 30, 30, 2)` |  Sheet DiBond 30mm x 30mm x 3mm |
 |   1 | `sheet(DiBond6, 30, 30, 2)` |  Sheet DiBond 30mm x 30mm x 6mm |
 |   1 | `sheet(MDF10, 30, 30, 2)` |  Sheet MDF 30mm x 30mm x 10mm |
@@ -4673,6 +4691,80 @@ Iron core transformers. The grey shaded area is the keep out region where the te
 |   1 | `transformer(SMALLTX)` |  Transformer Small mains |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="ttracks"></a>
+## Ttracks
+T-Tracks used in woodworking jigs
+
+[vitamins/ttracks.scad](vitamins/ttracks.scad) Object definitions.
+
+[vitamins/ttrack.scad](vitamins/ttrack.scad) Implementation.
+
+[tests/ttracks.scad](tests/ttracks.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `t_insert_description(type)` | Description of this t-track insert |
+| `t_insert_height(type)` | Height of t-track insert |
+| `t_insert_thread(type)` | M thread for this the screw hole in this insert |
+| `t_insert_top_thickness(type)` | Top thickness for t-track insert |
+| `t_insert_top_width(type)` | Top Width of t-track insert |
+| `t_insert_width(type)` | Width of t-track insert |
+| `tbolt_description(type)` | Description of this t-track bolt |
+| `tbolt_head_length(type)` | Head length for t-track bolt |
+| `tbolt_head_thickness(type)` | Head thickness for t-track bolt |
+| `tbolt_head_width(type)` | Head width for t-track bolt |
+| `tbolt_thread(type)` | M thread for this bolt |
+| `ttrack_fixture(type)` | Fixture, such as T-bolt or Miter insert used with this track |
+| `ttrack_height(type)` | Height of track section |
+| `ttrack_opening(type)` | Width of the opening |
+| `ttrack_screw(type)` | Screw used to fasten track |
+| `ttrack_screw_pitch(type)` | Distance between screws |
+| `ttrack_slot_height(type)` | Height of the slot |
+| `ttrack_slot_width(type)` | Width of the slot |
+| `ttrack_top_thickness(type)` | Thickness of the top layer |
+| `ttrack_width(type)` | Width of track section |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `ttrack_holes(type, length)` | Number of holes in a rail given its `length` |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `ttrack(type, length, colour = "LightSlateGray")` | Draw the specified rail |
+| `ttrack_hole_positions(type, length)` | Position children over screw holes |
+| `ttrack_place_bolt(type, pos, bolt = undef)` | Place a T-Bolt relative to the centre of the track |
+| `ttrack_place_insert(type, pos, insert = undef)` | Place a T-Insert relative to the centre of the track |
+
+![ttracks](tests/png/ttracks.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   3 | `screw(M3_cs_cap_screw, 15)` |  Screw M3 cs cap x 15mm |
+|   3 | `screw(M4_cs_cap_screw, 15)` |  Screw M4 cs cap x 15mm |
+|   2 | `screw(M6_hex_screw, 15)` |  Screw M6 hex x 15mm |
+|   1 | `ttrack(ttrack_mitre_30mm, 120)` |  T-Track ttrack_mitre_30mm x 120mm |
+|   1 | `ttrack(ttrack_mitre_30mm, 200)` |  T-Track ttrack_mitre_30mm x 200mm |
+|   1 | `ttrack(ttrack_mitre_36mm, 120)` |  T-Track ttrack_mitre_36mm x 120mm |
+|   1 | `ttrack(ttrack_universal_19mm, 120)` |  T-Track ttrack_universal_19mm x 120mm |
+|   1 | `ttrack(ttrack_universal_19mm, 200)` |  T-Track ttrack_universal_19mm x 200mm |
+|   1 | `ttrack(ttrack_universal_19mm_A, 120, colour="red")` |  T-Track ttrack_universal_19mm_A x 120mm |
+|   1 | `ttrack(ttrack_universal_19mm_B, 120, colour="blue")` |  T-Track ttrack_universal_19mm_B x 120mm |
+|   1 | `T-Track Bolt M6` | M6 x 30mm |
+|   1 | `T-Track Bolt M6 with small head` | M6 x 30mm |
+|   3 | `T-Track Bolt M8` | M8 x 30mm |
+|   1 | `ttrack_insert(TTrack_insert_Miter30_M6, 30, 1)` | T-Track insert, Miter track 30mm, M6 thread, M30mm, with 1 M6 |
+|   1 | `ttrack_insert(TTrack_insert_Miter30_M6, 30, 1, colour="red")` | T-Track insert, Miter track 30mm, M6 thread, M30mm, with 1 M6 |
+|   1 | `ttrack_insert(TTrack_insert_Miter30_M6, 60, 2, colour="red")` | T-Track insert, Miter track 30mm, M6 thread, M60mm, with 2 M6 |
+|   1 | `ttrack_insert(TTrack_insert_Miter30_M8, 30, 1, colour="red")` | T-Track insert, Miter track 30mm, M8 thread, M30mm, with 1 M8 |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -5114,7 +5206,7 @@ The top bezel can have an optional child, which is subtracted to allow modificat
 | `box_right(type)` | Default right side, can be overridden to customise |
 | `box_right_blank(type, sheet = false)` | Generates a 2D template for the right sheet, `sheet` can be set to override the type |
 | `box_shelf_blank(type, sheet = false, wall = undef)` | Generates a 2D template for a shelf sheet |
-| `box_shelf_bracket(type, screw_positions, wall = undef)` | Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts |
+| `box_shelf_bracket(type, screw_positions, wall = undef)` | Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts, third child is 3D additions. |
 | `box_shelf_bracket_section(type, rows, cols, x, y)` | Generates sections of the shelf bracket to allow it to be bigger than the printer |
 | `box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = undef, top_screws = true)` | Place children at the shelf screw positions |
 | `box_top(type)` | Default top, can be overridden to customise |

scripts/changelog.py

@@ -169,6 +169,9 @@ 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) \
+               and not re.match(r'Changelog updated.*', 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())

scripts/deps.py

@@ -63,5 +63,5 @@ def source_dirs(bom_dir):
         else:
             if dir.endswith('/printed'):
                 lib_dirs.add(dir)
-    dirs.remove(source_dir)
+    dirs.discard(source_dir)
     return [source_dir] + sorted(dirs) + sorted(lib_dirs)

tests/inserts.scad

@@ -22,7 +22,6 @@ use <../utils/layout.scad>
 include <../vitamins/inserts.scad>
 
 module inserts() {
-
     for(i = [0: len(inserts) -1])
         translate([10 * i, 5])
             insert(inserts[i]);
@@ -32,7 +31,6 @@ module inserts() {
             insert(short_inserts[i]);
 
 
-
     stl_colour(pp1_colour)
         translate([len(inserts) * 10, 0]) {
             insert_lug(inserts[0], 2, 1);
@@ -42,6 +40,17 @@ module inserts() {
         }
 }
 
+module threaded_inserts()
+    for(i = [0: len(threaded_inserts) -1]) {
+        d = insert_hole_radius(threaded_inserts[i]);
+        translate([(10 + d) * i, 0])
+            threaded_insert(threaded_inserts[i]);
+    }
+
 if($preview)
-    let($show_threads = true)
+    let($show_threads = true) {
         inserts();
+
+        translate([0, 20])
+            threaded_inserts();
+    }

tests/ttracks.scad

@@ -0,0 +1,73 @@
+//
+// NopSCADlib Copyright Chris Palmer 2024
+// 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 <../utils/core/core.scad>
+use <../utils/layout.scad>
+use <../utils/maths.scad>
+
+include <../vitamins/ttracks.scad>
+
+module ttracks() {
+    colours = [ "LightSlateGray", "red", "blue", "LightSlateGray", "LightSlateGray" ];
+    gap = 8;
+    widths = [for(t = ttracks) ttrack_width(t)];
+    translate([0, 60])
+        layout(widths, gap) {
+            ttrack(ttracks[$i], 120, colours[$i]);
+
+            if($i < len(ttrack_bolts))
+                translate([0, -80])
+                    ttrack_bolt(ttrack_bolts[$i], 30);
+
+            let(i = $i - len(ttrack_bolts))
+                if(i >= 0 && i < len(ttrack_inserts))
+                    translate([0, -85])
+                        rotate(90)
+                            ttrack_insert(ttrack_inserts[i], 30, colour=colours[i]);
+        }
+
+    x = sumv(widths) + len(ttracks) * gap + ttrack_width(ttrack_universal_19mm) / 2;
+    translate([x, 20]) {
+        ttrack_assembly(ttrack_universal_19mm, 200);
+        ttrack_place_bolt(ttrack_universal_19mm, 50)
+            ttrack_bolt(ttrack_fixture(ttrack_universal_19mm), 30);
+
+        ttrack_place_bolt(ttrack_universal_19mm, -60)
+            ttrack_bolt(ttrack_fixture(ttrack_universal_19mm), 30);
+    }
+
+    x2 = x + ttrack_width(ttrack_universal_19mm) / 2 + gap + ttrack_width(ttrack_mitre_30mm) / 2;
+    translate([x2, 20]) {
+        ttrack_assembly(ttrack_mitre_30mm, 200);
+
+        ttrack_place_insert(ttrack_mitre_30mm, 50)
+            ttrack_insert(ttrack_fixture(ttrack_mitre_30mm), 30, 1, "red");
+
+        ttrack_place_insert(ttrack_mitre_30mm, -60) {
+            ttrack_insert(ttrack_fixture(ttrack_mitre_30mm), 60, 2, "red");
+            ttrack_insert_hole_positions(ttrack_fixture(ttrack_mitre_30mm), 60, 2)
+                translate_z(8)
+                    screw(M6_hex_screw, 15);
+        }
+    }
+
+}
+
+if($preview)
+    let($show_threads = true)
+        ttracks();

tests/zipties.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 wire_r = 5; // [1 : 20]
-t = 0; // [0 : 3]
+t = -1; // [-1 : 3]
 
 include <../utils/core/core.scad>
 use <../utils/layout.scad>
@@ -26,9 +26,9 @@ include <../vitamins/zipties.scad>
 
 module zipties()
     layout([for(z = zipties) 9], 2 * wire_r) {
-        ziptie(zipties[$i], wire_r, t);
+        ziptie(zipties[$i], wire_r, max(t, 0));
 
-        if(t)
+        if(t >= 0)
             color(grey(20))
                 cylinder(r = wire_r, h = 10, center = true);
 

vitamins/camera.scad

@@ -30,6 +30,9 @@ function camera_connector_pos(type) = type[5]; //! The flex connector block for
 function camera_connector_size(type)= type[6]; //! The flex connector block for the camera itself's size
 function camera_fov(type)           = type[7]; //! The field of view of the camera lens
 
+function camera_lens_height(type) = //! The height of the lens stack
+     let(lenses = camera_lens(type), lens = lenses[len(lenses) - 1][0]) lens.y + lens.z;
+
 module camera_lens(type, offset = 0, show_lens = true) //! Draw the lens stack, with optional offset for making a clearance hole
     color(grey(20))
         translate(camera_lens_offset(type))

vitamins/cameras.scad

@@ -67,7 +67,8 @@ rpi_camera = ["rpi_camera", "Raspberry Pi focusable camera", rpi_camera_pcb, [0,
         [[0, 0,  12], 6],
         [[0, 11, 4.3], 14 / 2, [8/2, 11/2, 1]],
     ],
-    [0, 18 - 1.5 - 2.5], [8, 5, 1.6]
+    [0, 18 - 1.5 - 2.5], [8, 5, 1.6],
+    [54, 41] // FOV
 ];
 
 esp32_cam_x = 1; // Seems to vary as mine is offset but pictures on the web show it more centered.
@@ -96,7 +97,7 @@ ESP32_module =  ["", "", 18, 26, 0.8,   0, 0.7, [1.1, 1.1, 0, gold], grey(18), f
 ESP32_CAM_pcb = ["", "", 27, 40, 1.7, 2.5, 0, 0, grey(15), false, [],
     [
         [27 / 2, 26 / 2, 0, "-pcb", 0, ESP32_module],
-        for(side = [-1, 1]) [side * inch(0.45) + 27 / 2, -(4.2 + inch(.35)), 0, "-2p54header", 1, 8],
+        for(side = [-1, 1]) [side * inch(0.45) + 27 / 2, -(4.2 + inch(.35)), 0, "-2p54joiner", 1, 8],
         [ 27 / 2, -8, 90, "uSD", [14.85, 14.65, 1.8]],
         [ 27 / 2 + 1, 15, 0, "flat_flex", false],
         [ 27 / 2 + inch(0.45), 10.5, 0, "block", 3, 3, 0.8, grey(90)],
@@ -151,7 +152,7 @@ ESP32_CAM = ["ESP32_CAM", "ESP32-CAM Camera module", ESP32_CAM_pcb, [esp32_cam_x
         [[0, 0, 6.3], 3.5, [1, 1, 0.5]],
     ],
     [1, -4], [15, 2.2, 1],
-    [54, 41] // FOV
+    [41, 54] // FOV
 ];
 
 

vitamins/d_connector.scad

@@ -80,6 +80,13 @@ module d_plug_D(length, width, rad) { //! D plug D shape
                 circle(rad);
 }
 
+module d_hole(type, h = 0, center = true, clearance = 0.2) { //! Make a hole to clear the back of d-connector
+    dwall = 0.5 + clearance;
+
+    extrude_if(h, center)
+        d_plug_D(d_lengths(type)[0] + 2 * dwall, d_widths(type)[0] + 2 * dwall, 2.5 + dwall);
+}
+
 module d_plug(type, socket = false, pcb = false, idc = false) { //! Draw specified D plug, which can be IDC, PCB or plain solder bucket
     hole_r = 3.05 / 2;
     dwall = 0.5;
@@ -106,7 +113,7 @@ module d_plug(type, socket = false, pcb = false, idc = false) { //! Draw specifi
     // Shell
     //
     color(d_plug_shell_colour)  {
-        linear_extrude( d_flange_thickness(type))
+        linear_extrude(d_flange_thickness(type))
             difference() {
                 rounded_square([flange_length, flange_width], 2);
 

vitamins/insert.scad

@@ -32,6 +32,9 @@ function insert_barrel_d(type)       = type[5];     //! Diameter of the main bar
 function insert_ring1_h(type)        = type[6];     //! Height of the top and middle rings
 function insert_ring2_d(type)        = type[7];     //! Diameter of the middle ring
 function insert_ring3_d(type)        = type[8];     //! Diameter of the bottom ring
+function threaded_insert_pitch(type) = type[9];     //! Pitch of the outer thread for threaded inserts
+function threaded_insert_chamfer(type) = type[10];  //! Size of the chamfer for threaded inserts
+
 
 function insert_hole_length(type) = round_to_layer(insert_length(type)); //! Length of the insert rounded to layer height
 
@@ -46,6 +49,14 @@ function insert_nose_length(type, d) = let( //! The length before the second rin
 
 module insert(type) { //! Draw specified insert
     length = insert_length(type);
+
+    vitamin(str("insert(", type[0], "): Heatfit insert M", insert_screw_diameter(type), " x ", length, "mm"));
+
+    base_insert(type);
+}
+
+module base_insert(type) {
+    length = insert_length(type);
     ring1_h = insert_ring1_h(type);
 
     chamfer1 = (insert_ring2_d(type) - insert_barrel_d(type)) / 2;
@@ -53,7 +64,6 @@ module insert(type) { //! Draw specified insert
     ring2_h = ring1_h + chamfer1;
     gap = (length - ring1_h - ring2_h - chamfer2) / 3;
 
-    vitamin(str("insert(", type[0], "): Heatfit insert M", insert_screw_diameter(type), " x ", length, "mm"));
     $fn = 64;
     thread_d = insert_screw_diameter(type);
     explode(20, offset = [0, 0, -length]) translate_z(eps) vflip() {
@@ -186,3 +196,54 @@ module insert_lug(insert, wall, counter_bore = 0, extension = 0, corner_r = 0, f
             }
     }
 }
+
+
+module threaded_insert(type) { //! Draw specified threaded insert, for use in wood
+    d2 = insert_outer_d(type);
+    d3 = insert_barrel_d(type);
+    pitch = threaded_insert_pitch(type);
+
+    profile = thread_profile((d2 - d3) /2 , 0, 60);
+    socket = insert_screw_diameter(type) / cos(30) / 2;
+    length = insert_length(type);
+
+    r=insert_barrel_d(type) / 2;
+    z=threaded_insert_chamfer(type);
+
+    thread_l = insert_length(type) - z; // - insert_ring1_h(type);
+
+
+
+
+    vitamin(str("threaded_insert(", type[0], "): Threaded insert M", insert_screw_diameter(type), " x ", length, "mm"));
+    union() {
+        color(silver)
+            difference() {
+                base_insert(type);
+                translate_z(-socket/2 + 0.01)
+                    cylinder(r=socket, $fn = 6, h=socket/2);
+
+                // chamfer the end
+                rotate_extrude(convexity = 3)
+                    polygon([
+                        [r - z, -length],
+                        [r + 0.1, - length],
+                        [r + 0.1, - length + z + 0.1]
+                    ]);
+            }
+
+        translate_z(-thread_l/2)
+            thread(insert_barrel_d(type),
+                pitch,
+                thread_l,
+                profile,
+                center = true,
+                top = 1,
+                bot = -1,
+                starts = 1,
+                solid = false,
+                female = false,
+                colour = silver);
+    }
+
+}

vitamins/inserts.scad

@@ -39,8 +39,23 @@ CNCKM3 =  [ "CNCKM3",  3.0, 4.6, 4.0, 3,   3.65, 0.7, 4.4, 3.9 ];
 CNCKM4 =  [ "CNCKM4",  4.0, 6.3, 5.6, 4,   5.15, 1.0, 6.0, 5.55];
 CNCKM5 =  [ "CNCKM5",  5.8, 7.1, 6.4, 5,   6.0,  1.6, 6.8, 6.33];
 
+// Measurements according to DIN 7965
+//
+// If you want to add an additional length, it should be sufficient copy one with the same
+// M size and change the name (2x) and the first number column (l), all others are dependent
+// on the M size.
+//                        l,   d2,   d5,  d,   d3,   h,     d3,   d3, P1 (h),    z
+M3x8    = [  "M3x8",      8,    6,    5,  3,   4.5,  0.5,  4.5,  4.5,      2,  0.6];
+M4x10   = [  "M4x10",    10,    8,  6.5,  4,   5.5,  0.5,  5.5,  5.5,    2.5,  0.6];
+M5x12   = [  "M5x12",    12,   10,  8.5,  5,   7.5,  0.5,  7.5,  7.5,    3.5,  0.8];
+M6x15   = [  "M6x15",    15,   12, 10.5,  6,   9.5,  0.5,  9.5,  9.5,      4,    1];
+M8x18   = [  "M8x18",    18,   16, 14.5,  8,  12.5,  0.5, 12.5, 12.5,      5,    1];
+M10x25  = [ "M10x25",    25, 18.5,   17, 10,    15,  0.5,   15,   15,      5,  1.6];
+M12x30  = [ "M12x30",    30,   22,   20, 12,    18,  0.5,   18,   18,      5,  1.6];
+M16x30  = [ "M16x30",    30,   25, 22.5, 16,  20.5,  0.5, 20.5, 20.5,      5,  1.6];
 
 inserts =       [ F1BM2, F1BM2p5,  F1BM3,  F1BM4,  CNCKM5 ];
 short_inserts = [ F1BM2, CNCKM2p5, CNCKM3, CNCKM4, CNCKM5 ];
+threaded_inserts = [ M3x8, M4x10, M5x12, M6x15, M8x18, M10x25, M12x30, M16x30 ];
 
 use <insert.scad>

vitamins/pcbs.scad

@@ -730,7 +730,6 @@ Keyes5p1 = ["Keyes5p1", "Keyes5.1 Arduino Uno expansion board", 68.58, 53.34, 1.
     M2p5_pan_screw
    ];
 
-
 ExtruderPCB = ["ExtruderPCB", "Extruder connection PCB",
                                     33.02, 24.13, 1.6, 0,   0,   0, "green", true, [],
     [[3 * 1.27, 24.13 / 2, 90, "D_plug", DCONN15],
@@ -1197,7 +1196,6 @@ ESP_12F = pcb("ESP_12F", "ESP-12F ESP8266 WiFi module", [24, 16, 0.8],
     ]
 );
 
-
 tiny_buck = pcb("tiny_buck", "Ultra Small 3A buck regulator", [20, 11, 1.6],
     hole_d = 1.2,
     land_d = [2, 2],

vitamins/sheets.scad

@@ -44,6 +44,7 @@ DiBond    = [ "DiBond",    "Sheet DiBond",            3, [0.2, 0.2, 0.2, 1    ],
 DiBond6   = [ "DiBond6",   "Sheet DiBond",            6, [0.2, 0.2, 0.2, 1    ], false];
 Cardboard = [ "Cardboard", "Corrugated cardboard",    5, [0.8, 0.6, 0.3, 1    ], false];
 FoilTape  = [ "FoilTape",  "Aluminium foil tape",   0.05,[0.9, 0.9, 0.9, 1    ], false];
+Sellotape = [ "Sellotape", "Sellotape tape",        0.05,[1,   1,   0.9, 0.5  ], false];
 Foam20    = [ "Foam20",    "Foam sponge",             20,[0.3, 0.3, 0.3, 1    ], true];
 AL1_6     = [ "AL1_6",     "Aluminium tooling plate", 1.6, [0.5, 0.5, 0.5, 0.5], false];
 AL2       = [ "AL2",       "Aluminium tooling plate", 2, [0.9, 0.9, 0.9, 1    ], false];
@@ -59,6 +60,6 @@ CF3 =       [ "CF3",       "Sheet carbon fiber",      3, grey(35),
 
 
 sheets = [CF1, CF2, CF3, MDF3, MDF6, MDF10, MDF12, MDF19, MDF22, PMMA1p25, PMMA2, PMMA3, PMMA6, PMMA8, PMMA10,
-         glass2, DiBond, DiBond6, Cardboard, FoilTape, AL1_6, AL2, AL3, AL6, AL8, Steel06, Spring08, Silicone3, Foam20];
+         glass2, DiBond, DiBond6, Cardboard, FoilTape, Sellotape, AL1_6, AL2, AL3, AL6, AL8, Steel06, Spring08, Silicone3, Foam20];
 
 use <sheet.scad>

vitamins/ttrack.scad

@@ -0,0 +1,209 @@
+//
+// NopSCADlib Copyright Chris Palmer 2024
+// 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/>.
+
+//
+//! T-Tracks used in woodworking jigs
+//
+include <../utils/core/core.scad>
+use <../utils/thread.scad>
+
+use <screw.scad>
+
+function ttrack_width(type)         = type[1];   //! Width of track section
+function ttrack_height(type)        = type[2];   //! Height of track section
+function ttrack_opening(type)       = type[3];   //! Width of the opening
+function ttrack_slot_width(type)    = type[4];   //! Width of the slot
+function ttrack_slot_height(type)   = type[5];   //! Height of the slot
+function ttrack_top_thickness(type) = type[6];   //! Thickness of the top layer
+function ttrack_screw_pitch(type)   = type[7];   //! Distance between screws
+function ttrack_screw(type)         = type[8];   //! Screw used to fasten track
+function ttrack_fixture(type)         = type[9];  //! Fixture, such as T-bolt or Miter insert used with this track
+
+function tbolt_description(type)    = type[1];   //! Description of this t-track bolt
+function tbolt_head_length(type)    = type[2];   //! Head length for t-track bolt
+function tbolt_head_width(type)     = type[3];   //! Head width for t-track bolt
+function tbolt_head_thickness(type) = type[4];   //! Head thickness for t-track bolt
+function tbolt_thread(type)         = type[5];   //! M thread for this bolt
+
+function t_insert_description(type)   = type[1];   //! Description of this t-track insert
+function t_insert_top_width(type)     = type[2];   //! Top Width of t-track insert
+function t_insert_width(type)         = type[3];   //! Width of t-track insert
+function t_insert_height(type)        = type[4];   //! Height of t-track insert
+function t_insert_top_thickness(type) = type[5];   //! Top thickness for t-track insert
+function t_insert_thread(type)        = type[6];   //! M thread for this the screw hole in this insert
+
+function ttrack_holes(type, length) = //! Number of holes in a rail given its `length`
+    floor((length - 2 * ttrack_screw_end(type)) / ttrack_screw_pitch(type)) + 1;
+
+
+
+module ttrack(type, length, colour = "LightSlateGray") { //! Draw the specified rail
+    W  = ttrack_width(type);
+    H  = ttrack_height(type);
+    SW = ttrack_slot_width(type);
+    SH = ttrack_slot_height(type);
+    T  = ttrack_top_thickness(type);
+    O  = ttrack_opening(type);
+    screw=ttrack_screw(type);
+
+    vit_colour = (colour == "LightSlateGray" ? "" : str(", colour=\"", colour, "\""));
+
+    vitamin(str("ttrack(", type[0], ", ", length, vit_colour, "): T-Track ", type[0], " x ", length, "mm"));
+
+    color(colour) {
+        difference() {
+            rotate([90,0,0])
+                linear_extrude(length, center=true, convexity = 3)
+                    polygon([
+                        [ -O/2,       0 ], // left side of the opening
+                        [ -W/2,       0 ], // left top
+                        [ -W/2,      -H ], // left bottom
+                        [  W/2,      -H ], // right bottom
+                        [  W/2,       0 ], // right top
+                        [  O/2,       0 ], // right side of the opening
+                        [  O/2,      -T ], // right bottom side of the opening
+                        [ SW/2,      -T ], // right top of the slot
+                        [ SW/2, -T - SH ], // right bottom of the slot
+                        [ -SW/2,-T - SH ], // left bottom of the slot
+                        [ -SW/2,     -T ], // left top of the slot
+                        [ -O/2,      -T ]  // left bottom side of the opening
+                    ]);
+                ttrack_hole_positions(type, length) {
+                    B = H - (SH + T);
+                    screw_countersink(screw, true);
+                    translate_z(-B/2)
+                        cylinder(r=screw_clearance_radius(screw), h=(H-(SH+T) + 0.2), center=true);
+                }
+            }
+
+        }
+
+}
+
+module ttrack_assembly(type, length, colour = "LightSlateGray") {
+    ttrack(type, length, colour);
+    ttrack_hole_positions(type, length)
+        explode(20)
+            screw(ttrack_screw(type), 15);
+}
+module ttrack_hole_positions(type, length) { //! Position children over screw holes
+    P = ttrack_screw_pitch(type);
+    H  = ttrack_height(type);
+    B = H - (ttrack_slot_height(type) +  ttrack_top_thickness(type));
+
+    count = floor(length / P);
+    first = (length - count * P)/2;
+
+    c = first < P/3 ? count - 1 : count;  // we don't want screws right on the edge
+    N = (length - c * P)/2;
+
+    for (y = [N:P:length-N])
+        translate([0,length/2 - y, -H + B])
+            children();
+}
+
+module ttrack_place_bolt(type, pos, bolt = undef) { //! Place a T-Bolt relative to the centre of the track
+    bolt = is_undef(bolt) ? ttrack_fixture(type) : bolt;
+
+    T = tbolt_head_thickness(bolt);
+    translate([0,pos,-(ttrack_top_thickness(type)/2) - T])
+        rotate([0,0,90])
+            children();
+}
+
+module ttrack_place_insert(type, pos, insert = undef) { //! Place a T-Insert relative to the centre of the track
+    insert = is_undef(insert) ? ttrack_fixture(type) : insert;
+    TT = t_insert_top_thickness(insert);
+    T = ttrack_top_thickness(type);
+    translate([0,pos,-T+TT])
+        rotate([0,0,90])
+            children();
+}
+
+module ttrack_bolt(type, length) {
+    L = tbolt_head_length(type);
+    W = tbolt_head_width(type);
+    T = tbolt_head_thickness(type);
+    distance = L - W;
+
+    D = tbolt_thread(type);
+    pitch = metric_coarse_pitch(D);
+
+    vitamin(str(tbolt_description(type), ":", "M", D, " x ", length, "mm"));
+
+    color(silver) {
+        hull()
+            for (x = [-1, 1])
+                translate([x * distance/2, 0, 0])
+                    cylinder(d=W, h=T, center=true);
+
+        translate_z((length/2))
+            male_metric_thread(D, pitch, length - T, center = true, top = -1, bot = 0, solid = true, colour = undef);
+    }
+
+}
+
+module ttrack_insert(type, length, num_holes = 1, colour="LightSlateGray") {
+    TW = t_insert_top_width(type);
+    W  = t_insert_width(type);
+    H  = t_insert_height(type);
+    T  = t_insert_top_thickness(type);
+    //distance = L - W;
+
+    D = t_insert_thread(type);
+    pitch = metric_coarse_pitch(D);
+
+    vit_colour = (colour == "LightSlateGray" ? "" : str(", colour=\"", colour, "\""));
+    vitamin(str("ttrack_insert(", type[0], ", ", length, ", ", num_holes, vit_colour, "):", t_insert_description(type), ", M", length, "mm, with ", num_holes, " M", D));
+
+    color(colour) {
+        union() {
+            difference() {
+                rotate([90,0,90]) {
+                    linear_extrude(length, center=true, convexity=2)
+                        polygon([
+                            [ -TW/2,  0 ], // left top
+                            [ -TW/2, -T ], // left centre, bottom of top
+                            [  -W/2, -T ], // left centre
+                            [  -W/2, -H ], // left bottom
+                            [   W/2, -H ], // right bottom
+                            [   W/2, -T ], // right centre
+                            [  TW/2, -T ], // right centre, bottom of top
+                            [  TW/2,  0 ] // right top
+                        ]);
+                }
+                ttrack_insert_hole_positions(type, length, num_holes)
+                    translate_z(-H/2)
+                        cylinder(h=H+1, d=t_insert_thread(type), center=true);
+            }
+            ttrack_insert_hole_positions(type, length, num_holes)
+                translate_z(-H/2)
+                    female_metric_thread(D, pitch, H, center = true);
+        }
+    }
+
+
+
+}
+
+module ttrack_insert_hole_positions(type, length, num_holes) {
+    P = length / (num_holes + 1);
+    for (x = [P:P:length-P])
+        translate([length/2 - x,0,0])
+            children();
+}

vitamins/ttracks.scad

@@ -0,0 +1,52 @@
+//
+// NopSCADlib Copyright Chris Palmer 2024
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+
+use <screw.scad>
+
+// Bolts                                                                             HL,   HW,  HT, Thread M
+ttrack_bolt_M6       = [ "ttrack_bolt_M6",       "T-Track Bolt M6",                  18,   12, 2.5,  6 ];
+ttrack_bolt_M6_small = [ "ttrack_bolt_M6_small", "T-Track Bolt M6 with small head",  18,   11, 2.5,  6 ];
+ttrack_bolt_M8       = [ "ttrack_bolt_M8",       "T-Track Bolt M8",                22.5, 12.6,   3,  8 ];
+
+// Inserts
+//                                                                                                      TW,  W,   H,  SH, Thread M
+ttrack_insert_mitre_30_M6 = [ "TTrack_insert_Miter30_M6", "T-Track insert, Miter track 30mm, M6 thread", 19, 23, 7.8, 4.8, 6 ];
+ttrack_insert_mitre_30_M8 = [ "TTrack_insert_Miter30_M8", "T-Track insert, Miter track 30mm, M8 thread", 19, 23, 7.8, 4.8, 8 ];
+
+//
+// Tracks
+// Width, Depth, Opening, Slot width, slot height, Top thickness, Screw pitch
+//                                                          W     D     O     SW     SH    TT    Sp
+ttrack_universal_19mm    = [ "ttrack_universal_19mm",      19,  9.5,  9.5,  14.2,   3.3,   2.4,  75, M3_cs_cap_screw, ttrack_bolt_M8 ];
+ttrack_universal_19mm_A  = [ "ttrack_universal_19mm_A",  18.7, 12.5,  8.3,    12,   7.3,   3.5,  75, M3_cs_cap_screw, ttrack_bolt_M6 ];
+ttrack_universal_19mm_B  = [ "ttrack_universal_19mm_B",    19,  9.5,  6.6,  11.3,     4,   2.5,  75, M3_cs_cap_screw, ttrack_bolt_M6_small ];
+
+ttrack_mitre_30mm   = [ "ttrack_mitre_30mm",    30,   12.8, 19.3,  23.6,   3.1,   5.4,  75, M4_cs_cap_screw, ttrack_insert_mitre_30_M6 ];
+ttrack_mitre_36mm   = [ "ttrack_mitre_36mm",    36,   13.5,   19,  23.5,   3.6,   3.6,  75, M4_cs_cap_screw ];
+
+
+
+
+ttracks = [ ttrack_universal_19mm, ttrack_universal_19mm_A, ttrack_universal_19mm_B, ttrack_mitre_30mm, ttrack_mitre_36mm];
+ttrack_bolts = [ ttrack_bolt_M6, ttrack_bolt_M6_small, ttrack_bolt_M8 ];
+ttrack_inserts = [ ttrack_insert_mitre_30_M6, ttrack_insert_mitre_30_M8 ];
+
+
+use <ttrack.scad>