@jwc/jscad-raspberrypi 3.1.0 → 3.2.1

package/dist/index.js

@@ -1,17 +1,111 @@
 /*
-     * @jwc/jscad-raspberrypi version 3.0.3
+     * @jwc/jscad-raspberrypi version 3.2.0
      * https://johnwebbcole.gitlab.io/jscad-raspberrypi
      */
 var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   'use strict';
 
-  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+  /**
+   * Returns an Adafruit miniPiTFT Hat with buttons.
+   *
+   * Default parts: board,screen,display,button1,button2
+   *
+   * All parts: board,screen,display,display-clearance,button1,button1-base,button1-push,button2,button2-base,button2-push,buttonCap1,buttonCap1-cap,buttonCap1-clearance,buttonCap2,buttonCap2-cap,buttonCap2-clearance,button-connector,button-connector-clearance,standoff
+   *
+   * ![miniPiTFT example](../images/miniPiTFT.png)
+   * @function activeCoolingFan
+   */
+  function activeCoolingFan() {
+    var g = jscadUtils.Group('ActiveCoolingFan');
+    var board = jscadUtils.parts.Cube([64, 42.5, 1]).subtract(jscadUtils.parts.Cube([64 - 58, 31.3, 1]).translate([0, 42.5 - 31.3, 0]).color('orange').union(jscadUtils.parts.Cube([28, 42.5 - 31.3, 1]).translate([64 - 28, 0, 0]).color('blue'))).union(jscadUtils.parts.Cube([19, 40, 9]).translate([64 - 58, 2.5, 0])).color('silver').union(jscadUtils.parts.Cube([30, 30, 9]).translate([64 - 58 + 19, 42.5 - 31.3, 0]).color('black'));
+    g.add(board, 'board');
 
-  var jsCadCSG__default = /*#__PURE__*/_interopDefaultLegacy(jsCadCSG);
-  var scadApi__default = /*#__PURE__*/_interopDefaultLegacy(scadApi);
+    // g.add(
+    //   Parts.Cube([31, 18, 2])
+    //     .color('white')
+    //     .snap(board, 'x', 'inside+')
+    //     .snap(board, 'y', 'inside-')
+    //     .snap(board, 'z', 'outside-'),
+    //   'screen'
+    // );
+
+    // g.add(
+    //   Parts.Cube([util.inch(0.98), util.inch(0.58), 2.01])
+    //     .color('black')
+    //     .snap(board, 'x', 'inside-', util.inch(0.34))
+    //     .snap(board, 'y', 'inside+', -util.inch(0.32))
+    //     .snap(board, 'z', 'outside-'),
+    //   'display'
+    // );
+
+    // g.add(
+    //   g.parts.display
+    //     .stretch('z', 5)
+    //     .chamfer(-5, 'z+')
+    //     .align(g.parts.display, 'xy')
+    //     .color('red'),
+    //   'display-clearance',
+    //   true
+    // );
+
+    // g.add(
+    //   boardButton('button1', board, util.inch(0.53)),
+    //   'button1',
+    //   false,
+    //   'button1-'
+    // );
+
+    // g.add(
+    //   boardButton('button2', board, util.inch(0.18)),
+    //   'button2',
+    //   false,
+    //   'button2-'
+    // );
+
+    // g.add(
+    //   buttonCap('buttonCap1', g.parts.button1),
+    //   'buttonCap1',
+    //   true,
+    //   'buttonCap1-'
+    // );
+    // g.add(
+    //   buttonCap('buttonCap2', g.parts.button2),
+    //   'buttonCap2',
+    //   true,
+    //   'buttonCap2-'
+    // );
+
+    // g.add(
+    //   Parts.Cube([1, 5, 0.5])
+    //     .color('blue')
+    //     .align(g.parts.buttonCap1, 'x')
+    //     .snap(g.parts.buttonCap1, 'y', 'outside+', 1)
+    //     .snap(g.parts.buttonCap1, 'z', 'inside-'),
+    //   'button-connector',
+    //   true
+    // );
+
+    // g.add(
+    //   g.parts['button-connector'].enlarge(0.5, 0.5, 0.5).color('red'),
+    //   'button-connector-clearance',
+    //   true
+    // );
+
+    // g.add(
+    //   Parts.Tube(7, 3, 7.5)
+    //     .snap(board, 'x', 'inside-')
+    //     .snap(board, 'y', 'inside+')
+    //     .snap(board, 'z', 'outside+')
+    //     .color('yellow'),
+    //   'standoff',
+    //   true
+    // );
 
-  var CSG$1 = jsCadCSG__default['default'].CSG;
-  var union = scadApi__default['default'].booleanOps.union;
+    return g;
+  }
+
+  jsCadCSG.CSG;
+  scadApi.booleanOps.union;
   function RightSide(o, mb) {
     return o.translate(jscadUtils.array.add(o.calcSnap(mb, 'z', 'outside-'), o.calcSnap(mb, 'x', 'inside+'), o.calcSnap(mb, 'y', 'inside-'), [2, 0, 0]));
   }
