Added a hygrometer module.

Both added to the insert test.

gallery/readme.md

@@ -6,6 +6,13 @@ Arduino thermostat to control a beer fridge to use it as an environmental chambe
 ![](ArduinoThermostat.png)
 
 
+<a name="TOP"></a>
+## FilamentDryBox
+A small fan oven with a spool holder to keep the filament warm and dry.
+
+![](FilamentDryBox.png)
+
+
 <a name="TOP"></a>
 ## HydraBot
 Current state of HydraRaptor after being modified for laser engraving.
@@ -68,6 +75,13 @@ Mains isolated and variable supply with metering.
 ![](Mains_Box.png)
 
 
+<a name="TOP"></a>
+## SunBot
+A solar tracker to keep solar powerbanks pointing at the sun.
+
+![](SunBot.png)
+
+
 <a name="TOP"></a>
 ## Turntable
 WiFi enabled remote control turntable for photography

lib.scad

@@ -66,6 +66,7 @@ include <vitamins/geared_steppers.scad>
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>
 use <vitamins/fuseholder.scad>
+use <vitamins/hygrometer.scad>
 
 use <vitamins/opengrab.scad>
 use <vitamins/wire.scad>

libtest.scad

@@ -313,7 +313,10 @@ translate([x3, iecs_y])
 translate([x3 + 15, modules_y])
     microview();
 
-translate([x3 + 40, modules_y])
+translate([x3 + 60, modules_y])
+    hygrometer();
+
+translate([x3 + 90, modules_y])
     modules();
 
 translate([x3, ssrs_y]) {

printed/psu_shroud.scad

@@ -139,8 +139,8 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
     mirror([0, 1, 0])
         psu_shroud_hole_positions(type)
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
  }
 
 module psu_shroud_assembly(type, cable_d, name, cables = 1) //! The printed parts with inserts fitted

printed/ssr_shroud.scad

@@ -103,8 +103,8 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
     ssr_shroud_hole_positions(type)
         vflip()
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
 }
 
 module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted

readme.md

@@ -17,25 +17,26 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 
 ## Table of Contents<a name="top"/>
 <table><tr>
-<th align="left"> Vitamins A-N </th><th align="left"> Vitamins O-Z </th><th align="left"> Printed </th><th align="left"> Utilities </th><th align="left"> Core Utilities </th></tr>
-<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#Bom">Bom</a> </td></tr>
-<tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
-<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Pcbs">Pcbs</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Global">Global</a> </td></tr>
-<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
-<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Psus">Psus</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
-<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<th align="left"> Vitamins A-M </th><th align="left"> Vitamins N-Z </th><th align="left"> Printed </th><th align="left"> Utilities </th><th align="left"> Core Utilities </th></tr>
+<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#Bom">Bom</a> </td></tr>
+<tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
+<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Global">Global</a> </td></tr>
+<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Pcbs">Pcbs</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
+<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
+<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Psus">Psus</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spools">Spools</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 = "#Springs">Springs</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 = "#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>
@@ -46,7 +47,6 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <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>
-<tr><td> <a href = "#Nuts">Nuts</a> </td><td></td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -851,6 +851,37 @@ Needs updating as mostly obsolete versions.
 |   4 | ```ziptie(small_ziptie, 8)``` |  Ziptie 2.5mm x 100mm min length |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Hygrometer"></a>
