Merge branch 'Drachenkaetzchen-patch-1' of https://github.com/Drachenkaetzchen/NopSCADlib into Drachenkaetzchen-Drachenkaetzchen-patch-1

Moved screw_insert() from inserts.scad to screw.scad.
Changed most includes of inserts.scad to use insert.scad.
Removed linear_bearings, iecs, rockers and microswitches from lib.scad as
already included by other vitamins.

lib.scad

@@ -22,7 +22,7 @@
 //
 include <core.scad>
 
-include <vitamins/fans.scad>
+include <vitamins/psus.scad>
 include <vitamins/inserts.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
@@ -34,14 +34,11 @@ include <vitamins/components.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/tubings.scad>
 include <vitamins/zipties.scad>
-include <vitamins/linear_bearings.scad>
+include <vitamins/scs_bearing_blocks.scad>
 include <vitamins/rod.scad>
 include <vitamins/leadnuts.scad>
 include <vitamins/bulldogs.scad>
 include <vitamins/pillars.scad>
-include <vitamins/psus.scad>
-include <vitamins/iecs.scad>
-include <vitamins/rockers.scad>
 include <vitamins/ssrs.scad>
 include <vitamins/d_connectors.scad>
 include <vitamins/buttons.scad>
@@ -55,7 +52,6 @@ include <vitamins/transformers.scad>
 include <vitamins/variacs.scad>
 include <vitamins/springs.scad>
 include <vitamins/batteries.scad>
-include <vitamins/microswitches.scad>
 include <vitamins/ball_bearings.scad>
 include <vitamins/light_strips.scad>
 include <vitamins/spools.scad>
@@ -64,7 +60,6 @@ include <vitamins/ldrs.scad>
 include <vitamins/geared_steppers.scad>
 include <vitamins/extrusions.scad>
 include <vitamins/sk_brackets.scad>
-include <vitamins/scs_bearing_blocks.scad>
 
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>

printed/box.scad

@@ -35,8 +35,7 @@ include <../core.scad>
 use <../vitamins/sheet.scad>
 use <../vitamins/screw.scad>
 use <../vitamins/washer.scad>
-
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/quadrant.scad>
 
 bezel_clearance = 0.2;

printed/corner_block.scad

@@ -32,7 +32,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/maths.scad>
 

printed/fixing_block.scad

@@ -32,7 +32,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/maths.scad>
 
 def_screw = M3_cap_screw;

printed/foot.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 foot        = [25, 12, 3, 2, M4_cap_screw, 10];
 insert_foot = [20, 10, 0, 2, M3_cap_screw, 10];

printed/handle.scad

@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 dia = 18;
 length = 90; // inside length

printed/psu_shroud.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>
 use <../vitamins/psu.scad>

printed/ribbon_clamp.scad

@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../vitamins/cable_strip.scad>
 
 wall = 2;

printed/socket_box.scad

@@ -23,7 +23,7 @@
 include <../core.scad>
 include <../vitamins/mains_sockets.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 include <../vitamins/ring_terminals.scad>
 
 box_height = 19;

printed/ssr_shroud.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>
 use <../vitamins/ssr.scad>

printed/strap_handle.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 strap = [18, 2, M3_pan_screw, 3, 25];
 function strap() = strap;

readme.md

@@ -38,16 +38,17 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
 <tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
 <tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Springs">Springs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Kp_pillow_blocks">Kp_pillow_blocks</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Modules">Modules</a> </td><td></td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -93,8 +94,10 @@ Also single bearing balls are modelled as just a silver sphere and a BOM entry.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```ball_bearing(BB608)``` |  Ball bearing 608-2RS 8mm x 22mm x 7mm |
+|   1 | ```ball_bearing(BB6200)``` |  Ball bearing 6200-2RS 10mm x 30mm x 9mm |
+|   1 | ```ball_bearing(BB6201)``` |  Ball bearing 6201-2RS 12mm x 32mm x 10mm |
 |   1 | ```ball_bearing(BB624)``` |  Ball bearing 624-2RS 4mm x 13mm x 5mm |
-|   2 | ``` bearing_ball(3)``` |  Steel ball 3mm |
+|   4 | ``` bearing_ball(3)``` |  Steel ball 3mm |
 
 
 <a href="#top">Top</a>
@@ -1087,6 +1090,58 @@ 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 pillow block (15mm variant)|
+|   1 | ```kp_pillow_block(KP08_18)``` |  KP08 pillow block (18mm variant)|
+|   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  |
+|   2 | ```screw(M4_cap_screw, 10)``` |  Screw M4 cap x 10mm |
+|   4 | ```screw(M5_cap_screw, 12)``` |  Screw M5 cap x 12mm |
+|   2 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+|   6 | ```washer(M5_washer)``` |  Washer  M5 x 10mm x 1mm |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -1623,12 +1678,12 @@ If a nut is given a child then it gets placed on its top surface.
 |   1 | ```nut(M2p5_nut)``` |  Nut M2.5 x 2.2mm  |
 |   1 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
 |   1 | ```nut(M2p5_nut, nylon = true)``` |  Nut M2.5 x 2.2mm nylon |
-|   1 | ```hammer_nut(M3_hammer_nut)``` |  Nut M3 hammer |
+|   1 | ```sliding_t_nut(M3_hammer_nut)``` |  Nut M3 hammer |
 |   1 | ```sliding_t_nut(M3_sliding_t_nut)``` |  Nut M3 sliding T |
 |   1 | ```nut(M3_nut)``` |  Nut M3 x 2.4mm  |
 |   1 | ```nut(M3_nut, brass = true)``` |  Nut M3 x 2.4mm brass |
 |   1 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
