@jwc/jscad-raspberrypi 3.2.0 → 3.3.0

package/dist/v1compat.js

@@ -35,115 +35,32 @@ function initJscadRPi() {
   // include:compat
   // ../dist/index.js
 /*
-     * @jwc/jscad-raspberrypi version 3.1.0
+     * @jwc/jscad-raspberrypi version 3.2.1
      * https://johnwebbcole.gitlab.io/jscad-raspberrypi
      */
 var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   'use strict';
 
-  /**
-   * 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');
-
-    // 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
-    // );
-
     return g;
   }
 
   jsCadCSG.CSG;
   scadApi.booleanOps.union;
+
+  /**
+   * @function RightSide
+   * @param  {CSG} o      A csg object to be placed on the right side of the motherboard}
+   * @param  {CSG} mb     A csg motherboard object
+   * @param  {Array<number>} [offset=[2, 0, 0]] An offset to apply after positioning ex. [2,0,0]
+   * @return {CSG} The translated CSG object
+   */
   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]));
+    var offset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [2, 0, 0];
+    return o.translate(jscadUtils.array.add(o.calcSnap(mb, 'z', 'outside-'), o.calcSnap(mb, 'x', 'inside+'), o.calcSnap(mb, 'y', 'inside-'), offset));
   }
   function LeftSide(o, mb) {
     return o.translate(calcLeftSide(o, mb));
@@ -197,9 +114,20 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     var cyl = jscadUtils.parts.Cylinder(6, 2).rotateX(90).align(block, "xz").snap(block, "y", "outside+").color("black");
     return jscadUtils.Group("block,cylinder", [block, cyl]);
   }
+  function PSW() {
+    var block = jscadUtils.parts.Cube([2.8, 4.5, 3.7]).color("gray");
+    var cyl = jscadUtils.parts.Cylinder(2, 1).rotateY(90).align(block, "yz").snap(block, "x", "outside+").color("black");
+    return jscadUtils.Group("block,button", [block, cyl]);
+  }
   function Ribbon() {
     return jscadUtils.parts.Cube([3, 22.4, 5.7]).color("gray");
   }
+  function CamDisplay() {
+    return jscadUtils.parts.Cube([3, 16, 5]).color("gray");
+  }
+  function PCIe() {
+    return jscadUtils.parts.Cube([3, 12, 5]).color("gray");
+  }
   function Gpio(mb) {
     var gpio = jscadUtils.parts.Cube([50.64, 5, 8.72]).color("gray");
     return mb ? gpio.snap(mb, "xy", "inside-").snap(mb, "z", "outside-").midlineTo("x", 32.5).midlineTo("y", 52.5) : gpio;
@@ -208,13 +136,13 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     return jscadUtils.parts.Cube([1, 2, 0.7]);
   }
 
-  var debug$2 = jscadUtils.Debug('jscadRPi:BPlusMounting');
+  var debug$4 = jscadUtils.Debug('jscadRPi:BPlusMounting');
   function holes(mb) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     options = Object.assign(options, {
       height: 8
     });
-    debug$2('holes', mb, options);
+    debug$4('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');
@@ -249,12 +177,12 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     pads: pads
   };
 
-  var debug$1 = jscadUtils.Debug('jscadRPi:BPlus');
+  var debug$3 = jscadUtils.Debug('jscadRPi:BPlus');
   function pi4(group, clearance, mb) {
     /**
-       * Model 4
-       */
-    group.add(RightSide(jscadUtils.parts.Cube([21.5, 16.5, 13.5]).color('lightgray'), mb).translate([2, 0, 0]).midlineTo('y', 45.75), 'ethernet');
+     * Model 4
+     */
+    group.add(RightSide(jscadUtils.parts.Cube([21.5, 16.5, 13.5]).color('lightgray'), mb, [3, 0, 0]).midlineTo('y', 45.75), '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');
@@ -286,34 +214,49 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
      * 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([17, 17, 3]).color('lightgray').translate([0, 15, 0]).midlineTo('x', 29 + 3.5).snap(group.parts.mb, 'z', 'outside-'), 'cpu');
