Merge branch 'martinbudden-pcb_microswitch2'

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

@@ -2259,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 |
@@ -2267,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)
@@ -2275,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

@@ -27,6 +27,7 @@ include <screws.scad>
 include <buttons.scad>
 include <green_terminals.scad>
 include <pin_headers.scad>
+include <microswitches.scad>
 
 use <../utils/rounded_cylinder.scad>
 use <../utils/dogbones.scad>
@@ -736,6 +737,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             color(comp[7]) if(!cutouts) translate_z(comp[6] / 2) cube([comp[4], comp[5], comp[6]], center = true);
                            else if(comp[8]) translate([-50, 0, comp[6] / 2 - panel_clearance]) cube([100, comp[5] + 2 * panel_clearance, comp[6] + 2 * panel_clearance], center = true);
         if(show(comp, "button_6mm")) square_button(button_6mm);
+        if(show(comp, "microswitch")) translate_z(microswitch_thickness(comp[4])/2) microswitch(comp[4]);
         if(show(comp, "pcb")) if(!cutouts) translate_z(comp[4]) pcb(comp[5]);
         if(show(comp, "standoff")) if(!cutouts) standoff(comp[4], comp[5], comp[6], comp[7]);
         if(show(comp, "uSD")) uSD(comp[4], cutouts);

vitamins/pcbs.scad

@@ -17,6 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <screws.scad>
+include <microswitches.scad>
 //
 //                                   l      w      t    r     h     l  c        b     h
 //                                   e      i      h    a     o     a  o        o     o
@@ -284,7 +285,6 @@ ArduinoLeonardo = ["ArduinoLeonardo", "Arduino Leonardo", 68.58, 53.34, 1.6, 0,
     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],
@@ -339,20 +339,18 @@ 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]], [], []];
 
+include <microswitches.scad>
+
 RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
     40.0, 16.0, 1.6, 0, 2.54, 0, "red",  false,
     [
         [2, 2], [2, 13.5], [17, 13.5], [36, 13.5]
     ],
     [
-        [ 12,    8,   -90, "jst_xh", 3, true, "white", "silver"],
-        [ 26,   13.5,   0, "chip", 12, 4, 5.5],
-        [ 26,   10.5,   0, "chip", 12, 2, 5.5, "white"],
-        [ 27.5, 17,    15, "chip", 15, 0.5, 4.5, "silver"],
+        [ 26.5, 12.75,  0, "microswitch", small_microswitch],
     ],
     []];
 
-
 pcbs = [ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591, RAMPSEndstop];
 
 use <pcb.scad>

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)])