Merge branch 'martinbudden-rocker_color'

docs/usage.md

@@ -26,7 +26,7 @@ OpenSCAD has to be setup to find libraries by setting the ```OPENSCADPATH``` env
 in the directory it points to. This can be done with ```git clone https://github.com/nophead/NopSCADlib.git``` while in that directory or, if you don't want to use GIT,
 by downloading https://github.com/nophead/NopSCADlib/archive/master.zip and unzipping it to a directory called NopSCADlib.
 
-The ```NopSCADlib/scripts``` directory needs to be added to the executable search path.
+The ```NopSCADlib/scripts``` directory needs to be added to the executable search path, ```PATH``` on Windows and ```path``` on Linux and Mac.
 
 The installation can be tested by opening ```NopSCADlib/libtest.scad``` in the OpenSCAD GUI. It should render all the objects in the library in about 1 minute.
 

libtest.scad

@@ -254,7 +254,7 @@ buttons_y = spades_y + 40;
 jacks_y = buttons_y + 40;
 microswitches_y = jacks_y + 40;
 rockers_y = microswitches_y + 40;
-toggles_y = rockers_y + 40;
+toggles_y = rockers_y + 60;
 components_y = toggles_y + 40;
 
 translate([x2, leds_y])

readme.md

@@ -1760,6 +1760,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | Module | Description |
 |:--- |:--- |
 | ```barrel_jack(cutout = false)``` | Draw barrel power jack |
+| ```buzzer(height, diameter, colour)``` | Draw PCB buzzer with specified height, diameter and color |
 | ```chip(length, width, thickness, colour, cutout = false)``` | Draw a coloured cube to represent a chip, or other rectangular component |
 | ```flat_flex(cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
 | ```flex(cutout = false)``` | Draw flexistrip connector |
@@ -2258,7 +2259,7 @@ Rocker switch. Also used for neon indicator in the same form factor.
 | ```rocker_height(type)``` | Body height |
 | ```rocker_part(type)``` | Part description |
 | ```rocker_pivot(type)``` | Pivot distance from the back of the flange |
-| ```rocker_slot_h(type)``` | Panel slow height |
+| ```rocker_slot_h(type)``` | Panel slot height |
 | ```rocker_slot_w(type)``` | Panel slot width |
 | ```rocker_spades(type)``` | Spade types and positions |
 | ```rocker_width(type)``` | Body width |
@@ -2266,7 +2267,7 @@ Rocker switch. Also used for neon indicator in the same form factor.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```rocker(type)``` | Draw the specified rocker switch |
+| ```rocker(type, colour)``` | Draw the specified rocker switch |
 | ```rocker_hole(type, h = 0)``` | Make a hole to accept a rocker switch, by default 2D, set h for 3D |
 
 ![rockers](tests/png/rockers.png)
@@ -2274,8 +2275,8 @@ Rocker switch. Also used for neon indicator in the same form factor.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```rocker(neon_indicator)``` |  Neon Indicator H8630FBNAL |
-|   1 | ```rocker(small_rocker)``` |  Rocker Switch PRASA1-16F-BB0BW |
+|   2 | ```rocker(neon_indicator)``` |  Neon Indicator H8630FBNAL |
+|   2 | ```rocker(small_rocker)``` |  Rocker Switch PRASA1-16F-BB0BW |
 
 
 <a href="#top">Top</a>

tests/rockers.scad

@@ -21,9 +21,13 @@ use <../utils/layout.scad>
 
 include <../vitamins/rockers.scad>
 
-module rockers()
-    layout([for(r = rockers) rocker_flange_w(r)], 5)
+module rockers() {
+    layout([for(r = rockers) rocker_flange_w(r)], 5) {
         rocker(rockers[$i]);
+        translate([0, 25])
+            rocker(rockers[$i], $i==0 ? "red" : "green");
+    }
+}
 
 if($preview)
     rockers();

vitamins/pcb.scad

@@ -200,6 +200,13 @@ module jack(cutout = false) { //! Draw 3.5mm jack
                 }
 }
 
+module buzzer(height, diameter, colour) { //! Draw PCB buzzer with specified height, diameter and color
+    color (colour)
+        tube(or = diameter / 2, ir = height > 5 ? 1 : 0.75, h = height);
+    color("white")
+        cylinder(d = 2, h = max(height - 3 , 0.5));
+}
+
 function hdmi_depth(type)     = type[2]; //! Front to back depth
 function hdmi_width1(type)    = type[3]; //! Inside width at the top
 function hdmi_width2(type)    = type[4]; //! Inside width at the bottom
@@ -710,6 +717,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "usb_Ax2")) usb_Ax2(cutouts);
         if(show(comp, "usb_uA")) usb_uA(cutouts);
         if(show(comp, "usb_B")) usb_B(cutouts);
+        if(show(comp, "buzzer")) buzzer(param(4, 9), param(5, 12), param(6, grey20));
         if(show(comp, "jack")) jack(cutouts);
         if(show(comp, "barrel_jack")) barrel_jack(cutouts);
         if(show(comp, "hdmi")) hdmi(hdmi_full, cutouts);

vitamins/rocker.scad

@@ -25,7 +25,7 @@ use <spade.scad>
 
 function rocker_part(type)     = type[1];   //! Part description
 function rocker_slot_w(type)   = type[2];   //! Panel slot width
-function rocker_slot_h(type)   = type[3];   //! Panel slow height
+function rocker_slot_h(type)   = type[3];   //! Panel slot height
 function rocker_flange_w(type) = type[4];   //! Flange width
 function rocker_flange_h(type) = type[5];   //! Flange height
 function rocker_flange_t(type) = type[6];   //! Flange thickness
@@ -37,7 +37,7 @@ function rocker_pivot(type)    = type[11];  //! Pivot distance from the back of
 function rocker_button(type)   = type[12];  //! How far the button extends from the bezel
 function rocker_spades(type)   = type[13];  //! Spade types and positions
 
-module rocker(type) { //! Draw the specified rocker switch
+module rocker(type, colour) { //! Draw the specified rocker switch
     vitamin(str("rocker(", type[0], "): ", rocker_part(type)));
 
     bezel = rocker_bezel(type);
@@ -65,7 +65,7 @@ module rocker(type) { //! Draw the specified rocker switch
                 rounded_rectangle([rocker_width(type), rocker_height(type), rocker_depth(type) + eps], 0.5, center = false);
         }
         if(rocker_pivot(type))
-            color(grey30)
+            color(colour ? colour : grey30)
                 translate_z(rocker_pivot(type))
                     rotate([90, 0, 90])
                         linear_extrude(height = rocker_w, center = true)
@@ -78,7 +78,7 @@ module rocker(type) { //! Draw the specified rocker switch
                             }
 
         else
-            color("red") cube([rocker_w, rocker_h, 2 * (rocker_flange_t(type) + rocker_button(type))], center = true);
+            color(colour ? colour : "red") cube([rocker_w, rocker_h, 2 * (rocker_flange_t(type) + rocker_button(type))], center = true);
 
         for(spade = rocker_spades(type))
             translate([spade[2], spade[3], -rocker_depth(type)])