-|   1 | ```hammer_nut(M4_hammer_nut)``` |  Nut M4 hammer |
+|   1 | ```sliding_t_nut(M4_hammer_nut)``` |  Nut M4 hammer |
 |   1 | ```sliding_t_nut(M4_sliding_t_nut)``` |  Nut M4 sliding T |
 |   1 | ```nut(M4_nut)``` |  Nut M4 x 3.2mm  |
 |   1 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
@@ -2586,7 +2641,7 @@ SK shaft support brackets
 | Module | Description |
 |:--- |:--- |
 | ```sk_bracket(type)``` | SK shaft support bracket |
-| ```sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef)``` | Assembly with fasteners in place |
+| ```sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef, max_screw_depth = 6)``` | Assembly with fasteners in place |
 | ```sk_bracket_hole_positions(type)``` | Place children at hole positions |
 
 ![sk_brackets](tests/png/sk_brackets.png)
@@ -2594,17 +2649,21 @@ SK shaft support brackets
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   2 | ```extrusion(E2020, 20)``` |  Extrusion E2020 x 20mm |
+|   2 | ```extrusion(E3030, 20)``` |  Extrusion E3030 x 20mm |
+|   2 | ```sliding_t_nut(M4_hammer_nut)``` |  Nut M4 hammer |
 |   2 | ```sliding_t_nut(M4_sliding_t_nut)``` |  Nut M4 sliding T |
 |   2 | ```sliding_t_nut(M5_sliding_t_nut)``` |  Nut M5 sliding T |
-|   4 | ```nut(M5_nut, nyloc = undef)``` |  Nut M5 x 4mm  |
+|   2 | ```nut(M5_nut, nyloc = undef)``` |  Nut M5 x 4mm  |
 |   1 | ```sk_bracket(SK10)``` |  SK10 shaft support bracket |
 |   1 | ```sk_bracket(SK12)``` |  SK12 shaft support bracket |
 |   1 | ```sk_bracket(SK16)``` |  SK16 shaft support bracket |
 |   1 | ```sk_bracket(SK8)``` |  SK8 shaft support bracket |
 |   2 | ```screw(M4_cap_screw, 12)``` |  Screw M4 cap x 12mm |
-|   6 | ```screw(M5_cap_screw, 16)``` |  Screw M5 cap x 16mm |
-|   2 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
-|  10 | ```washer(M5_washer)``` |  Washer  M5 x 10mm x 1mm |
+|   2 | ```screw(M4_dome_screw, 12)``` |  Screw M4 dome x 12mm |
+|   4 | ```screw(M5_cap_screw, 16)``` |  Screw M5 cap x 16mm |
+|   4 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+|   6 | ```washer(M5_washer)``` |  Washer  M5 x 10mm x 1mm |
 
 
 <a href="#top">Top</a>
@@ -5076,11 +5135,12 @@ Small holes can get away without it, but they print better with truncated teardr
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```semi_teardrop(h, r, d = undef, center = true)``` | A semi teardrop in the positive Y domain |
-| ```teardrop(h, r, center = true, truncate = true)``` | For making horizontal holes that don't need support material, set ```truncate = false``` to make traditional RepRap teardrops that don't even need bridging |
-| ```teardrop_plus(h, r, center = true, truncate = true)``` | Slightly bigger teardrop to allow for the 3D printing staircase effect |
-| ```tearslot(h, r, w, center = true)``` | A horizontal slot that doesn't need support material |
-| ```vertical_tearslot(h, r, l, center = true)``` | A vertical slot that doesn't need support material |
+| ```semi_teardrop(h, r, d = undef, center = true, chamfer = 0)``` | A semi teardrop in the positive Y domain |
+| ```teardrop(h, r, center = true, truncate = true, chamfer = 0)``` | For making horizontal holes that don't need support material, set ```truncate = false``` to make traditional RepRap teardrops that don't even need bridging |
+| ```teardrop_chamfer(h, center, chamfer)``` | Helper module for adding chamfer to a teardrop |
+| ```teardrop_plus(h, r, center = true, truncate = true, chamfer = 0)``` | Slightly bigger teardrop to allow for the 3D printing staircase effect |
+| ```tearslot(h, r, w, center = true, chamfer = 0)``` | A horizontal slot that doesn't need support material |
+| ```vertical_tearslot(h, r, l, center = true, chamfer = 0)``` | A vertical slot that doesn't need support material |
 
 ![teardrops](tests/png/teardrops.png)
 

scripts/exports.py

@@ -85,48 +85,49 @@ def make_parts(target, part_type, parts = None):
     #
     lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
     module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename[-5:] == ".scad":
