Merge pull request #60 from nophead/issue_57

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

@@ -876,7 +876,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 +5054,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/options.py

@@ -23,7 +23,7 @@ import json, os, deps
 
 def check_options(dir = '.'):
     global options, options_mtime
-    options = { "show_threads": str(os.getenv("SHOW_THREADS")) }
+    options = { "show_threads": str(os.getenv("NOPSCADLIB_SHOW_THREADS")) }
     options_fname = dir + '/options.json'
     try:
         with open(options_fname) as json_file:

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'):

utils/thread.scad

@@ -31,7 +31,7 @@
 //!
 //! 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.

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>