@jwc/jscad-raspberrypi 3.2.1 → 3.3.0

package/.vscode/settings.json

@@ -18,5 +18,8 @@
     "titleBar.inactiveBackground": "#83256199",
     "titleBar.inactiveForeground": "#e7e7e799"
   },
-  "peacock.color": "#832561"
+  "peacock.color": "#832561",
+  "cSpell.words": [
+    "statusled"
+  ]
 }

package/dist/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
@@ -2254,7 +2254,8 @@ function initJscadRPi() {
         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 ]));
+            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));
@@ -2307,9 +2308,20 @@ function initJscadRPi() {
             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;
@@ -2317,13 +2329,13 @@ function initJscadRPi() {
         function BoardLed() {
             return jscadUtils.parts.Cube([ 1, 2, .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 = 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);
@@ -2342,9 +2354,9 @@ function initJscadRPi() {
             holes,
             pads
         };
-        var debug$1 = jscadUtils.Debug("jscadRPi:BPlus");
+        var debug$3 = jscadUtils.Debug("jscadRPi:BPlus");
         function pi4(group, clearance, mb) {
-            group.add(RightSide(jscadUtils.parts.Cube([ 21.5, 16.5, 13.5 ]).color("lightgray"), mb).translate([ 2, 0, 0 ]).midlineTo("y", 45.75), "ethernet");
+            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");
@@ -2368,30 +2380,31 @@ function initJscadRPi() {
             group.add(BoardLed().snap(mb, "z", "outside-").midlineTo("x", 1.1).midlineTo("y", 12).color("red"), "powerled");
         }
         function pi5(group, clearance, mb) {
-            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(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");
             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(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);
+            usb.add(jscadUtils.parts.Cube([ 17, 13.1, 15 ]).snap(group.parts.ethernet, "x", "inside+", -1).snap(mb, "z", "outside-", .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(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(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);
         }
         function BPlus() {
             var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2;
@@ -2400,15 +2413,15 @@ function initJscadRPi() {
                 clearance: 5
             }, 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);
             if (model < 4) {
                 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");
@@ -2436,10 +2449,13 @@ function initJscadRPi() {
             group.add(group.holes[2], "hole3", true);
             group.add(group.holes[3], "hole4", true);
             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;
         }
@@ -2555,8 +2571,10 @@ function initJscadRPi() {
                 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;
             }
         }
+        var debug$2 = jscadUtils.Debug("jscadRPi:HQCameraModule");
         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", .75), "board");
@@ -2572,12 +2590,37 @@ function initJscadRPi() {
             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");
+        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", .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, .5 ]), "lcd");
+            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");
@@ -2603,7 +2646,7 @@ function initJscadRPi() {
             g.add(buttonCap("buttonCap2", g.parts.button2), "buttonCap2", true, "buttonCap2-");
             g.add(jscadUtils.parts.Cube([ 1, 5, .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(.5, .5, .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;
         }
         function PiTFT22() {
@@ -2723,6 +2766,7 @@ function initJscadRPi() {
         exports.HQCameraModule = HQCameraModule;
         exports.Hat = Hat;
         exports.HatStandoff = HatStandoff;
+        exports.HyperPixel4Rectangular = HyperPixel4Rectangular;
         exports.MiniPiTFT = miniPiTFT;
         exports.PiTFT22 = PiTFT22;
         exports.PiTFT24 = PiTFT24;

package/dist/examples/bplus.jscad

@@ -2254,7 +2254,8 @@ function initJscadRPi() {
         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 ]));
+            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));
@@ -2307,9 +2308,20 @@ function initJscadRPi() {
             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;
@@ -2317,13 +2329,13 @@ function initJscadRPi() {
         function BoardLed() {
             return jscadUtils.parts.Cube([ 1, 2, .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 = 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);
@@ -2342,9 +2354,9 @@ function initJscadRPi() {
             holes,
             pads
         };
-        var debug$1 = jscadUtils.Debug("jscadRPi:BPlus");
+        var debug$3 = jscadUtils.Debug("jscadRPi:BPlus");
         function pi4(group, clearance, mb) {
-            group.add(RightSide(jscadUtils.parts.Cube([ 21.5, 16.5, 13.5 ]).color("lightgray"), mb).translate([ 2, 0, 0 ]).midlineTo("y", 45.75), "ethernet");
+            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");
@@ -2368,30 +2380,31 @@ function initJscadRPi() {
             group.add(BoardLed().snap(mb, "z", "outside-").midlineTo("x", 1.1).midlineTo("y", 12).color("red"), "powerled");
         }
         function pi5(group, clearance, mb) {
-            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(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");
             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(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);
+            usb.add(jscadUtils.parts.Cube([ 17, 13.1, 15 ]).snap(group.parts.ethernet, "x", "inside+", -1).snap(mb, "z", "outside-", .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(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(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);
         }
         function BPlus() {
             var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2;
@@ -2400,15 +2413,15 @@ function initJscadRPi() {
                 clearance: 5
             }, 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);
             if (model < 4) {
                 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");
@@ -2436,10 +2449,13 @@ function initJscadRPi() {
             group.add(group.holes[2], "hole3", true);
             group.add(group.holes[3], "hole4", true);
             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;
         }
@@ -2555,8 +2571,10 @@ function initJscadRPi() {
                 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;
             }
         }
+        var debug$2 = jscadUtils.Debug("jscadRPi:HQCameraModule");
         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", .75), "board");
@@ -2572,12 +2590,37 @@ function initJscadRPi() {
             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");
+        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", .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, .5 ]), "lcd");
+            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");
@@ -2603,7 +2646,7 @@ function initJscadRPi() {
             g.add(buttonCap("buttonCap2", g.parts.button2), "buttonCap2", true, "buttonCap2-");
             g.add(jscadUtils.parts.Cube([ 1, 5, .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(.5, .5, .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;
         }
         function PiTFT22() {
@@ -2723,6 +2766,7 @@ function initJscadRPi() {
         exports.HQCameraModule = HQCameraModule;
         exports.Hat = Hat;
         exports.HatStandoff = HatStandoff;
+        exports.HyperPixel4Rectangular = HyperPixel4Rectangular;
         exports.MiniPiTFT = miniPiTFT;
         exports.PiTFT22 = PiTFT22;
         exports.PiTFT24 = PiTFT24;