-                #
-                # find any modules ending in _<part_type>
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    for line in f.readlines():
-                        words = line.split()
-                        if(len(words) and words[0] == "module"):
-                            module = words[1].split('(')[0]
-                            if module.endswith(module_suffix):
-                                base_name = module[:-4]
-                                part = base_name + '.' + part_type
-                                if part in targets:
-                                    #
-                                    # make a file to use the module
-                                    #
-                                    part_maker_name = part_type + ".scad"
-                                    with open(part_maker_name, "w") as f:
-                                        f.write("use <%s/%s>\n" % (dir, filename))
-                                        f.write("%s();\n" % module);
-                                    #
-                                    # Run openscad on the created file
-                                    #
-                                    part_file = target_dir + "/" + part
-                                    dname = deps_name(deps_dir, filename)
-                                    changed = check_deps(part_file, dname)
-                                    changed = times.check_have_time(changed, part)
-                                    if part_type == 'stl' and not changed and not part in bounds_map:
-                                        changed = "No bounds"
-                                    if changed:
-                                        print(changed)
-                                        t = time.time()
-                                        openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
-                                        times.add_time(part, t)
-                                        if part_type == 'stl':
-                                            bounds = c14n_stl.canonicalise(part_file)
-                                            bounds_map[part] = bounds
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename[-5:] == ".scad":
+                    #
+                    # find any modules ending in _<part_type>
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        for line in f.readlines():
+                            words = line.split()
+                            if(len(words) and words[0] == "module"):
+                                module = words[1].split('(')[0]
+                                if module.endswith(module_suffix):
+                                    base_name = module[:-4]
+                                    part = base_name + '.' + part_type
+                                    if part in targets:
+                                        #
+                                        # make a file to use the module
+                                        #
+                                        part_maker_name = part_type + ".scad"
+                                        with open(part_maker_name, "w") as f:
+                                            f.write("use <%s/%s>\n" % (dir, filename))
+                                            f.write("%s();\n" % module);
+                                        #
+                                        # Run openscad on the created file
+                                        #
+                                        part_file = target_dir + "/" + part
+                                        dname = deps_name(deps_dir, filename)
+                                        changed = check_deps(part_file, dname)
+                                        changed = times.check_have_time(changed, part)
+                                        if part_type == 'stl' and not changed and not part in bounds_map:
+                                            changed = "No bounds"
+                                        if changed:
+                                            print(changed)
+                                            t = time.time()
+                                            openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
+                                            times.add_time(part, t)
+                                            if part_type == 'stl':
+                                                bounds = c14n_stl.canonicalise(part_file)
+                                                bounds_map[part] = bounds
 
-                                    targets.remove(part)
-                                    os.remove(part_maker_name)
+                                        targets.remove(part)
+                                        os.remove(part_maker_name)
     #
     # Write new bounds file
     #

scripts/views.py

@@ -124,66 +124,67 @@ def views(target, do_assemblies = None):
     #
     main_blurb = None
     lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename.endswith('.scad'):
-                #
-                # find any modules with names ending in _assembly
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    lines = f.readlines()
-                line_no = 0
-                for line in lines:
-                    words = line.split()
-                    if len(words) and words[0] == "module":
-                        module = words[1].split('(')[0]
-                        if is_assembly(module):
-                            if module in assemblies:
-                                #
-                                # Scrape the assembly instructions
-                                #
-                                for ass in flat_bom:
-                                    if ass["name"] == module:
-                                        if not "blurb" in ass:
-                                            ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
-                                        break
-                                if not do_assemblies or module in do_assemblies:
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename.endswith('.scad'):
+                    #
+                    # find any modules with names ending in _assembly
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        lines = f.readlines()
+                    line_no = 0
+                    for line in lines:
+                        words = line.split()
+                        if len(words) and words[0] == "module":
+                            module = words[1].split('(')[0]
+                            if is_assembly(module):
+                                if module in assemblies:
                                     #
-                                    # make a file to use the module
+                                    # Scrape the assembly instructions
                                     #
-                                    png_maker_name = 'png.scad'
-                                    with open(png_maker_name, "w") as f:
-                                        f.write("use <%s/%s>\n" % (dir, filename))
-                                        f.write("%s();\n" % module);
-                                    #
-                                    # Run openscad on the created file
-                                    #
-                                    dname = deps_name(deps_dir, filename)
-                                    for explode in [0, 1]:
-                                        png_name = target_dir + '/' + module + '.png'
-                                        if not explode:
-                                            png_name = png_name.replace('_assembly', '_assembled')
-                                        changed = check_deps(png_name, dname)
-                                        changed = times.check_have_time(changed, png_name)
-                                        changed = options.have_changed(changed, png_name)
-                                        tmp_name = 'tmp.png'
-                                        if changed:
-                                            print(changed)
-                                            t = time.time()
-                                            openscad.run_list(options.list() + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name]);
-                                            times.add_time(png_name, t)
-                                            do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
-                                            update_image(tmp_name, png_name)
-                                        tn_name = png_name.replace('.png', '_tn.png')
-                                        if mtime(png_name) > mtime(tn_name):
-                                            do_cmd(("magick "+ png_name + " -trim -resize 280x280 -background " + background + " -gravity Center -extent 280x280 -bordercolor " + background + " -border 10 " + tmp_name).split())
-                                            update_image(tmp_name, tn_name)
-                                    os.remove(png_maker_name)
-                                done_assemblies.append(module)
-                            else:
-                                if module == 'main_assembly':
-                                    main_blurb = blurb.scrape_module_blurb(lines[:line_no])
-                    line_no += 1
+                                    for ass in flat_bom:
+                                        if ass["name"] == module:
+                                            if not "blurb" in ass:
+                                                ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
+                                            break
+                                    if not do_assemblies or module in do_assemblies:
+                                        #
+                                        # make a file to use the module
+                                        #
+                                        png_maker_name = 'png.scad'
+                                        with open(png_maker_name, "w") as f:
+                                            f.write("use <%s/%s>\n" % (dir, filename))
+                                            f.write("%s();\n" % module);
+                                        #
+                                        # Run openscad on the created file
+                                        #
+                                        dname = deps_name(deps_dir, filename)
+                                        for explode in [0, 1]:
+                                            png_name = target_dir + '/' + module + '.png'
+                                            if not explode:
+                                                png_name = png_name.replace('_assembly', '_assembled')
+                                            changed = check_deps(png_name, dname)
+                                            changed = times.check_have_time(changed, png_name)
+                                            changed = options.have_changed(changed, png_name)
+                                            tmp_name = 'tmp.png'
+                                            if changed:
+                                                print(changed)
+                                                t = time.time()
+                                                openscad.run_list(options.list() + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name]);
+                                                times.add_time(png_name, t)
+                                                do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
+                                                update_image(tmp_name, png_name)
+                                            tn_name = png_name.replace('.png', '_tn.png')
+                                            if mtime(png_name) > mtime(tn_name):
+                                                do_cmd(("magick "+ png_name + " -trim -resize 280x280 -background " + background + " -gravity Center -extent 280x280 -bordercolor " + background + " -border 10 " + tmp_name).split())
+                                                update_image(tmp_name, tn_name)
+                                        os.remove(png_maker_name)
+                                    done_assemblies.append(module)
+                                else:
+                                    if module == 'main_assembly':
+                                        main_blurb = blurb.scrape_module_blurb(lines[:line_no])
+                        line_no += 1
     times.print_times()
     #
     # Build the document