@@ -78,18 +172,20 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     return jscadUtils.parts.Cube([1, 2, 0.7]);
   }
 
-  var debug = jscadUtils.Debug('jscadRPi:BPlusMounting');
+  var debug$2 = jscadUtils.Debug('jscadRPi:BPlusMounting');
   function holes(mb) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     options = Object.assign(options, {
       height: 8
     });
-    debug('holes', mb, options); // var hole = LeftSide(MountingHole(options && options.diameter || undefined, options && options.height || 8), mb);
+    debug$2('holes', mb, options);
 
+    // var hole = LeftSide(MountingHole(options && options.diameter || undefined, options && options.height || 8), mb);
     var hole = MountingHole(options.diameter || 3.25, options.height).snap(mb, 'xy', 'inside-').align(mb, 'z');
     var holes = [hole.midlineTo('x', 3.5).midlineTo('y', 3.5), hole.midlineTo('x', 61.5).midlineTo('y', 3.5), hole.midlineTo('x', 3.5).midlineTo('y', 52.5), hole.midlineTo('x', 61.5).midlineTo('y', 52.5)];
     return jscadUtils.Group('hole1,hole2,hole3,hole4', holes);
   }
+
   /**
    * Create mounting pads for a Raspberry PI model B.
    * @function pads
@@ -99,7 +195,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * @param  {number} [options.height=4] An options object.
    * @return {JsCadUtilsGroup} {description}
    */
-
   function pads(mb) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     options = Object.assign({
@@ -107,9 +202,11 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
       height: 4
     }, options);
     var pad = Mountingpad(undefined, options.height).snap(mb, 'z', options.snap).snap(mb, 'xy', 'inside-');
-    var pads = [pad.midlineTo('x', 3.5).midlineTo('y', 3.5), pad.midlineTo('x', 61.5).midlineTo('y', 3.5), pad.midlineTo('x', 3.5).midlineTo('y', 52.5), pad.midlineTo('x', 61.5).midlineTo('y', 52.5)]; // var b = mb.getBounds();
+    var pads = [pad.midlineTo('x', 3.5).midlineTo('y', 3.5), pad.midlineTo('x', 61.5).midlineTo('y', 3.5), pad.midlineTo('x', 3.5).midlineTo('y', 52.5), pad.midlineTo('x', 61.5).midlineTo('y', 52.5)];
 
-    return jscadUtils.Group('pad1,pad2,pad3,pad4', pads); // });
+    // var b = mb.getBounds();
+    return jscadUtils.Group('pad1,pad2,pad3,pad4', pads);
+    // });
   }
   var BPlusMounting = {
     holes: holes,
@@ -117,7 +214,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   };
 
   var debug$1 = jscadUtils.Debug('jscadRPi:BPlus');
