Updated readme and images

Fix for issue #57, now searches multiple directories.

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>
+## EnviroPlus
+Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
+
+![](EnviroPlus.png)
+
+
 <a name="TOP"></a>
 ## FilamentDryBox
 A small fan oven with a spool holder to keep the filament warm and dry.

lib.scad

@@ -32,9 +32,12 @@ include <vitamins/buttons.scad>
 include <vitamins/components.scad>
 include <vitamins/displays.scad>
 include <vitamins/extrusions.scad>
+include <vitamins/extrusion_brackets.scad>
 include <vitamins/geared_steppers.scad>
+include <vitamins/green_terminals.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
+include <vitamins/kp_pillow_blocks.scad>
 include <vitamins/ldrs.scad>
 include <vitamins/leadnuts.scad>
 include <vitamins/leds.scad>
@@ -42,6 +45,7 @@ include <vitamins/light_strips.scad>
 include <vitamins/mains_sockets.scad>
 include <vitamins/modules.scad>
 include <vitamins/pillars.scad>
+include <vitamins/pin_headers.scad>
 include <vitamins/pulleys.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>

readme.md

@@ -676,14 +676,15 @@ Aluminium  extrusion.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```extrusion(E1515, 80)``` |  Extrusion E1515 x 80mm |
 |   1 | ```extrusion(E2020, 80)``` |  Extrusion E2020 x 80mm |
 |   1 | ```extrusion(E2040, 80)``` |  Extrusion E2040 x 80mm |
 |   1 | ```extrusion(E2060, 80)``` |  Extrusion E2060 x 80mm |
 |   1 | ```extrusion(E2080, 80)``` |  Extrusion E2080 x 80mm |
-|   1 | ```extrusion(E3030, 80)``` |  Extrusion E3030 x 80mm |
-|   1 | ```extrusion(E3060, 80)``` |  Extrusion E3060 x 80mm |
-|   1 | ```extrusion(E4040, 80)``` |  Extrusion E4040 x 80mm |
-|   1 | ```extrusion(E4080, 80)``` |  Extrusion E4080 x 80mm |
+|   1 | ```extrusion(E3030, 80, cornerHole = true)``` |  Extrusion E3030 x 80mm |
+|   1 | ```extrusion(E3060, 80, cornerHole = true)``` |  Extrusion E3060 x 80mm |
+|   1 | ```extrusion(E4040, 80, cornerHole = true)``` |  Extrusion E4040 x 80mm |
+|   1 | ```extrusion(E4080, 80, cornerHole = true)``` |  Extrusion E4080 x 80mm |
 
 
 <a href="#top">Top</a>
@@ -876,7 +877,6 @@ Parametric green terminal blocks
 | Module | Description |
 |:--- |:--- |
 | ```green_terminal(type, ways, skip = [], colour = "lime")``` | Draw green terminal blocks, skip can be used to remove pins. |
-| ```terminal_254(ways, skip = [])``` | Draw 0.1" terminal block |
 
 ![green_terminals](tests/png/green_terminals.png)
 
@@ -5055,7 +5055,7 @@ a cylinder. To get around this a colour can be passed to thread that is used to
 
 Making the ends requires a CGAL intersection, which make threads relatively slow. For this reason they are generally disabled when using the GUI but can
 be enabled by setting ```$show_threads``` to ```true```. When the tests are run, by default, threads are enabled only for things that feature them like screws.
-This behaviour can be changed by setting a ```SHOW_THREADS``` environment variable to ```false``` to disable all threads and ```true``` to enable all threads.
+This behaviour can be changed by setting a ```NOPSCADLIB_SHOW_THREADS``` environment variable to ```false``` to disable all threads and ```true``` to enable all threads.
 The same variable also affects the generation of assembly diagrams.
 
 Threads obey the $fn, $fa, $fs variables.

scripts/bom.py

@@ -184,6 +184,9 @@ def parse_bom(file = "openscad.log", name = None):
                     main.add_part(s)
                     if stack:
                         main.assemblies[stack[-1]].add_part(s)
+        else:
+            if 'ERROR:' in line or 'WARNING:' in line:
+                print(line[:-1])
     return main
 
 def boms(target = None, assembly = None):