tests/belts.scad

@@ -20,8 +20,8 @@ include <../core.scad>
 
 include <../vitamins/belts.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
 include <../vitamins/pulleys.scad>
+use <../vitamins/insert.scad>
 use <../utils/layout.scad>
 
 module belt_test() {

tests/bom.scad

@@ -22,8 +22,8 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
 include <../vitamins/sheets.scad>
+use <../vitamins/insert.scad>
 $explode = 1; // Normally set on the command line when generating assembly views with views.py
 
 screw = M3_cap_screw;

tests/box.scad

@@ -20,7 +20,7 @@ include <../core.scad>
 
 include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 use <../printed/box.scad>
 

tests/butt_box.scad

@@ -20,7 +20,7 @@ include <../core.scad>
 
 include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 include <../printed/butt_box.scad>
 

tests/kp_pillow_blocks.scad

@@ -0,0 +1,34 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/kp_pillow_blocks.scad>
+include <../vitamins/nuts.scad>
+
+module kp_pillow_blocks() {
+    screws = [M4_cap_screw, M5_cap_screw, M5_cap_screw];
+    nuts = [M4_sliding_t_nut, M5_sliding_t_nut, M5_nut];
+    layout([for(k = kp_pillow_blocks) 2 * kp_size(k)[1]])
+        kp_pillow_block_assembly(kp_pillow_blocks[$i], screw_type = screws[$i], nut_type = nuts[$i]);
+}
+
+if($preview)
+    kp_pillow_blocks();
+

tests/nuts.scad

@@ -58,10 +58,10 @@ module nuts() {
 
         translate([0, 80]) {
             if(n == M3_nut)
-                hammer_nut(M3_hammer_nut);
+                sliding_t_nut(M3_hammer_nut);
 
             if(n == M4_nut)
-                hammer_nut(M4_hammer_nut);
+                sliding_t_nut(M4_hammer_nut);
        }
     }
 }

tests/sk_brackets.scad

@@ -20,12 +20,19 @@ include <../core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/sk_brackets.scad>
+include <../vitamins/extrusions.scad>
 
 module sk_brackets() {
-    screws = [M5_cap_screw, M5_cap_screw, M4_cap_screw, M5_cap_screw];
-    nuts = [undef, M5_nut, M4_sliding_t_nut, M5_sliding_t_nut];
-    layout([for(s = sk_brackets) 1.5 * sk_size(s)[1]])
-        sk_bracket_assembly(sk_brackets[$i], screw_type = screws[$i], nut_type = nuts[$i]);
+    screws = [M4_dome_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw];
+    nuts = [M4_hammer_nut, M4_sliding_t_nut, M5_sliding_t_nut, undef];
+    // channel depth = 6 for 2020 extrusion, 9 for 3030 extrusion
+    depths = [6, 6, 9, 0];
+    layout([for(s = sk_brackets) 1.5 * sk_size(s)[1]]) {
+        sk_bracket_assembly(sk_brackets[$i], screw_type = screws[$i], nut_type = nuts[$i], max_screw_depth = depths[$i]);
+        translate([0, -sk_hole_offset(sk_brackets[$i]) - extrusion_width($i < 2 ? E2020 : E3030) / 2, 0])
+            rotate([0, 90, 0])
+                extrusion($i < 2 ? E2020 : E3030, 20);
+    }
 }
 
 if($preview)

tests/teardrops.scad

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

utils/core/teardrops.scad

@@ -21,45 +21,106 @@
 //! For making horizontal holes that don't need support material.
 //! Small holes can get away without it, but they print better with truncated teardrops.
 //
