Bug fix hygrometer_hole() when h > 0.

readme.md

@@ -1687,6 +1687,13 @@ Cylindrical and ring magnets.
 
 ![magnets](tests/png/magnets.png)
 
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | `magnet(MAG484)` |  Magnet 6.35mm diameter, 6.35mm high, 3.175mm bore |
+|   1 | `magnet(MAG8x4x4p2)` |  Magnet 8mm diameter, 4mm high, 4.2mm bore |
+|   1 | `magnet(MAG5x8)` |  Magnet 8mm diameter, 5mm high |
+
 
 <a href="#top">Top</a>
 
@@ -1771,6 +1778,7 @@ Used for limit switches.
 |:--- |:--- |
 | `microswitch_lower_extent(type)` | How far legs extend downwards |
 | `microswitch_right_extent(type)` | How far legs extend right |
+| `microswitch_size(type)` | Body size |
 
 ### Modules
 | Module | Description |
@@ -2673,7 +2681,7 @@ Linear rails with carriages.
 | `rail(type, length)` | Draw the specified rail |
 | `rail_assembly(type, length, pos, carriage_end_colour = grey(20)` | Rail and carriage assembly |
 | `rail_hole_positions(type, length, first = 0, screws = 100, both_ends = true)` | Position children over screw holes |
-| `rail_screws(type, length, thickness, screws = 100)` | Place screws in the rail |
+| `rail_screws(type, length, thickness, screws = 100, index_screws = undef)` | Place screws in the rail |
 
 ![rails](tests/png/rails.png)
 
@@ -5728,7 +5736,8 @@ Cylinder with a rounded end.
 ---
 <a name="Rounded_polygon"></a>
 ## Rounded_polygon
-Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius. Radius can be negative for a concave corner.
+Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius in clockwise order.
+Radius can be negative for a concave corner.
 
 Because the tangents need to be calculated to find the length these can be calculated separately and re-used when drawing to save calculating them twice.
 
@@ -5739,6 +5748,7 @@ Because the tangents need to be calculated to find the length these can be calcu
 ### Functions
 | Function | Description |
 |:--- |:--- |
+| `circle_tangent(p1, p2)` | Compute the clockwise tangent between two circles represented as [x,y,r] |
 | `rounded_polygon_length(points, tangents)` | Calculate the length given the point list and the list of tangents computed by ` rounded_polygon_tangents` |
 | `rounded_polygon_tangents(points)` | Compute the straight sections needed to draw and to compute the lengths |
 

scripts/openscad.py

@@ -25,7 +25,7 @@ from __future__ import print_function
 import subprocess, sys
 
 def run_list(args, silent = False, verbose = False):
-    cmd = ["openscad.exe"] + args
+    cmd = ["openscad"] + args
     if not silent:
         for arg in cmd:
             print(arg, end=" ")

utils/rounded_polygon.scad

@@ -18,13 +18,14 @@
 //
 
 //
-//! Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius. Radius can be negative for a concave corner.
+//! Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius in clockwise order.
+//! Radius can be negative for a concave corner.
 //!
 //! Because the tangents need to be calculated to find the length these can be calculated separately and re-used when drawing to save calculating them twice.
 //
 include <../utils/core/core.scad>
 
-function circle_tangent(p1, p2) =
+function circle_tangent(p1, p2) = //! Compute the clockwise tangent between two circles represented as [x,y,r]
     let(
         r1 = p1[2],
         r2 = p2[2],
@@ -32,11 +33,8 @@ function circle_tangent(p1, p2) =
         dy = p2.y - p1.y,
         d = sqrt(dx * dx + dy * dy),
         theta = atan2(dy, dx) + acos((r1 - r2) / d),
-        xa = p1.x +(cos(theta) * r1),
-        ya = p1.y +(sin(theta) * r1),
-        xb = p2.x +(cos(theta) * r2),
-        yb = p2.y +(sin(theta) * r2)
-    )[ [xa, ya], [xb, yb] ];
+        v = [cos(theta), sin(theta)]
+    )[ p1 + r1 * v, p2 + r2 * v ];
 
 function rounded_polygon_tangents(points) = //! Compute the straight sections needed to draw and to compute the lengths
     let(len = len(points))

vitamins/hygrometer.scad