+    group.add(jscadUtils.parts.Cube([17, 17, clearance]).color('red').align(group.parts.cpu, 'xy').snap(group.parts.cpu, 'z', 'outside-'), 'clearance-cpu', true, 'clearance');
+
+    // group.add(Parts.Cube([1, 1, 15.1 - 1.46]).snap(mb, 'x', 'inside+')
+    //   .snap(mb, 'y', 'inside-').snap(mb, 'z', 'outside-'), 'dimcheck1');
+
+    // group.add(Parts.Cube([3.06, 1, 1]).snap(mb, 'x', 'outside-')
+    //   .snap(mb, 'y', 'inside-').align(mb, 'z'), 'dimcheck2');
+
+    group.add(RightSide(jscadUtils.parts.Cube([21.5, 16.5, 13.5]).color('lightgray'), mb, [3, 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');
+
+    // group.add(Parts.Cube([1, 1, 17.5 - 1.46]).snap(mb, 'x', 'inside+')
+    //   .snap(mb, 'y', 'inside+').snap(mb, 'z', 'outside-'), 'dimcheck3');
+
+    // group.add(Parts.Cube([3, 1, 1]).snap(mb, 'x', 'outside-')
+    //   .snap(mb, 'y', 'inside+').align(mb, 'z'), 'dimcheck4');
+
     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');
+    usb.add(jscadUtils.parts.Cube([17, 13.1, 15]).snap(group.parts.ethernet, 'x', 'inside+', -1).snap(mb, 'z', 'outside-', 0.5).color('lightgray'), 'body');
+    usb.add(jscadUtils.parts.Cube([1, 15, 16.5]).snap(usb.parts.body, 'x', 'outside-').align(usb.parts.body, 'yz').color('lightgray'), 'flange');
     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);
+    .translate(jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 29.1)), 'usb1', false, 'usb1');
+    group.add(jscadUtils.parts.Cube([clearance, 15, 16.5]).align(group.parts.usb1, 'yz').snap(group.parts.usb1, 'x', 'outside-').color('red'), 'clearance-usb1', true);
     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');
+    group.add(jscadUtils.parts.Cube([10, 7.5, 3.2]).snap(usb.parts.body, 'y', 'inside-', -1).snap(mb, 'z', 'outside-').midlineTo('x', 11.2).color('lightgray'), 'usbc');
     group.add(jscadUtils.parts.Cube([10, clearance, 3.2]).align(group.parts.usbc, 'xz').snap(group.parts.usbc, 'y', 'outside+').color('red'), 'clearance-usbc', true);
-    group.add(jscadUtils.parts.Cube([7, 7.5, 3]).snap(usb.parts.body, 'y', 'inside-', -1).snap(mb, 'z', 'outside-').midlineTo('x', 3.5 + 7.7 + 14.8).color('lightgray'), 'hdmi1');
+    group.add(jscadUtils.parts.Cube([7, 7.5, 3]).snap(usb.parts.body, 'y', 'inside-', -1).snap(mb, 'z', 'outside-').midlineTo('x', 25.8).color('lightgray'), 'hdmi1');
     group.add(jscadUtils.parts.Cube([7, clearance, 3]).align(group.parts.hdmi1, 'xz').snap(group.parts.hdmi1, 'y', 'outside+').color('red'), 'clearance-hdmi1', true);
-    group.add(jscadUtils.parts.Cube([7, 7.5, 3]).snap(usb.parts.body, 'y', 'inside-', -1).snap(mb, 'z', 'outside-').midlineTo('x', 3.5 + 7.7 + 14.8 + 13.5).color('lightgray'), 'hdmi2');
+    group.add(jscadUtils.parts.Cube([7, 7.5, 3]).snap(usb.parts.body, 'y', 'inside-', -1).snap(mb, 'z', 'outside-').midlineTo('x', 39.2).color('lightgray'), 'hdmi2');
     group.add(jscadUtils.parts.Cube([7, clearance, 3]).align(group.parts.hdmi2, 'xz').snap(group.parts.hdmi2, 'y', 'outside+').color('red'), 'clearance-hdmi2', true);