-module teardrop(h, r, center = true, truncate = true) //! For making horizontal holes that don't need support material, set ```truncate = false``` to make traditional RepRap teardrops that don't even need bridging
-    render(convexity = 5)
-        extrude_if(h, center)
-           hull() {
-                circle4n(r);
-
-                if(truncate)
-                    translate([0, r / 2])
-                        square([2 * r * (sqrt(2) - 1), r], center = true);
-                else
-                    polygon([[0, 0], [eps, 0], [0, r * sqrt(2)]]);
-            }
-
-module semi_teardrop(h, r, d = undef, center = true) //! A semi teardrop in the positive Y domain
-    render(convexity = 5)
-        extrude_if(h, center)
-            intersection() {
-                R = is_undef(d) ? r : d / 2;
-                teardrop(r = R, h = 0);
-
-                sq = R + 1;
-                translate([-sq, 0])
-                    square([2 * sq, sq]);
-            }
-
-module teardrop_plus(h, r, center = true, truncate = true) //! Slightly bigger teardrop to allow for the 3D printing staircase effect
-    teardrop(h, r + layer_height / 4, center, truncate);
-
-module tearslot(h, r, w, center = true) //! A horizontal slot that doesn't need support material
-    extrude_if(h, center)
+module teardrop(h, r, center = true, truncate = true, chamfer = 0) { //! For making horizontal holes that don't need support material, set ```truncate = false``` to make traditional RepRap teardrops that don't even need bridging
+    module teardrop_2d(r, truncate) {
         hull() {
-            translate([-w/2,0,0]) teardrop(r = r, h = 0);
-            translate([ w/2,0,0]) teardrop(r = r, h = 0);
+            circle4n(r);
+            if(truncate)
+                translate([0, r / 2])
+                    square([2 * r * (sqrt(2) - 1), r], center = true);
+            else
+                polygon([[0, 0], [eps, 0], [0, r * sqrt(2)]]);
         }
+    }
+
+    render(convexity = 5)
+        extrude_if(h, center)
+            teardrop_2d(r, truncate);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            teardrop_2d(r + chamfer / 2, truncate);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                teardrop_2d(r, truncate);
+    }
+}
+
+module semi_teardrop(h, r, d = undef, center = true, chamfer = 0) { //! A semi teardrop in the positive Y domain
+    module semi_teardrop_2d(r, d) {
+        intersection() {
+            R = is_undef(d) ? r : d / 2;
+            teardrop(r = R, h = 0);
+
+            sq = R + 1;
+            translate([-sq, 0])
+                square([2 * sq, sq]);
+        }
+    }
+
+    render(convexity = 5)
+        extrude_if(h, center)
+            semi_teardrop_2d(r, d);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            semi_teardrop_2d(r + chamfer / 2, d);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                semi_teardrop_2d(r, d);
+    }
+}
+
+module teardrop_plus(h, r, center = true, truncate = true, chamfer = 0) //! Slightly bigger teardrop to allow for the 3D printing staircase effect
+    teardrop(h, r + layer_height / 4, center, truncate, chamfer);
+
+module tearslot(h, r, w, center = true, chamfer = 0) { //! A horizontal slot that doesn't need support material
+    module tearslot_2d(r, w) {
+        hull() {
+            translate([-w / 2, 0]) teardrop(r = r, h = 0);
+            translate([w / 2, 0]) teardrop(r = r, h = 0);
+        }
+    }
 
-module vertical_tearslot(h, r, l, center = true) //! A vertical slot that doesn't need support material
     extrude_if(h, center)
+        tearslot_2d(r, w);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            tearslot_2d(r + chamfer / 2, w);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                tearslot_2d(r, w);
+    }
+}
+
+module vertical_tearslot(h, r, l, center = true, chamfer = 0) { //! A vertical slot that doesn't need support material
+    module vertical_tearslot_2d(r, l) {
         hull() {
             translate([0,  l / 2]) teardrop(0, r, true);
-            translate([0, -l / 2])
-                circle4n(r);
+            translate([0, -l / 2]) circle4n(r);
         }
+    }
+
+    extrude_if(h, center)
+        vertical_tearslot_2d(r, l);
+
+    teardrop_chamfer(h, center, chamfer) {
+        linear_extrude(eps, center = true)
+            vertical_tearslot_2d(r + chamfer / 2, l);
+        translate_z(-chamfer / 2)
+            linear_extrude(eps, center = true)
+                vertical_tearslot_2d(r, l);
+    }
+}
+
+module teardrop_chamfer(h, center, chamfer) { //! Helper module for adding chamfer to a teardrop
+    if(h && chamfer)
+        translate_z(center ? 0 : h / 2)
+            for(m = [0, 1])
+                mirror([0, 0, m])
+                    translate_z((h - eps ) / 2)
+                        hull()
+                            children();
+}
+

vitamins/ball_bearings.scad

@@ -18,7 +18,9 @@
 //
 BB624 = ["624", 4, 13, 5, "blue"];      // 624 ball bearing for idlers
 BB608 = ["608", 8, 22, 7, "OrangeRed"]; // 608 bearings for wades
+BB6200 = ["6200", 10, 30, 9, "black"];  // 6200 bearings for KP pillow blocks
+BB6201 = ["6201", 12, 32, 10, "black"]; // 6201 bearings for KP pillow blocks
 
-ball_bearings = [BB624, BB608];
+ball_bearings = [BB624, BB608, BB6200, BB6201];
 
 use <ball_bearing.scad>

vitamins/iec.scad

@@ -25,7 +25,7 @@ use <screw.scad>
 use <nut.scad>
 use <washer.scad>
 use <spade.scad>
-include <inserts.scad>
+use <insert.scad>
 
 function iec_part(type)     = type[1];  //! Description
 function iec_screw(type)    = type[2];  //! Screw type

vitamins/inserts.scad

@@ -36,8 +36,4 @@ F1BM4   = [ "F1BM4",   8.2, 6.3, 5.6, 4,   5.15, 2.3, 6.0, 5.55 ];
 
 inserts = [ F1BM2, F1BM2p5, F1BM3, F1BM4 ];
 