+## Hygrometer
+Mini LCD Celsius Digital Thermometer Hygrometer Temperature Humidity Meter Gauge on eBay
+
+
+[vitamins/hygrometer.scad](vitamins/hygrometer.scad) Implementation.
+
+[tests/hygrometer.scad](tests/hygrometer.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```hygrometer_or()``` | The outside radius of a hygrometer |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```hygrometer()``` | Draw a hygrometer |
+| ```hygrometer_hole(h = 0)``` | Drill the hole for a hygrometer |
+
+![hygrometer](tests/png/hygrometer.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```hygrometer()``` |  Mini LCD Digital Thermometer / Hygrometer |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -955,7 +986,7 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 | ```insert(type)``` | Draw specified insert |
 | ```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, side, counter_bore = 0)``` | Make a flying insert lug, see [ssr_shroud](#Ssr_shroud) |
+| ```insert_lug(insert, wall, counter_bore = 0, extension = 0, corner_r = 0, flying = true)``` | Make a flying insert lug, see [ssr_shroud](#Ssr_shroud) |
 
 ![inserts](tests/png/inserts.png)
 
@@ -1678,6 +1709,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```pcb(ArduinoLeonardo)``` |  Arduino Leonardo |
 |   1 | ```pcb(ArduinoUno3)``` |  Arduino Uno R3 |
 |   1 |  |  Cat 5 patch cable 300mm |
 |   1 | ```d_plug(DCONN15, pcb = true)``` |  D-type 15 way PCB mount plug |
@@ -1691,7 +1723,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```molex_254(2)``` |  Molex KK header 2 way |
 |   1 | ```molex_254(3)``` |  Molex KK header 3 way |
 |  16 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
-|  16 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
+|  20 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
 |  12 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |  12 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
 |   1 | ```pcb(PI_IO)``` |  PI_IO V2 |
@@ -1703,19 +1735,19 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```pcb(PERF80x20)``` |  Perfboard 80 x 20mm |
 |   1 | ```pin_socket(2p54header, 13, 2, right_angle = true)``` |  Pin socket 13 x 2 right_angle |
 |   1 | ```pcb(RPI3)``` |  Raspberry Pi 3 |
-|  12 | ```screw(M2_cap_screw, 20)``` |  Screw M2 cap x 20mm |
-|   4 | ```screw(M2_cap_screw, 25)``` |  Screw M2 cap x 25mm |
+|   8 | ```screw(M2_cap_screw, 20)``` |  Screw M2 cap x 20mm |
+|   8 | ```screw(M2_cap_screw, 25)``` |  Screw M2 cap x 25mm |
 |   4 | ```screw(M2p5_cap_screw, 16)``` |  Screw M2.5 cap x 16mm |
-|   8 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
+|  12 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
 |   4 | ```screw(M2p5_pan_screw, 30)``` |  Screw M2.5 pan x 30mm |
-|   8 | ```screw(M3_cap_screw, 25)``` |  Screw M3 cap x 25mm |
-|   4 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
+|   4 | ```screw(M3_cap_screw, 25)``` |  Screw M3 cap x 25mm |
+|   8 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
 |  12 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
 |   3 | ```terminal_35(2)``` |  Terminal block 2 way 3.5mm |
 |   2 | ```green_terminal(gt_2p54, 4)``` |  Terminal block 4 way 0.1" |
 |   1 |  |  USB A to Mini B lead |
 |  16 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
-|  16 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
+|  20 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
 |  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |  12 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | ```pcb(ZC_A0591)``` |  ZC-A0591 ULN2003 driver PCB |
@@ -1723,20 +1755,21 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
-|   4 | pcb_spacer20100.stl |
 |   4 | pcb_spacer20110.stl |
 |   4 | pcb_spacer20120.stl |
 |   4 | pcb_spacer20130.stl |
-|   4 | pcb_spacer25200.stl |
+|   4 | pcb_spacer20140.stl |
+|   4 | pcb_spacer25100_2.stl |
+|   4 | pcb_spacer25210.stl |
 |   4 | pcb_spacer2570.stl |
 |   4 | pcb_spacer2580_2.stl |
 |   4 | pcb_spacer2590_2.stl |
-|   4 | pcb_spacer30140.stl |
 |   4 | pcb_spacer30150.stl |
-|   4 | pcb_spacer30190.stl |
-|   4 | pcb_spacer40160.stl |
+|   4 | pcb_spacer30160.stl |
+|   4 | pcb_spacer30200.stl |
 |   4 | pcb_spacer40170.stl |
 |   4 | pcb_spacer40180.stl |
+|   4 | pcb_spacer40190.stl |
 
 
 <a href="#top">Top</a>

scripts/tests.py

@@ -138,7 +138,7 @@ def tests(tests):
                 print("Can't find implementation!")
                 continue
 
-            vsplit = "N"
+            vsplit = "M"
             vtype = locations[0][1]
             types = [vtype + ' A-' + vsplit[0], vtype + ' ' + chr(ord(vsplit) + 1) + '-Z'] + [loc[1] for loc in locations[1 :]]
             if type == vtype:

tests/inserts.scad

@@ -21,10 +21,20 @@ use <../utils/layout.scad>
 
 include <../vitamins/inserts.scad>
 
-module inserts()
+module inserts() {
+
     for(i = [0: len(inserts) -1])
         translate([10 * i, 0])
             insert(inserts[i]);
 
+    color(pp1_colour)
+        translate([len(inserts) * 10, 0]) {
+            insert_lug(inserts[0], 2, 1);
+
+            translate([10, 0])
+                insert_boss(inserts[0], z = 10, wall = 2);
+        }
+}
+
 if($preview)
     inserts();

tests/pcbs.scad

@@ -23,7 +23,7 @@ include <../vitamins/d_connectors.scad>
 include <../vitamins/pcbs.scad>
 
 module pcbs()
-    layout([for(p = pcbs) pcb_width(p)], 15)
+    layout([for(p = pcbs) pcb_width(p)], 10)
         translate([0, pcb_length(pcbs[$i]) / 2])
             rotate(90)
                 pcb_assembly(pcbs[$i], 5 + $i, 3);

vitamins/insert.scad

@@ -21,6 +21,7 @@
 //! Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering iron with a conical bit set to 200°C.
 //
 include <../core.scad>
+use <../utils/quadrant.scad>
 
 function insert_length(type)         = type[1]; //! Length
 function insert_outer_d(type)        = type[2]; //! Outer diameter at the top
@@ -96,31 +97,52 @@ module insert_hole(type, counterbore = 0, horizontal = false) { //! Make a hole
 function insert_boss_radius(type, wall) = corrected_radius(insert_hole_radius(type)) + wall; //! Compute the outer radius of an insert boss
 
 module insert_boss(type, z, wall = 2 * extrusion_width) { //! Make a boss to take an insert
-    render(convexity = 3)
-        difference() {
-            ir = insert_hole_radius(type);
-            linear_extrude(height = z)
-                hull()
-                    poly_ring(corrected_radius(ir) + wall, ir);
+    ir = insert_hole_radius(type);
+    or = corrected_radius(ir) + wall;
 
-            translate_z(z)
-                insert_hole(type, max(0, z - insert_hole_length(type) - 2 * layer_height));
+    module shape()
+        hull()
+            poly_ring(or, ir);
+
+    linear_extrude(height = z)
+        poly_ring(or, ir);
+
+    linear_extrude(height = z - insert_hole_length(type))
+        difference() {
+            shape();
+
+            poly_circle(insert_screw_diameter(type) / 2 + 0.1);
         }
+
+    if(z > insert_hole_length(type) + 2 * layer_height)
+        linear_extrude(height = 2 * layer_height)       // cap the end if room
+            shape();
 }
 
-module insert_lug(insert, wall, side, counter_bore = 0) { //! Make a flying insert lug, see [ssr_shroud](#Ssr_shroud)
+module insert_lug(insert, wall, counter_bore = 0, extension = 0, corner_r = 0, flying = true) { //! Make a flying insert lug, see [ssr_shroud](#Ssr_shroud)
     boss_r = insert_boss_radius(insert, wall);
     boss_h = insert_hole_length(insert);
     boss_h2 = boss_h + counter_bore;
+
+    module shape()
+        intersection() {
+            hull() {
+                circle(boss_r);
+
+                translate([boss_r + extension - eps, 0])
+                    square([eps, 2 * boss_r], center = true);
+            }
+            if(corner_r)
+                translate([boss_r + extension - corner_r, 0])
+                    rotate(-45)
+                        quadrant(w = 100, r = corner_r - eps, center = true);
+        }
+
     translate_z(-boss_h)
         linear_extrude(height = boss_h)
              difference() {
-                hull() {
-                    circle(boss_r);
+                shape();
 
-                    translate([side * (boss_r - 1), 0])
-                        square([eps, 2 * boss_r], center = true);
-                }
                 poly_circle(insert_hole_radius(insert));
             }
 
@@ -128,24 +150,19 @@ module insert_lug(insert, wall, side, counter_bore = 0) { //! Make a flying inse
     translate_z(-boss_h2) {
         linear_extrude(height = counter_bore + eps)
              difference() {
-                hull() {
-                    circle(boss_r);
+                shape();
 
-                    translate([side * (boss_r - 1), 0])
-                        square([eps, 2 * boss_r], center = true);
-                }
                 poly_circle(insert_screw_diameter(insert) / 2 + 0.1);
             }
 
-        // support cones
-        hull() {
-            cylinder(h = eps, r = boss_r - eps);
+        // support cone
+        if(flying)
+            hull() {
+                linear_extrude(height = eps)
+                    shape();
 
-            translate([side * (boss_r - 1), 0])
-                cube([eps, 2 * boss_r, eps], center = true);
-
-            translate([side * (boss_r - wall + eps), 0, - (2 * boss_r - wall)])
-                cube(eps, center = true);
-        }
+                translate([boss_r + extension - wall - eps, 0, - (2 * boss_r + extension - wall)])
+                    cube(eps, center = true);
+            }
     }
 }

vitamins/pcbs.scad

@@ -237,6 +237,32 @@ ArduinoUno3 = ["ArduinoUno3", "Arduino Uno R3", 68.58, 53.34, 1.6, 0, 3.3, 0, "#
     M2p5_pan_screw
    ];
 
+ArduinoLeonardo = ["ArduinoLeonardo", "Arduino Leonardo", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
+    [[30.226, -2.54, 0, "2p54socket", 10, 1],
+     [54.61,  -2.54, 0, "2p54socket", 8, 1],
+     [36.83,   2.54, 0, "2p54socket", 8, 1],
+     [57.15,   2.54, 0, "2p54socket", 6, 1],
+     [64.91,  27.89, 0, "2p54header", 2, 3],
+     [ 6.5,   -3.5,  0, "button_6mm"],
+     [4.7625,  7.62, 180, "barrel_jack"],
+     [1.5875, 38.1,  180,"usb_uA"],
+    ],
+    [],[],
+    inch([
+     [-1.35, -1.05],
+     [-1.35,  1.05],
+     [ 1.19,  1.05],
+     [ 1.25,  0.99],
+     [ 1.25,  0.54],
+     [ 1.35,  0.44],
+     [ 1.35, -0.85],
+     [ 1.25, -0.95],
+     [ 1.25, -1.05],
+    ]),
+    M2p5_pan_screw
+   ];
+
+
 Keyes5p1 = ["Keyes5p1", "Keyes5.1 Arduino Uno expansion board", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
     [[30.226, -2.54, 0, "-2p54header", 10, 1],
      [54.61,  -2.54, 0, "-2p54header", 8, 1],
@@ -291,6 +317,6 @@ 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]], [], []];
 
-pcbs = [ExtruderPCB, PI_IO, RPI3, ArduinoUno3, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591];
+pcbs = [ExtruderPCB, PI_IO, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591];
 
 use <pcb.scad>