-    group.add(AvJack().snap('block', mb, 'z', 'outside-').midlineTo('block', 'x', 3.5 + 7.7 + 14.8 + 13.5 + 7 + 7.5), 'avjack', false, 'avjack');
-    group.add(jscadUtils.parts.Cylinder(6, clearance).rotateX(90).align(group.parts.avjack, 'xz').snap(group.parts.avjack, 'y', 'outside+').color('red'), 'clearance-avjack', true);
-    group.add(Ribbon().snap(mb, 'z', 'outside-').midlineTo('x', 3.5 + 7.7 + 14.8 + 13.5 + 7), 'camera');
-    group.add(Ribbon().snap(mb, 'z', 'outside-').midlineTo('x', 4).midlineTo('y', 24.5 + 3.5), 'display');
+    group.add(CamDisplay().snap(mb, 'z', 'outside-').midlineTo('x', 55), 'camera0');
+    group.add(CamDisplay().snap(mb, 'z', 'outside-').midlineTo('x', 50), 'camera1');
+    group.add(PCIe().snap(mb, 'z', 'outside-').midlineTo('x', 3.5).midlineTo('y', 30), 'display');
     group.add(Gpio().snap(mb, 'z', 'outside-').midlineTo('x', 29 + 3.5).midlineTo('y', 56 - 3.5), 'gpio');