-function screw_insert(screw, i = 0) = let(d = screw_radius(screw) * 2)
-     i >= len(inserts) ? undef
-                       : insert_screw_diameter(inserts[i]) == d ? inserts[i]
-                                                                : screw_insert(screw, i + 1);
 use <insert.scad>

vitamins/kp_pillow_block.scad

@@ -0,0 +1,116 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+
+//
+//! KP pillow block bearings
+//
+include <../core.scad>
+use <../utils/tube.scad>
+
+include <screws.scad>
+use <washer.scad>
+use <ball_bearing.scad>
+
+kp_pillow_block_color = grey70;
+
+function kp_diameter(type)        = type[1]; //! Rod hole diameter
+function kp_hole_offset(type)     = type[2]; //! Rod hole offset
+function kp_size(type)            = [type[3],type[8],type[5]]; //! Size of bracket
+function kp_base_height(type)     = type[7]; //! Height of base containing the bolts
+function kp_screw_separation(type) = type[4]; //! Separation of bolts in the base
+
+
+module kp_pillow_block(type) { //! Draw the KP pillow block
+    vitamin(str("kp_pillow_block(", type[0], "): ", type[0], " pillow block"));
+
+    d = kp_diameter(type);
+    H = kp_hole_offset(type);
+    L = kp_size(type)[0];
+    J = kp_screw_separation(type);
+    A = kp_size(type)[2];// sizeZ, includes protruding center
+    N = type[6];
+    H1 = kp_base_height(type);
+    H0 = kp_size(type)[1];
+    K = type[9];
+    S = type[10];
+    b = type[11];
+    bolthole_radius = type[12];
+
+    color(kp_pillow_block_color)
+        translate([0, -H, 0]) {
+            fillet = 1;
+            squareSizeX = (L - H0) / 2 + fillet;
+            rotate([-90, 0, 0])
+                linear_extrude(H1)
+                    difference() {
+                        union() {
+                            for(i = [-L / 2, L / 2 - squareSizeX])
+                                translate([i, -A / 2])
+                                    rounded_square([squareSizeX, A], fillet, center = false);
+                        }
+                        for(i = [-J / 2, J / 2])
+                            translate([i, 0])
+                                circle(r = bolthole_radius);
+                    }
+
+            translate_z(-A / 2) {
+                for(x = [- L / 2 + squareSizeX - fillet, L / 2 - squareSizeX + fillet - 2])
+                    translate([x, 0, 0])
+                        cube([2, H, A]);
+                stripLength = J - 2 * bolthole_radius;
+                stripThickness = 4;
+                translate([-stripLength / 2, 0, (H1 + stripThickness) / 2])
+                    cube([stripLength, H1, stripThickness]);
+                translate([0 , H, 0])
+                    tube(H0 / 2, b / 2, A, center = false);
+            }
+        }
+
+    not_on_bom() no_explode()
+        ball_bearing(type[13]);
+}
+
+module kp_pillow_block_hole_positions(type) { //! Place children at hole positions
+    for(x = [-kp_screw_separation(type), kp_screw_separation(type)])
+        translate([x / 2, kp_base_height(type) - kp_hole_offset(type), 0])
+            rotate([-90,0,0])
+                children();
+}
+
+module kp_pillow_block_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef) { //! Assembly with fasteners in place
+    kp_pillow_block(type);
+
+    screw_washer_thickness = washer_thickness(screw_washer(screw_type));
+    nut_type = is_undef(nut_type) ? screw_nut(screw_type) : nut_type;
+    nut_washer_type = nut_washer(nut_type);
+    nut_washer_thickness = nut_washer_type ? washer_thickness(nut_washer_type) : 0;
+
+    nut_offset = kp_base_height(type) + part_thickness;
+    screw_length = screw_shorter_than(nut_offset + screw_washer_thickness +  nut_thickness(nut_type) + nut_washer_thickness);
+
+    kp_pillow_block_hole_positions(type) {
+        screw_and_washer(screw_type, screw_length);
+
+        translate_z(-nut_offset)
+            vflip()
+                if(nut_washer_type)
+                    nut_and_washer(nut_type);
+                else
+                    sliding_t_nut(nut_type);
+    }
+}

vitamins/kp_pillow_blocks.scad

@@ -0,0 +1,35 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! KP pillow block bearings
+//
+
+include <screws.scad>
+include <ball_bearings.scad>
+
+//                      d   H   L   J   A    N  H1  H0     K  S  b   bolthole             bearing
+KP08_15 = ["KP08_15",   8, 15, 55, 42, 13, 4.5,  5, 29,  0.0, 0, 22, M4_clearance_radius, BB608];
+KP08_18 = ["KP08_18",   8, 18, 55, 42, 13, 4.5,  5, 29,  0.0, 0, 22, M4_clearance_radius, BB608];
+KP000 =   ["KP000",    10, 18, 67, 53, 16, 7.0,  6, 35, 14.0, 4, 30, M6_clearance_radius, BB6200];
+KP001 =   ["KP001",    12, 19, 71, 56, 16, 7.0,  6, 38, 14.5, 4, 32, M6_clearance_radius, BB6201];
+
+kp_pillow_blocks = [KP08_15, KP08_18, KP000, KP001];
+
+use <kp_pillow_block.scad>

vitamins/mains_socket.scad

@@ -23,7 +23,7 @@
 include <../core.scad>
 include <screws.scad>
 include <ring_terminals.scad>
-include <inserts.scad>
+use <insert.scad>
 
 function mains_socket_width(type)  = type[1]; //! Width at the base
 function mains_socket_depth(type)  = type[2]; //! Depth at the base