-
   function pi4(group, clearance, mb) {
     /**
        * Model 4
@@ -127,10 +223,12 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     var usb = jscadUtils.Group();
     usb.add(jscadUtils.parts.Cube([17, 13.1, 15]).snap(group.parts.ethernet, 'x', 'inside+', -1).snap(mb, 'z', 'outside-', 1.5).color('lightgray'), 'body');
     usb.add(jscadUtils.parts.Cube([1, 15, 16]).snap(usb.parts.body, 'x', 'outside-').align(usb.parts.body, 'yz').color('lightgray'), 'flange');
-    group.add(usb.clone() // .translate(usbTranslation)
+    group.add(usb.clone()
+    // .translate(usbTranslation)
     .translate(jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 27)), 'usb1', false, 'usb1');
     group.add(jscadUtils.parts.Cube([clearance, 15, 16]).align(group.parts.usb1, 'yz').snap(group.parts.usb1, 'x', 'outside-').color('red'), 'clearance-usb1', true);
-    group.add(usb.clone() // .translate(usbTranslation)
+    group.add(usb.clone()
+    // .translate(usbTranslation)
     .translate(jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 9)), 'usb2', false, 'usb2');
     group.add(jscadUtils.parts.Cube([clearance, 15, 16]).align(group.parts.usb2, 'yz').snap(group.parts.usb2, 'x', 'outside-').color('red'), 'clearance-usb2', true);
     group.add(jscadUtils.parts.Cube([10, 7.5, 3.2]).snap(usb.parts.body, 'y', 'inside-', -1).snap(mb, 'z', 'outside-').midlineTo('x', 3.5 + 7.7).color('lightgray'), 'usbc');
@@ -147,20 +245,24 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     group.add(BoardLed().snap(mb, 'z', 'outside-').midlineTo('x', 1.1).midlineTo('y', 8).color('lightgreen'), 'activityled');
     group.add(BoardLed().snap(mb, 'z', 'outside-').midlineTo('x', 1.1).midlineTo('y', 12).color('red'), 'powerled');
   }
-
   function pi5(group, clearance, mb) {
     /**
-       * Model 5
-       */
+     * Model 5
+     */
+
+    group.add(jscadUtils.parts.Cube([12, 12, 3]).color('lightgray').translate([24, 15, 2]), 'cpu');
+    group.add(jscadUtils.parts.Cube([12, 12, clearance]).color('red').translate([24, 15, 2]), 'clearance-cpu', true, 'clearance');
     group.add(RightSide(jscadUtils.parts.Cube([21.5, 16.5, 13.5]).color('lightgray'), mb).translate([2, 0, 0]).midlineTo('y', 10.2), 'ethernet');
     group.add(jscadUtils.parts.Cube([clearance, 16.5, 13.5]).align(group.parts.ethernet, 'yz').snap(group.parts.ethernet, 'x', 'outside-').color('red'), 'clearance-ethernet', true, 'clearance');
     var usb = jscadUtils.Group();
     usb.add(jscadUtils.parts.Cube([17, 13.1, 15]).snap(group.parts.ethernet, 'x', 'inside+', -1).snap(mb, 'z', 'outside-', 1.5).color('lightgray'), 'body');
     usb.add(jscadUtils.parts.Cube([1, 15, 16]).snap(usb.parts.body, 'x', 'outside-').align(usb.parts.body, 'yz').color('lightgray'), 'flange');
-    group.add(usb.clone() // .translate(usbTranslation)
+    group.add(usb.clone()
+    // .translate(usbTranslation)
     .translate(jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 29.7)), 'usb1', false, 'usb1');
     group.add(jscadUtils.parts.Cube([clearance, 15, 16]).align(group.parts.usb1, 'yz').snap(group.parts.usb1, 'x', 'outside-').color('red'), 'clearance-usb1', true);
-    group.add(usb.clone() // .translate(usbTranslation)
+    group.add(usb.clone()
+    // .translate(usbTranslation)
     .translate(jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 47)), 'usb2', false, 'usb2');
     group.add(jscadUtils.parts.Cube([clearance, 15, 16]).align(group.parts.usb2, 'yz').snap(group.parts.usb2, 'x', 'outside-').color('red'), 'clearance-usb2', true);
     group.add(jscadUtils.parts.Cube([10, 7.5, 3.2]).snap(usb.parts.body, 'y', 'inside-', -1).snap(mb, 'z', 'outside-').midlineTo('x', 3.5 + 7.7).color('lightgray'), 'usbc');
@@ -177,6 +279,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     group.add(BoardLed().snap(mb, 'z', 'outside-').midlineTo('x', 1.1).midlineTo('y', 8).color('lightgreen'), 'activityled');
     group.add(BoardLed().snap(mb, 'z', 'outside-').midlineTo('x', 1.1).midlineTo('y', 12).color('red'), 'powerled');
   }
+
   /**
    * Returns a complete RaspberryPi B Plus model.
    * ![bplus example](../images/bplus.png)
@@ -210,25 +313,21 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   // include:js
   // endinject
    */