@@ -34,15 +34,16 @@ hygrometer_hole_r = 21.3;
 slot_w = 5.5;
 
 module hygrometer_hole(h = 0) { //! Drill the hole for a hygrometer
-    round(cnc_bit_r) {
-        intersection() {
-            drill(hygrometer_hole_r, h);
+    extrude_if(h)
+        round(cnc_bit_r) {
+            intersection() {
+                drill(hygrometer_hole_r, 0);
 
-            rotate(30)
-                square([slot_w + 2 * cnc_bit_r, 100], center = true);
+                rotate(30)
+                    square([slot_w + 2 * cnc_bit_r, 100], center = true);
+            }
+            drill((od + 0.2) / 2, 0);
         }
-        drill((od + 0.2) / 2, h);
-    }
 }
 
 function hygrometer_or() = flange_d / 2; //! The outside radius of a hygrometer
@@ -54,13 +55,13 @@ module hygrometer() { //! Draw a hygrometer
         color(grey(30))
             rotate_extrude()
                 polygon([
-                    [0, 0],
-                    [aperture_d / 2, 0],
-                    [aperture_d / 2, flange_t],
-                    [flange_d2 / 2,   flange_t2],
-                    [flange_d / 2,    flange_t],
-                    [flange_d / 2,    0],
-                    [od / 2,          0],
+                    [0,                0],
+                    [aperture_d / 2,   0],
+                    [aperture_d / 2,   flange_t],
+                    [flange_d2 / 2,    flange_t2],
+                    [flange_d / 2,     flange_t],
+                    [flange_d / 2,     0],
+                    [od / 2,           0],
                     [od / 2,          -h],
                     [0,               -h]
                 ]);

vitamins/magnet.scad

@@ -33,7 +33,7 @@ module magnet(type) { //! Draw specified magnet
     h = magnet_h(type);
     r = magnet_r(type);
 
-    //vitamin(str("magnet(", type[0], "): Magnet ", od, "mm diameter, ", h, "mm high", id ? str(", ", id, "mm bore") : "" ));
+    vitamin(str("magnet(", type[0], "): Magnet ", od, "mm diameter, ", h, "mm high", id ? str(", ", id, "mm bore") : "" ));
 
     or = od / 2;
     ir = id / 2;

vitamins/magnets.scad

@@ -23,7 +23,7 @@
 //                          od,        id,        h,         r
 MAG8x4x4p2 = ["MAG8x4x4p2", 8,         4.2,       4,         0.5];
 MAG484     = ["MAG484",     inch(1/4), inch(1/8), inch(1/4), 0.5];
-MAG5x8     = ["MAG484",     8,         0,         5,         0.5];
+MAG5x8     = ["MAG5x8",     8,         0,         5,         0.5];
 
 magnets = [MAG8x4x4p2, MAG484, MAG5x8];
 

vitamins/microswitch.scad

@@ -41,6 +41,8 @@ function microswitch_button_clr(type)= type[14];    //! Button colour
 function microswitch_lower_extent(type) = let(leg = microswitch_leg(type)) min([for(pos = microswitch_legs(type)) pos.y - leg.y / 2]); //! How far legs extend downwards
 function microswitch_right_extent(type) = let(leg = microswitch_leg(type)) max([microswitch_length(type) / 2, for(pos = microswitch_legs(type)) pos.x + leg.x / 2]); //! How far legs extend right
 
+function microswitch_size(type) = [microswitch_length(type), microswitch_width(type), microswitch_thickness(type)]; //! Body size
+
 module microswitch_hole_positions(type) //! Place children at the hole positions
 {
     for(hole = microswitch_holes(type))

vitamins/rail.scad

@@ -53,7 +53,7 @@ function rail_holes(type, length) = //! Number of holes in a rail given its `len
 module rail_hole_positions(type, length, first = 0, screws = 100, both_ends = true) { //! Position children over screw holes
     pitch = rail_pitch(type);
     holes = rail_holes(type, length);
-    last = first + screws;
+    last = first + min(screws, both_ends ? ceil(holes / 2) : holes);
     for(i = [first : holes - 1], j = holes - 1 - i)
         if(i < last || both_ends && (j >= first && j < last))
             translate([i * pitch - length / 2 + (length - (holes - 1) * pitch) / 2, 0])
@@ -181,19 +181,19 @@ module rail_assembly(type, length, pos, carriage_end_colour = grey(20), carriage
         carriage(rail_carriage(type), type,  carriage_end_colour, carriage_wiper_colour);
 }
 
-module rail_screws(type, length, thickness, screws = 100) { //! Place screws in the rail
+module rail_screws(type, length, thickness, screws = 100, index_screws = undef) { //! Place screws in the rail
     screw = rail_screw(type);
     end_screw = rail_end_screw(type);
     screw_len = screw_longer_than(rail_screw_height(type, screw) + thickness);
     end_screw_len = screw_longer_than(rail_screw_height(type, end_screw) + thickness);
 
-    index_screws = screws > 2 ? 1 : 2;
+    index_screws = is_undef(index_screws) ? screws > 2 ? 1 : 2 : index_screws;
 
     translate_z(rail_screw_height(type, end_screw))
         rail_hole_positions(type, length, 0, index_screws)
             screw(end_screw, end_screw_len);
 
     translate_z(rail_screw_height(type, screw))
-        rail_hole_positions(type, length, index_screws, min(screws, rail_holes(type, length)) - 2 * index_screws)
+        rail_hole_positions(type, length, index_screws, screws - index_screws)
             screw(screw, screw_len);
 }