vitamins/nut.scad

@@ -132,7 +132,8 @@ module wingnut(type) { //! Draw a wingnut
 }
 
 module sliding_t_nut(type) {
-    vitamin(str("sliding_t_nut(", type[0], "): Nut M", nut_size(type), " sliding T"));
+    hammerNut = type[10];
+    vitamin(str("sliding_t_nut(", type[0], "): Nut M", nut_size(type), hammerNut ? " hammer" : " sliding T"));
 
     size = [type[7], type[2], nut_thickness(type, true)];
     tabSizeY1 = type[8];
@@ -141,20 +142,7 @@ module sliding_t_nut(type) {
     holeRadius  = nut_size(type) / 2;
 
     color(grey80)
-        extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius);
-}
-
-module hammer_nut(type) {
-    vitamin(str("hammer_nut(", type[0], "): Nut M", nut_size(type), " hammer"));
-
-    size = [type[7], type[2], nut_thickness(type, true)];
-    tabSizeY1 = type[8];
-    tabSizeY2 = type[9];
-    tabSizeZ = nut_thickness(type);
-    holeRadius  = nut_size(type) / 2;
-
-    color(grey80)
-        extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, 0, hammerNut = true);
+        extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, 0, hammerNut);
 }
 
 module extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, holeOffset = 0, hammerNut = false) {

vitamins/nuts.scad

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-
+include <washers.scad>
 //
 // Nuts
 //
@@ -51,12 +51,12 @@ toggle_nut  =      ["toggle_nut",       6.1, 9.2, 1.5, 1.5,  M6_washer,     1.5]
 
 M4_wingnut  =      ["M4_wingnut",       4,  10,   3.75,8,    M4_washer,     0, 22, 10, 6, 3];
 
-//                                                                              sx  ty1 ty2
-M3_sliding_t_nut = ["M3_sliding_t_nut", 3,   6,   3.0, 4.0,  false,         0,  10,  10,  6];
-M4_sliding_t_nut = ["M4_sliding_t_nut", 4,   6,   3.25,4.5,  false,         0,  11,  10,  6];
-M5_sliding_t_nut = ["M5_sliding_t_nut", 5,   6,   3.25,4.5,  false,         0,  11,  10,  7];
-M3_hammer_nut =    ["M3_hammer_nut",    3,   6,   2.75,4.0,  false,         0, 5.5,  10,  6];
-M4_hammer_nut =    ["M4_hammer_nut",    4,   6,   3.25,4.5,  false,         0, 5.5,  10,  6];
+//                                                                              sx  ty1 ty2 hammer
+M3_sliding_t_nut = ["M3_sliding_t_nut", 3,   6,   3.0, 4.0,  false,         0,  10,  10,  6, false];
+M4_sliding_t_nut = ["M4_sliding_t_nut", 4,   6,   3.25,4.5,  false,         0,  11,  10,  6, false];
+M5_sliding_t_nut = ["M5_sliding_t_nut", 5,   6,   3.25,4.5,  false,         0,  11,  10,  7, false];
+M3_hammer_nut =    ["M3_hammer_nut",    3,   6,   2.75,4.0,  false,         0, 5.5,  10,  6, true];
+M4_hammer_nut =    ["M4_hammer_nut",    4,   6,   3.25,4.5,  false,         0, 5.5,  10,  6, true];
 
 nuts = [M2_nut, M2p5_nut, M3_nut, M4_nut, M5_nut, M6_nut, M8_nut];
 

vitamins/pcbs.scad

@@ -339,18 +339,19 @@ PERF74x51 = ["PERF74x51", "Perfboard 74 x 51mm", 74, 51, 1.0, 0, 3.0, 0, "sienna
 
 PSU12V1A = ["PSU12V1A", "PSU 12V 1A", 67, 31, 1.7, 0, 3.9, 0, "green", true, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]], [], []];
 
-include <microswitches.scad>
-
 RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
-    40.0, 16.0, 1.6, 0, 2.54, 0, "red",  false,
+    40.0, 16.0, 1.6, 0.5, 2.54, 0, "red",  false,
     [
         [2, 2], [2, 13.5], [17, 13.5], [36, 13.5]
     ],
     [
+        [ 12,    8,   -90, "jst_xh", 3, true, "white", "silver"],
         [ 26.5, 12.75,  0, "microswitch", small_microswitch],
+        [ 27.5, 17.5,  15, "chip", 15, 0.5, 4.5, "silver"],
     ],
     []];
 
+
 pcbs = [ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591, RAMPSEndstop];
 
 use <pcb.scad>

vitamins/screw.scad

@@ -25,6 +25,7 @@ include <../core.scad>
 use <washer.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/thread.scad>
+include <inserts.scad>
 
 function screw_head_type(type)        = type[2];     //! Head style hs_cap, hs_pan, hs_cs, hs_hex, hs_grub, hs_cs_cap, hs_dome
 function screw_radius(type)           = type[3] / 2; //! Nominal radius
@@ -58,6 +59,11 @@ function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns longes
 
 function screw_smaller_than(d) = d >= 2.5 && d < 3 ? 2.5 : floor(d); // Largest diameter screw less than or equal to specified diameter
 