-
-
   function BPlus() {
     var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2;
     var options = arguments.length > 1 ? arguments[1] : undefined;
-
     var _Object$assign = Object.assign({
-      clearance: 5
-    }, options),
-        clearance = _Object$assign.clearance;
-
+        clearance: 5
+      }, options),
+      clearance = _Object$assign.clearance;
     model = !model ? 2 : model === true ? 3 : model;
     debug$1('BPlus model:', model);
     var mb = BPlusMotherboard(model == 4 ? 3 : 2);
     var group = jscadUtils.Group('mb', mb);
+
     /**
      * Model 1, 2, 3
      */
-
     if (model < 4) {
       // Right side parts
       group.add(RightSide(EthernetJack(), mb).midlineTo('y', 10.25), 'ethernet');
@@ -244,7 +343,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
       group.add(Ribbon().snap(mb, 'z', 'outside-').midlineTo('x', 45), 'camera');
       group.add(Ribbon().snap(mb, 'z', 'outside-').midlineTo('x', 3.5).midlineTo('y', 28), 'display');
       group.add(Gpio().snap(mb, 'z', 'outside-').midlineTo('x', 32.5).midlineTo('y', 52.5), 'gpio');
-
       if (model == 3) {
         group.add(BoardLed().snap(mb, 'z', 'outside-').midlineTo('x', 1.1).midlineTo('y', 7.9).color('lightgreen'), 'activityled');
         group.add(BoardLed().snap(mb, 'z', 'outside-').midlineTo('x', 1.1).midlineTo('y', 11.5).color('red'), 'powerled');
@@ -257,13 +355,20 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     } else {
       pi5(group, clearance, mb);
     }
-
     group.add(jscadUtils.parts.Cube([15.2, 12, 1.5]).snap(mb, 'z', 'outside+').midlineTo('y', 28).translate([-2.5, 0, 0]).color('silver'), 'microsd');
     group.holes = holes(mb).array();
     group.add(group.holes[0], 'hole1', true);
     group.add(group.holes[1], 'hole2', true);
     group.add(group.holes[2], 'hole3', true);
     group.add(group.holes[3], 'hole4', true);
+
+    /** Add fan mounting holes for PI 5 */
+    if (model >= 5) {
+      group.holes.push(MountingHole(3.25, 8).snap(mb, 'xy', 'inside-').align(mb, 'z').midlineTo('x', 3.5).midlineTo('y', 6 + 3.5));
+      group.add(group.holes[4], 'fan1hole', true);
+      group.holes.push(MountingHole(3.25, 8).snap(mb, 'xy', 'inside-').align(mb, 'z').midlineTo('x', 3.5 + 58).midlineTo('y', 52.5 - 6));
+      group.add(group.holes[5], 'fan2hole', true);
+    }
     return group;
   }
 
@@ -277,8 +382,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * @exports CameraModuleV1
    * @memberof RaspberryPi
    */