scripts/exports.py

@@ -83,9 +83,9 @@ def make_parts(target, part_type, parts = None):
     #
     # Find all the scad files
     #
-    lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
+    lib_dirs = [path + '/' + lib + '/printed' for path in os.environ['OPENSCADPATH'].split(os.pathsep) for lib in sorted(os.listdir(path))]
     module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type
-    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+    for dir in [source_dir, source_dir + '/printed'] + lib_dirs:
         if os.path.isdir(dir):
             for filename in os.listdir(dir):
                 if filename[-5:] == ".scad":

scripts/views.py

@@ -124,8 +124,8 @@ def views(target, do_assemblies = None):
     # Find all the scad files
     #
     main_blurb = None
-    lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
-    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+    lib_dirs = [path + '/' + lib + '/printed' for path in os.environ['OPENSCADPATH'].split(os.pathsep) for lib in sorted(os.listdir(path))]
+    for dir in [source_dir, source_dir + '/printed'] + lib_dirs:
         if os.path.isdir(dir):
             for filename in os.listdir(dir):
                 if filename.endswith('.scad'):

tests/extrusions.scad

@@ -23,7 +23,7 @@ include <../vitamins/extrusions.scad>
 
 module extrusions()
     layout([for(e = extrusions) extrusion_width(e)], 10)
-        extrusion(extrusions[$i], 80);
+        extrusion(extrusions[$i], 80, cornerHole = extrusion_width(extrusions[$i]) > 20);
 
 if ($preview)
     extrusions();

vitamins/extrusion.scad

@@ -101,7 +101,8 @@ module extrusion_cross_section(type, cornerHole) {
         translate([0,i*width+(width-height)/2])
             difference() {
                 square([centerSquare,centerSquare],center=true);
-                circle(d=extrusion_center_hole(type));
+                if(extrusion_center_hole(type)>0)
+                    circle(d=extrusion_center_hole(type));
             }
     translate([0,(width-height)/2])
         for(angle=[0,90])

vitamins/extrusions.scad

@@ -20,6 +20,7 @@
 // Extrusion
 //
 //                   W   H    d1   d2   s  cw   cwi    t  st  f
+E1515  = [ "E1515", 15, 15,  2.5,   0,5.7,3.4,  5.7, 1.1,1.1, 0.5 ];
 E2020  = [ "E2020", 20, 20,  4.2,   3,  8,  6, 12.0,   2,  2, 1 ];
 E2040  = [ "E2040", 20, 40,  4.2,   3,  8,  6, 12.0,   2,  2, 1 ];
 E2060  = [ "E2060", 20, 60,  4.2,   3,  8,  6, 12.0,   2,  2, 1 ];
@@ -29,7 +30,7 @@ E3060  = [ "E3060", 30, 60,  6.8, 4.2, 12,  8, 16.5,   2,  2, 1 ];
 E4040  = [ "E4040", 40, 40, 10.5, 6.0, 15, 10, 20.0, 5.5,  3, 1 ];
 E4080  = [ "E4080", 40, 80, 10.5, 6.0, 15, 10, 20.0, 5.5,  3, 1 ];
 
-extrusions = [E2020,E2040,E2060,E2080,E3030,E3060,E4040,E4080];
+extrusions = [E1515,E2020,E2040,E2060,E2080,E3030,E3060,E4040,E4080];
 
 use <extrusion.scad>
 

vitamins/green_terminal.scad

@@ -177,6 +177,3 @@ module green_terminal(type, ways, skip = [], colour = "lime") { //! Draw green t
         translate([0, i * pitch - width / 2 + pitch / 2])
             single(in(skip, i));
 }
-
-module terminal_254(ways, skip = []) //! Draw 0.1" terminal block
-    green_terminal(gt_2p54, ways, skip);

vitamins/pcb.scad

@@ -26,7 +26,7 @@ include <../core.scad>
 include <buttons.scad>
 include <green_terminals.scad>
 include <pin_headers.scad>
-include <microswitches.scad>
+use <microswitch.scad>
 
 use <../utils/rounded_cylinder.scad>
 use <../utils/dogbones.scad>