-    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');
+    group.add(BoardLed().snap(mb, 'z', 'outside-').midlineTo('x', 1.1).midlineTo('y', 13.3).color('lightgreen'), 'statusled');
+    group.add(jscadUtils.parts.Cylinder(2, clearance).rotateY(90).align(group.parts.statusled, 'yz').snap(mb, 'x', 'outside+').color('red'), 'clearance-statusled', true);
+    group.add(PSW().snap('block', mb, 'z', 'outside-').snap('block', mb, 'x', 'inside-').midlineTo('block', 'y', 18.4), 'powerswitch');
+    group.add(jscadUtils.parts.Cylinder(3, clearance).rotateY(90).align(group.parts.powerswitch, 'yz').snap(group.parts.powerswitch, 'x', 'outside+').color('red'), 'clearance-powerswitch', true);
   }
 
   /**
@@ -357,7 +300,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
       }, options),
       clearance = _Object$assign.clearance;
     model = !model ? 2 : model === true ? 3 : model;
-    debug$1('BPlus model:', model);
+    debug$3('BPlus model:', model);
     var mb = BPlusMotherboard(model == 4 ? 3 : 2);
     var group = jscadUtils.Group('mb', mb);
 
@@ -367,10 +310,10 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     if (model < 4) {
       // Right side parts
       group.add(RightSide(EthernetJack(), mb).midlineTo('y', 10.25), 'ethernet');
-      debug$1('mb', mb);
+      debug$3('mb', mb);
       var usb = UsbJack();
       var usbTranslation = jscadUtils.array.add(usb.parts.flange.calcSnap(mb, 'x', 'inside+'), [2, 0, 0], usb.parts.body.calcSnap(mb, 'y', 'inside-'), usb.parts.body.calcSnap(mb, 'z', 'outside-'));
-      debug$1('usbTranslation', usbTranslation, jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 29));
+      debug$3('usbTranslation', usbTranslation, jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 29));
       group.add(usb.clone().translate(usbTranslation).translate(jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 29)), 'usb1', false, 'usb1');
       group.add(usb.clone().translate(usbTranslation).translate(jscadUtils.util.calcmidlineTo(usb.parts.body, 'y', 47)), 'usb2', false, 'usb2');
       group.add(MicroUsb().snap(mb, 'z', 'outside-').midlineTo('x', 10.6).translate([0, -2, 0]), 'microusb');
@@ -400,10 +343,13 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
 
     /** 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.holes.push(MountingHole(3.25, 1.32).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.holes.push(MountingHole(3.25, 1.32).snap(mb, 'xy', 'inside-').align(mb, 'z').midlineTo('x', 3.5 + 58).midlineTo('y', 52.5 - 6));
       group.add(group.holes[5], 'fan2hole', true);
+      var fanClearance = jscadUtils.parts.Cylinder(4.5, 4).color('red').align(group.parts.fan1hole, 'xy').snap(group.parts.mb, 'z', 'outside+');
+      group.add(fanClearance, 'clearance-fan1', true, 'clearance');
+      group.add(fanClearance.align(group.parts.fan2hole, 'xy').snap(group.parts.mb, 'z', 'outside+'), 'clearance-fan2', true, 'clearance');
     }
     return group;
   }
@@ -578,7 +524,9 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     }
   }
 
-  /** @typedef {typeof import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
+  var debug$2 = jscadUtils.Debug('jscadRPi:HQCameraModule');
+
+  /** @typedef {import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
 
   /**
    * Returns a Raspberry Pi HQ camera JsCadUtilsGroup object.
@@ -612,10 +560,12 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
    *    ]
    *
    * @function CameraModuleV2
+   * @param {boolean} [flipTripodMount=false] - Flip the tripod mount to the other side of the board.
    * @return {JsCadUtilsGroup} {description}
    */
   function HQCameraModule() {
     var _camera$holes;
+    var flipTripodMount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     var t = 1.1;
     var camera = jscadUtils.Group();
     camera.add(jscadUtils.parts.RoundedCube(38, 38, t, 1.4).Center().color('green', 0.75), 'board');
@@ -631,13 +581,49 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     var mountInside = jscadUtils.parts.Cylinder(30.75, 10.2).snap(camera.parts.board, 'z', 'outside-').align(camera.parts.board, 'xy').color('black');
     camera.add(mount.subtract(mountInside), 'mount');
     camera.add(mount, 'mount-clearance', true);
-    var tripodMount = jscadUtils.parts.Cube([13.97, 12, 11]).snap(mount, 'z', 'inside+').snap(camera.parts.board, 'y', 'outside+').align(mount, 'x').color('gray');
-    camera.add(tripodMount.union(jscadUtils.parts.Cube([24.5, 10, 7.62]).snap(mount, 'z', 'inside+').snap(tripodMount, 'y', 'outside-').align(mount, 'x').color('darkgray').subtract(mountInside)), 'tripodMount');
+    var tripodMountBase = jscadUtils.parts.Cube([24.5, 10, 7.62]).snap(mount, 'z', 'inside+').snap(camera.parts.board, 'y', 'inside-', -1).align(mount, 'x').color('darkgray').subtract(mountInside);
+    var tripodMount = jscadUtils.parts.Cube([14, 11.5, 11.5]).snap(tripodMountBase, 'z', flipTripodMount ? 'inside-' : 'inside+').snap(tripodMountBase, 'y', 'outside+').align(mount, 'x').color('gray');
+    camera.add(tripodMountBase.union(tripodMount), 'tripodMount');
     camera.add(jscadUtils.parts.Cube([20.8, 5.5, 3.55 - t]).snap(camera.parts.board, 'y', 'inside-').snap(camera.parts.board, 'z', 'outside+').align(camera.parts.board, 'x'), 'ribbon');
     camera.add(camera.parts.ribbon.enlarge(2, 4, -1).snap(camera.parts.ribbon, 'y', 'outside+').color('red'), 'ribbon-nogo');
+    debug$2("camera parts", camera.parts);
     return camera;
   }
 