-
-  function CameraModuleV1() {
+  function CameraModuleV1$1() {
     var t = 1.1;
     var height = {
       sensor: 5.9 - t,
@@ -286,11 +390,9 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     };
     var g = jscadUtils.Group();
     g.add(jscadUtils.parts.Cube([24, 25, t]).Center().color('green', 0.75), 'board');
-
     function Hole(x, y) {
       return jscadUtils.parts.Cylinder(2.2, t).snap(g.parts.board, 'xy', 'inside-').midlineTo('x', x).midlineTo('y', y);
     }
-
     g.holes = [Hole(2, 2).color('yellow'), Hole(2, 23), Hole(12.5 + 2, 2), Hole(12.5 + 2, 23)];
     g.add(jscadUtils.Group('hole0,hole1,hole2,hole3', g.holes), 'hole', false, 'holes');
     var mounts = g.holes.reduce(function (m, h, i) {
@@ -304,7 +406,9 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     }, {});
     g.add(jscadUtils.Group(pins), 'pins', true, 'pins');
     g.add(jscadUtils.parts.Cube([8.5, 8.5, 2]).snap(g.parts.board, 'xy', 'inside-').snap(g.parts.board, 'z', 'outside-').midlineTo('x', 12.5 + 2).midlineTo('y', 8.5 + 4).color('black'), 'sensor');
-    g.add(jscadUtils.parts.Cube([8.5, 8.5, height.sensor - 2]).align(g.parts.sensor, 'xy').snap(g.parts.sensor, 'z', 'outside-').color('gray'), 'lense'); // var lenseribbon = Parts.Cube([7.56, 10, 2])
+    g.add(jscadUtils.parts.Cube([8.5, 8.5, height.sensor - 2]).align(g.parts.sensor, 'xy').snap(g.parts.sensor, 'z', 'outside-').color('gray'), 'lense');
+
+    // var lenseribbon = Parts.Cube([7.56, 10, 2])
     //   .snap(board, 'z', 'outside-')
     //   .midlineTo('x', 12.5)
     //   .snap(lense, 'y', 'outside-')
@@ -327,8 +431,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * @function CameraModuleV2
    * @return {JsCadUtilsGroup} {description}
    */
-
-  function CameraModuleV1$1() {
+  function CameraModuleV1() {
     var t = 1.1;
     var height = {
       sensor: 4 - t,
@@ -336,11 +439,9 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     };
     var g = jscadUtils.Group();
     g.add(jscadUtils.parts.RoundedCube(23.862, 25, t, 2).Center().color('green', 0.75), 'board');
-
     function Hole(x, y) {
       return jscadUtils.parts.Cylinder(2.2, t).snap(g.parts.board, 'xy', 'inside-').midlineTo('x', x).midlineTo('y', y);
     }
-
     g.holes = [Hole(2, 2).color('yellow'), Hole(2, 23), Hole(14.5, 2), Hole(14.5, 23)];
     g.add(jscadUtils.Group('hole0,hole1,hole2,hole3', g.holes), 'hole', false, 'holes');
     var mounts = g.holes.reduce(function (m, h, i) {
@@ -365,6 +466,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   }
 
   var union$1 = scadApi.booleanOps.union;
+
   /** @typedef {typeof import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
 
   /**
@@ -374,24 +476,24 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * @param  {CSG} [pi] A CSG object, intended to be a RaspberryPi CSG to align the Hat with.
    * @return {JsCadUtilsGroup} A group object with the `mb`, `gpio` and `holes` for a blank RPi hat.
    */
-
   function Hat(pi) {
     var hat = jscadUtils.Group();
-    hat.add(jscadUtils.parts.Board(65.02, 56.39, 3.56, 1.62).color('darkgreen', 0.75), 'mb'); // if (pi) {
+    hat.add(jscadUtils.parts.Board(65.02, 56.39, 3.56, 1.62).color('darkgreen', 0.75), 'mb');
+
+    // if (pi) {
     //   mb = mb.translate(mb.calcSnap(pi, 'xy', 'inside-'));
     // }
 
     var hole = MountingHole().snap(hat.parts.mb, 'xy', 'inside-');
     var holes = union$1(hole.midlineTo('x', 3.56).midlineTo('y', 3.56), hole.midlineTo('x', 61.47).midlineTo('y', 3.56), hole.midlineTo('x', 3.56).midlineTo('y', 52.46), hole.midlineTo('x', 61.47).midlineTo('y', 52.46));
-    hat.add(Gpio(hat.parts.mb).snap(hat.parts.mb, 'z', 'outside+'), 'gpio'); // var gpio = Gpio(mb).snap(mb, 'z', 'outside+');
-    // var hat = Group('mb,gpio', [mb, gpio]);
+    hat.add(Gpio(hat.parts.mb).snap(hat.parts.mb, 'z', 'outside+'), 'gpio');
+    // var gpio = Gpio(mb).snap(mb, 'z', 'outside+');
 
+    // var hat = Group('mb,gpio', [mb, gpio]);
     hat.holes = holes;
-
     if (pi) {
       hat.translate(hat.parts.mb.calcSnap(pi, 'xy', 'inside-')).translate(hat.parts.gpio.calcSnap(pi, 'z', 'outside-'));
     }
-
     return hat;
   }
 
@@ -405,7 +507,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * @param  {number} [options.height] The height of the standoff.
    * @return {JsCadUtilsGroup} A group object with the `mb`, `gpio` and `holes` for a blank RPi hat.
    */
-
   function HatStandoff() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     options = Object.assign({
@@ -416,38 +517,30 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     return standoff.union(peg);
   }
 
-  function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
   }
-
-  function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-  }
-
-  function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
-  }
-
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+  function _arrayWithoutHoles(r) {
+    if (Array.isArray(r)) return _arrayLikeToArray(r);
   }
-
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
+  function _iterableToArray(r) {
+    if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
   }
-
   function _nonIterableSpread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
+  function _toConsumableArray(r) {
+    return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+  }
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+    }
+  }
 
   /** @typedef {typeof import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
 
@@ -485,10 +578,8 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * @function CameraModuleV2
    * @return {JsCadUtilsGroup} {description}
    */
-
   function HQCameraModule() {
     var _camera$holes;
-
     var t = 1.1;
     var camera = jscadUtils.Group();
     camera.add(jscadUtils.parts.RoundedCube(38, 38, t, 1.4).Center().color('green', 0.75), 'board');
@@ -497,9 +588,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     camera.add(hole.rotateZ(90), 'hole2', true);
     camera.add(hole.rotateZ(180), 'hole3', true);
     camera.add(hole.rotateZ(-90), 'hole4', true);
-
     (_camera$holes = camera.holes).push.apply(_camera$holes, _toConsumableArray(camera.array('hole1,hole2,hole3,hole4')));
-
     var sensor = jscadUtils.parts.Cube([8.5, 8.5, 1]).snap(camera.parts.board, 'z', 'outside-').align(camera.parts.board, 'xy').color('white');
     camera.add(sensor, 'sensor');
     var mount = jscadUtils.parts.Cylinder(36, 10.2).snap(camera.parts.board, 'z', 'outside-').align(camera.parts.board, 'xy').color('black');
@@ -519,16 +608,18 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     g.add(jscadUtils.parts.Cylinder(3, 1).color('black').align(g.parts.base, 'xy').snap(g.parts.base, 'z', 'outside-'), 'push');
     return g;
   }
-
   function buttonCap(name, button) {
     var g = jscadUtils.Group(name);
-    g.add(jscadUtils.parts.Cylinder(4, 3).fillet(1, 'z+') // .translate([0, 0, 1])
+    g.add(jscadUtils.parts.Cylinder(4, 3).fillet(1, 'z+')
+    // .translate([0, 0, 1])
     .union(jscadUtils.parts.Cylinder(6, 0.5).bisect('x', -0.5).parts.negative //.translate([0, 0, 1])
     ).color('blue').align(button, 'xy').snap(button, 'z', 'outside-'), 'cap');
-    g.add(jscadUtils.parts.Cylinder(7, 0.75).bisect('x', -0.5).parts.negative.color('green').union(jscadUtils.parts.Cylinder(4.5, 2).color('yellow').translate([0, 0, 0])).align(g.parts.cap, 'xy').snap(g.parts.cap, 'z', 'inside-'), // .color('red'),
+    g.add(jscadUtils.parts.Cylinder(7, 0.75).bisect('x', -0.5).parts.negative.color('green').union(jscadUtils.parts.Cylinder(4.5, 2).color('yellow').translate([0, 0, 0])).align(g.parts.cap, 'xy').snap(g.parts.cap, 'z', 'inside-'),
+    // .color('red'),
     'clearance', true);
     return g;
   }
+
   /**
    * Returns an Adafruit miniPiTFT Hat with buttons.
    *
@@ -539,8 +630,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * ![miniPiTFT example](../images/miniPiTFT.png)
    * @function miniPiTFT
    */
-
-
   function miniPiTFT() {
     var g = jscadUtils.Group('miniPiTFT');
     var board = jscadUtils.parts.RoundedCube(jscadUtils.util.inch(2), jscadUtils.util.inch(1), 2, 2).bisect('x', jscadUtils.util.inch(1.5)).parts.negative.bisect('y', -jscadUtils.util.inch(0.96)).parts.negative.color('darkgreen');
@@ -564,7 +653,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    * @function PiTFT22
    * @return {Group} A group of objects to build a PiTFT22.
    */
-
   function PiTFT22() {
     var hat = Hat();
     var mb = hat.parts.mb;
@@ -585,8 +673,9 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     return group;
   }
 
-  var union$2 = scadApi.booleanOps.union;
-  var debug$2 = jscadUtils.Debug('jscadRPi:PiTFT24');
+  var union = scadApi.booleanOps.union;
+  var debug = jscadUtils.Debug('jscadRPi:PiTFT24');
+
   /** @typedef {typeof import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
 
   /**
@@ -628,7 +717,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   // include:js
   // endinject
    */
-
   function PiTFT24() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var pi = arguments.length > 1 ? arguments[1] : undefined;
@@ -639,23 +727,25 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
       buttonWireYOffset: 5,
       clearance: 0.9
     });
-    debug$2('PiTFT24', options);
+    debug('PiTFT24', options);
     var hat = Hat(pi);
     var mb = hat.parts.mb;
     var group = jscadUtils.Group();
     group.add(hat.parts.mb, 'mb');
     group.add(hat.parts.gpio, 'gpio');
-    group.holes = hat.holes; // var gpio = hat.parts.gpio;
+    group.holes = hat.holes;
 
+    // var gpio = hat.parts.gpio;
     var sink = 0; // lower the lcd bevel above actual position, and raise LCD up so cases will mould around the lcd better
 
     var lcd = jscadUtils.parts.Cube([50, 40, 3.72]).color('black');
-    group.add(lcd.translate(lcd.calcSnap(mb, 'xy', 'inside-')).translate(lcd.calcSnap(mb, 'z', 'outside-')).translate([7, 0, 0]).translate(lcd.calcmidlineTo('y', 28.32)), 'lcd'); // var lcdbevel = LeftSide(Parts.Cube([60, 42, (5.3 - 1.62) - sink]), mb)
+    group.add(lcd.translate(lcd.calcSnap(mb, 'xy', 'inside-')).translate(lcd.calcSnap(mb, 'z', 'outside-')).translate([7, 0, 0]).translate(lcd.calcmidlineTo('y', 28.32)), 'lcd');
+
+    // var lcdbevel = LeftSide(Parts.Cube([60, 42, (5.3 - 1.62) - sink]), mb)
     //     .snap(mb, 'z', 'outside-')
     //     .translate([4.5, 7, 0])
     //     .color('white');
     //
-
     var lcdbevel = jscadUtils.parts.Cube([60, 42, 5.3 - 1.62 - sink]).color('white');
     group.add(lcdbevel.translate(lcdbevel.calcSnap(mb, 'xy', 'inside-')).translate(lcdbevel.calcSnap(mb, 'z', 'outside-')).translate([4.5, 7, 0]), 'lcdbevel');
     var buttonBase = jscadUtils.parts.Cube([6.1, 3.5, 3.55]).color('beige').snap(mb, 'z', 'outside-').snap(mb, 'xy', 'inside-').midlineTo('y', 2.5);
@@ -668,21 +758,21 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     var buttonCapBase = jscadUtils.parts.Cube([6.6, 4, capBaseHeight]).color('blue');
     var buttonCapTop = jscadUtils.parts.Cube([6.1, 3.5, options.buttonCapHeight - capBaseHeight]).snap(buttonCapBase, 'z', 'outside-').align(buttonCapBase, 'xy').fillet(1, 'z+').color('deepskyblue');
     var buttonCaps = buttons.map(function (button) {
-      return union$2([buttonCapBase, buttonCapTop]).snap(button, 'z', 'outside-').align(button, 'xy');
+      return union([buttonCapBase, buttonCapTop]).snap(button, 'z', 'outside-').align(button, 'xy');
     });
-    group.add(union$2(buttonCaps), 'buttonCaps', hiddenPart);
-    group.add(union$2(buttonCaps.map(function (button) {
-      return union$2([buttonCapBase.align(button, 'xy').snap(button, 'z', 'inside-').enlarge([options.clearance, options.clearance, 1]), jscadUtils.parts.Cube([6.1, 3.5, options.buttonCapHeight - capBaseHeight]).align(button, 'xy').snap(button, 'z', 'inside-').enlarge([options.clearance, options.clearance, 1])]);
+    group.add(union(buttonCaps), 'buttonCaps', hiddenPart);
+    group.add(union(buttonCaps.map(function (button) {
+      return union([buttonCapBase.align(button, 'xy').snap(button, 'z', 'inside-').enlarge([options.clearance, options.clearance, 1]), jscadUtils.parts.Cube([6.1, 3.5, options.buttonCapHeight - capBaseHeight]).align(button, 'xy').snap(button, 'z', 'inside-').enlarge([options.clearance, options.clearance, 1])]);
     })), 'buttonCapClearance', hiddenPart);
     var bwthickness = options.capBaseHeight;
     var connector = LeftSide(jscadUtils.parts.Cube([bwthickness, options.buttonWireYOffset, bwthickness]), mb).snap(buttonCaps[0], 'z', 'inside-').snap(buttonCaps[0], 'y', 'outside+').color('blue');
     var buttonWire = jscadUtils.parts.Cube([40, bwthickness, bwthickness]).snap(buttonCaps[0], 'x', 'center-').snap(buttonCaps[0], 'z', 'inside-').snap(connector, 'y', 'inside-').color('blue');
-    group.add(union$2(buttonWire), 'buttonWire', hiddenPart);
+    group.add(union(buttonWire), 'buttonWire', hiddenPart);
     var buttonWireConnector = buttonCaps.map(function (buttonCap) {
       return connector.align(buttonCap, 'x');
     });
-    group.add(union$2(buttonWireConnector), 'buttonWireConnector', hiddenPart);
-    var buttonWireClearance = union$2(buttonWireConnector.map(function (connector) {
+    group.add(union(buttonWireConnector), 'buttonWireConnector', hiddenPart);
+    var buttonWireClearance = union(buttonWireConnector.map(function (connector) {
       return connector.enlarge([options.clearance, options.clearance, options.buttonCapHeight]);
     })).union(buttonWire.enlarge([options.clearance, options.clearance, options.buttonCapHeight])).snap(buttonWire, 'z', 'inside+').color('red');
     group.add(buttonWireClearance, 'buttonWireClearance', hiddenPart);
@@ -690,7 +780,8 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     return group;
   }
 
-  var debug$3 = jscadUtils.Debug('jscadRPi:Spacer');
+  jscadUtils.Debug('jscadRPi:Spacer');
+
   /** @typedef {typeof import("@jwc/jscad-utils/src/triangle")} triangle */
 
   /**
@@ -735,7 +826,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   // include:js
   // endinject
    */
-
   function Spacer() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var mb = arguments.length > 1 ? arguments[1] : undefined;
@@ -756,7 +846,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     });
     var spacers = spacer.combine();
     if (options.postOnly) return spacers.color('yellow');
-
     if (!options.hollow) {
       var p1 = spacer.parts.pad1.centroid();
       var p2 = spacer.parts.pad4.centroid();
@@ -766,7 +855,6 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
       var x = jscadUtils.parts.Board(tri.C + 5.5, 6.2, 3.1, options.thickness).rotateZ(tri.b).translate([dx, dy, 0]).snap(spacer.parts.pad1, 'z', 'inside+');
       var cross = x.union(x.mirroredY().translate([0, 56, 0])).snap(spacer.parts.pad1, 'xy', 'inside-').color('red');
     }
-
     var gussetInterior = jscadUtils.parts.Board(options.gussetInside[0], options.gussetInside[1], 3, options.thickness).align(spacers, 'xy');
     var gusset = jscadUtils.parts.Board(options.gussetOutside[0], options.gussetOutside[1], 3, options.thickness).align(spacers, 'xy').subtract(gussetInterior).snap(spacer.parts.pad1, 'z', 'inside+');
     var gpio = Gpio(mb);
@@ -774,9 +862,10 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     return assembly.color('yellow');
   }
 
+  exports.ActiveCoolingFan = activeCoolingFan;
   exports.BPlus = BPlus;
-  exports.CameraModuleV1 = CameraModuleV1;
-  exports.CameraModuleV2 = CameraModuleV1$1;
+  exports.CameraModuleV1 = CameraModuleV1$1;
+  exports.CameraModuleV2 = CameraModuleV1;
   exports.HQCameraModule = HQCameraModule;
   exports.Hat = Hat;
   exports.HatStandoff = HatStandoff;
@@ -787,5 +876,5 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
 
   return exports;
 
-}({}, jscadUtils, jsCadCSG, scadApi));
+})({}, jscadUtils, jsCadCSG, scadApi);
 /* @jwc/jscad-raspberrypi follow me on Twitter! @johnwebbcole */