+function screw_insert(screw, i = 0) = let(d = screw_radius(screw) * 2)
+     i >= len(inserts) ? undef
+                       : insert_screw_diameter(inserts[i]) == d ? inserts[i]
+                                                                : screw_insert(screw, i + 1);
+
 module screw(type, length, hob_point = 0, nylon = false) { //! Draw specified screw, optionally hobbed or nylon
     description = str("Screw ", nylon ? "Nylon " : "", type[1], length < 10 ? " x  " : " x ", length, "mm", hob_point ? str(", hobbed at ", hob_point) : "");
     vitamin(str("screw(", type[0], "_screw, ", length, arg(hob_point, 0, "hob_point"), arg(nylon, false, "nylon"), "): ", description));

vitamins/screws.scad

@@ -20,7 +20,6 @@
 //
 // Screws
 //
-include <washers.scad>
 include <nuts.scad>
 
 No2_pilot_radius = 1.7 / 2;       // self tapper into ABS
@@ -119,7 +118,7 @@ screw_lists = [
 
 use <screw.scad>
 
-screws = [for(list = screw_lists) for(screw = list) screw];
+screws = [for(list = screw_lists) each list];
 
 function find_screw(type, size, i = 0) =
     i >= len(screws) ? undef

vitamins/scs_bearing_block.scad

@@ -22,11 +22,11 @@
 //
 
 
-include <NopSCADlib/core.scad>
-use <NopSCADlib/vitamins/screw.scad>
-use <NopSCADlib/vitamins/nut.scad>
-use <NopSCADlib/vitamins/washer.scad>
-use <NopSCADlib/vitamins/linear_bearing.scad>
+include <../core.scad>
+use <screw.scad>
+use <nut.scad>
+use <washer.scad>
+use <linear_bearing.scad>
 
 function scs_size(type)                 = [type[4],type[6],type[5]]; //! Size of scs bracket bounding block
 function scs_hole_offset(type)          = type[2]; //! Offset of bearing hole from base of block

vitamins/scs_bearing_blocks.scad

@@ -21,9 +21,8 @@
 // SCS bearing blocks
 //
 
-include <NopSCADlib/core.scad>
-include <NopSCADlib/vitamins/screws.scad>
-include <NopSCADlib/vitamins/linear_bearings.scad>
+include <screws.scad>
+include <linear_bearings.scad>
 
 //                        T  h   E   W   L   F     G   B     C   K     S1            S2   L1  LB
 SCS6UU    = ["SCS6UU",    6,  9, 15, 30, 25, 18,   15, 20,   15, 5,    M4_cap_screw, 3.4,  8, LM6UU];

vitamins/sk_bracket.scad

@@ -1,5 +1,5 @@
 //
-// NopSCADlib Copyright Chris Palmer 2018
+// NopSCADlib Copyright Chris Palmer 2020
 // nop.head@gmail.com
 // hydraraptor.blogspot.com
 //
@@ -100,7 +100,7 @@ module sk_bracket_hole_positions(type) { //! Place children at hole positions
                 children();
 }
 
-module sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef) { //! Assembly with fasteners in place
+module sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw, nut_type = undef, max_screw_depth = 6) { //! Assembly with fasteners in place
     sk_bracket(type);
 
     screw_type = is_undef(screw_type) ? scs_screw(type) : screw_type;
@@ -110,16 +110,15 @@ module sk_bracket_assembly(type, part_thickness = 2, screw_type = M5_cap_screw,
     nut_washer_thickness = nut_washer_type ? washer_thickness(nut_washer_type) : 0;
 
     nut_offset = sk_base_height(type) + part_thickness;
-    screw_length = nut_washer_type ? screw_longer_than(nut_offset + screw_washer_thickness + nut_washer_thickness + nut_thickness(nut_type))
-                                   : screw_shorter_than(nut_offset + screw_washer_thickness + nut_thickness(nut_type) + 2);
-
+    screw_length = max_screw_depth ? screw_shorter_than(sk_base_height(type) + screw_washer_thickness + max_screw_depth)
+                                   : screw_longer_than(nut_offset + screw_washer_thickness + nut_washer_thickness + nut_thickness(nut_type));
     sk_bracket_hole_positions(type) {
         screw_and_washer(screw_type, screw_length);
         translate_z(-nut_offset)
             vflip()
-                if(!nut_washer_type)
-                    sliding_t_nut(nut_type);
-                else
+                if(nut_washer_type)
                     nut_and_washer(nut_type);
+                else
+                    sliding_t_nut(nut_type);
     }
 }

vitamins/sk_brackets.scad

@@ -1,5 +1,5 @@
 //
-// NopSCADlib Copyright Chris Palmer 2018
+// NopSCADlib Copyright Chris Palmer 2020
 // nop.head@gmail.com
 // hydraraptor.blogspot.com
 //
@@ -21,8 +21,7 @@
 // SK shaft support brackets
 //
 
-include <../core.scad>
-include <../vitamins/screws.scad>
+include <screws.scad>
 
 //               d   h   E   W   L   F    G   P   B    S  bolthole
 SK8  = ["SK8",   8, 20, 21, 42, 14, 32.8, 6, 18, 32, 5.5, M5_clearance_radius];
@@ -32,4 +31,3 @@ SK16 = ["SK16", 16, 27, 24, 48, 16, 44.0, 8, 25, 38, 5.5, M5_clearance_radius];
 
 sk_brackets = [SK8,  SK10, SK12, SK16];
 use <sk_bracket.scad>
-

vitamins/veroboard.scad

@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 use <pcb.scad>
-include <../vitamins/screws.scad>
+include <screws.scad>
 
 function vero_assembly(type)       = type[1];   //! Name of the assembly
 function vero_holes(type)          = type[2];   //! Number of holes in each strip