+  scadApi.booleanOps.union;
+  var debug$1 = jscadUtils.Debug('jscadRPi:HyperPixel4Rectangular');
+
+  /** @typedef {typeof import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
+
+  function HyperPixel4Rectangular(pi) {
+    var group = jscadUtils.Group();
+    var board = jscadUtils.parts.Cube([97.85, 58.14, 1.65]).Center();
+    var notch = jscadUtils.parts.RoundedCube(10.1, 58.14 - 4.57 * 2, 1.65, 1.5).align(board, 'y').snap(board, 'x', 'inside-').snap(board, 'x', 'inside+').translate([2, 0, 0]);
+    group.add(board.subtract(notch).color('green', 0.75), 'mb');
+    var lcd = jscadUtils.parts.Cube([97.1, 58.44, 6.84 - 1.65]).color('black');
+    group.add(lcd.align(board, 'xy').translate(lcd.calcSnap(board, 'z', 'outside-')).translate([0, 0, 0.5]), 'lcd');
+
+    // group.add(Parts.Cube([15.35, 1, 10]).snap(board, 'x', 'inside+').snap(board, 'y', 'outside+').snap(board, 'z', 'outside+'), 'connector1');
+
+    // group.add(Parts.Cube([1, 1, 1.36]).snap(board, 'x', 'inside-').snap(board, 'y', 'inside-').snap(board, 'z', 'outside+'), 'dimcheck2');
+
+    // group.add(Parts.Cube([1, 1, 17.04]).snap(board, 'x', 'inside-').snap(board, 'y', 'inside+').snap(board, 'z', 'outside+'), 'dimcheck3');
+
+    var pad = Mountingpad(5.5, 22.78 - 5.8).snap(board, 'z', 'outside+').snap(board, 'xy', 'inside+').translate([-15.35 + (5.5 - 2), -4.57 + (5.5 - 2), 0]);
+    var pads = [pad, pad.translate([-58, 0, 0]), pad.translate([0, -49, 0]), pad.translate([-58, -49, 0])];
+    group.add(pads[0], 'pad1');
+    group.add(pads[1], 'pad2');
+    group.add(pads[2], 'pad3');
+    group.add(pads[3], 'pad4');
+    group.rotate('mb', 'z', 180);
+    debug$1('pi.parts', pi ? pi.parts : null);
+    debug$1('group.parts', group.parts);
+    if (pi) {
+      group.align('pad1', pi.parts.hole1, 'xy').snap('pad1', pi.parts.mb, 'z', 'outside-');
+    }
+    return group;
+  }
+
   function boardButton(name, board, midline) {
     var g = jscadUtils.Group(name);
     g.add(jscadUtils.parts.Cube([6.5, 6.5, 2]).color('silver').snap(board, 'xy', 'inside-').snap(board, 'z', 'outside-').midlineTo('y', midline), 'base');
@@ -679,7 +665,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
     g.add(buttonCap('buttonCap2', g.parts.button2), 'buttonCap2', true, 'buttonCap2-');
     g.add(jscadUtils.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(jscadUtils.parts.Tube(7, 3, 7.5).snap(board, 'x', 'inside-').snap(board, 'y', 'inside+').snap(board, 'z', 'outside+').color('yellow'), 'standoff', true);
+    g.add(jscadUtils.parts.Tube(7, 3, 8.5).snap(board, 'x', 'inside-').snap(board, 'y', 'inside+').snap(board, 'z', 'outside+').color('yellow'), 'standoff', true);
     return g;
   }
 
@@ -905,6 +891,7 @@ var jscadRPi = (function (exports, jscadUtils, jsCadCSG, scadApi) {
   exports.HQCameraModule = HQCameraModule;
   exports.Hat = Hat;
   exports.HatStandoff = HatStandoff;
+  exports.HyperPixel4Rectangular = HyperPixel4Rectangular;
   exports.MiniPiTFT = miniPiTFT;
   exports.PiTFT22 = PiTFT22;
   exports.PiTFT24 = PiTFT24;

package/examples/active-cooling-fan.jscad

@@ -3,7 +3,7 @@ function main() {
 
   var camera = RaspberryPi.ActiveCoolingFan();
 
-  return camera.combine().Center();
+  return camera.combineAll().Center();
 }
 
 // include:js

package/examples/example.jscad

@@ -15,17 +15,17 @@ function main() {
     RaspberryPi.MiniPiTFT()
       .snap('board', pi.parts.mb, 'x', 'inside-')
       .snap('board', pi.parts.mb, 'y', 'inside+')
-      .snap('board', pi.parts.mb, 'z', 'outside-', 15),
+      .snap('board', pi.parts.mb, 'z', 'outside-', 9),
     'miniPiTFT',
     true,
     'miniPiTFT'
   );
 
-  pi.add(RaspberryPi.ActiveCoolingFan()
-    .snap('board', pi.parts.mb, 'x', 'inside-')
-    .snap('board', pi.parts.mb, 'y', 'inside+')
-    .snap('board', pi.parts.cpu, 'z', 'outside-', 1)
-    .translate([0, -6, 0]), "activeCoolingFan", true, 'activeCoolingFan');
+  // pi.add(RaspberryPi.ActiveCoolingFan()
+  //   .snap('board', pi.parts.mb, 'x', 'inside-')
+  //   .snap('board', pi.parts.mb, 'y', 'inside+')
+  //   .snap('board', pi.parts.cpu, 'z', 'outside-', 1)
+  //   .translate([0, -6, 0]), "activeCoolingFan", true, 'activeCoolingFan');
 
   return pi.combineAll();
 }

package/examples/hq_camera-module.jscad

@@ -1,7 +1,7 @@
 function main() {
-  util.init(CSG);
+  util.init(CSG, { debug: 'jscadRPi:HQCameraModule' });
 
-  var camera = RaspberryPi.HQCameraModule();
+  var camera = RaspberryPi.HQCameraModule(true);
 
   return camera.combine();
 }

package/examples/hyper-pixel-4-rectangular.jscad

@@ -0,0 +1,10 @@
+function main() {
+  util.init(CSG, { debug: 'jscadRPi*,jscadUtils:group' });
+
+  var pi = RaspberryPi.HyperPixel4Rectangular();
+
+  return pi.combine().Center();
+}
+
+// include:js
+// endinject

package/examples/pi4.jscad

@@ -1,7 +1,7 @@
 function main() {
   util.init(CSG, { debug: 'jscadRPi*,jscadUtils:util' });
 
-  var pi = RaspberryPi.BPlus(5);
+  var pi = RaspberryPi.BPlus(4);
 
   return pi.combine().Center();
 }

package/examples/pi5.jscad

@@ -3,15 +3,12 @@ function main() {
 
   var pi = RaspberryPi.BPlus(5, 25);
 
-  pi.add(
-    RaspberryPi.PiTFT24({}, pi.parts.mb).snap(
-      'mb',
-      pi.parts.spacer,
-      'z',
-      'outside-'
-    ),
-    'screen'
-  );
+  // pi.add(
+  //   RaspberryPi.PiTFT24({}, pi.parts.mb),
+  //   'screen',
+  //   true,
+  //   'screen'
+  // );
 
   return pi.combineAll().Center();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwc/jscad-raspberrypi",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "jscad parts library for RaspberryPi",
   "main": "src/index.js",
   "scripts": {
@@ -29,7 +29,7 @@
   "dependencies": {
     "@jscad/csg": "0.7.0",
     "@jscad/scad-api": "0.5.1",
-    "@jwc/jscad-utils": "4.8.4"
+    "@jwc/jscad-utils": "4.9.0"
   },
   "ava": {
     "files": [
@@ -73,7 +73,7 @@
     "gulp-watch": "5.0.1",
     "looks-same": "10.0.1",
     "nyc": "17.1.0",
-    "rollup": "4.52.0",
+    "rollup": "4.52.2",
     "vuepress-jsdoc": "5.0.0"
   }
 }

package/prettier.config.js

@@ -0,0 +1,7 @@
+// prettier.config.js or .prettierrc.js
+module.exports = {
+  trailingComma: 'none',
+  tabWidth: 2,
+  semi: true,
+  singleQuote: true
+};