@jwc/jscad-raspberrypi 3.2.0 → 3.3.0

package/dist/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();
 }
@@ -152,7 +149,7 @@ function initJscadutils(_CSG, options = {}) {
                 return divxyz;
             },
             get div() {
-                return div$1;
+                return div;
             },
             get mulxyz() {
                 return mulxyz;
@@ -284,104 +281,98 @@ function initJscadutils(_CSG, options = {}) {
                 return addConnector;
             }
         });
-        function _typeof(obj) {
-            "@babel/helpers - typeof";
-            if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-                _typeof = function(obj) {
-                    return typeof obj;
-                };
-            } else {
-                _typeof = function(obj) {
-                    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-                };
-            }
-            return _typeof(obj);
-        }
-        function _defineProperty(obj, key, value) {
-            if (key in obj) {
-                Object.defineProperty(obj, key, {
-                    value,
-                    enumerable: true,
-                    configurable: true,
-                    writable: true
-                });
-            } else {
-                obj[key] = value;
-            }
-            return obj;
+        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 ownKeys(object, enumerableOnly) {
-            var keys = Object.keys(object);
-            if (Object.getOwnPropertySymbols) {
-                var symbols = Object.getOwnPropertySymbols(object);
-                if (enumerableOnly) symbols = symbols.filter(function(sym) {
-                    return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-                });
-                keys.push.apply(keys, symbols);
-            }
-            return keys;
-        }
-        function _objectSpread2(target) {
-            for (var i = 1; i < arguments.length; i++) {
-                var source = arguments[i] != null ? arguments[i] : {};
-                if (i % 2) {
-                    ownKeys(Object(source), true).forEach(function(key) {
-                        _defineProperty(target, key, source[key]);
-                    });
-                } else if (Object.getOwnPropertyDescriptors) {
-                    Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-                } else {
-                    ownKeys(Object(source)).forEach(function(key) {
-                        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-                    });
+        function _arrayWithHoles(r) {
+            if (Array.isArray(r)) return r;
+        }
+        function _defineProperty(e, r, t) {
+            return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+                value: t,
+                enumerable: !0,
+                configurable: !0,
+                writable: !0
+            }) : e[r] = t, e;
+        }
+        function _iterableToArrayLimit(r, l) {
+            var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+            if (null != t) {
+                var e, n, i, u, a = [], f = !0, o = !1;
+                try {
+                    if (i = (t = t.call(r)).next, 0 === l) {
+                        if (Object(t) !== t) return;
+                        f = !1;
+                    } else for (;!(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0) ;
+                } catch (r) {
+                    o = !0, n = r;
+                } finally {
+                    try {
+                        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+                    } finally {
+                        if (o) throw n;
+                    }
                 }
+                return a;
             }
-            return target;
         }
-        function _slicedToArray(arr, i) {
-            return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+        function _nonIterableRest() {
+            throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
         }
-        function _arrayWithHoles(arr) {
-            if (Array.isArray(arr)) return arr;
+        function ownKeys(e, r) {
+            var t = Object.keys(e);
+            if (Object.getOwnPropertySymbols) {
+                var o = Object.getOwnPropertySymbols(e);
+                r && (o = o.filter(function(r) {
+                    return Object.getOwnPropertyDescriptor(e, r).enumerable;
+                })), t.push.apply(t, o);
+            }
+            return t;
         }
-        function _iterableToArrayLimit(arr, i) {
-            if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
-            var _arr = [];
-            var _n = true;
-            var _d = false;
-            var _e = undefined;
-            try {
-                for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
-                    _arr.push(_s.value);
-                    if (i && _arr.length === i) break;
-                }
-            } catch (err) {
-                _d = true;
-                _e = err;
-            } finally {
-                try {
-                    if (!_n && _i["return"] != null) _i["return"]();
-                } finally {
-                    if (_d) throw _e;
-                }
+        function _objectSpread2(e) {
+            for (var r = 1; r < arguments.length; r++) {
+                var t = null != arguments[r] ? arguments[r] : {};
+                r % 2 ? ownKeys(Object(t), !0).forEach(function(r) {
+                    _defineProperty(e, r, t[r]);
+                }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function(r) {
+                    Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+                });
             }
-            return _arr;
+            return e;
+        }
+        function _slicedToArray(r, e) {
+            return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+        }
+        function _toPrimitive(t, r) {
+            if ("object" != typeof t || !t) return t;
+            var e = t[Symbol.toPrimitive];
+            if (void 0 !== e) {
+                var i = e.call(t, r || "default");
+                if ("object" != typeof i) return i;
+                throw new TypeError("@@toPrimitive must return a primitive value.");
+            }
+            return ("string" === r ? String : Number)(t);
         }
-        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 _toPropertyKey(t) {
+            var i = _toPrimitive(t, "string");
+            return "symbol" == typeof i ? i : i + "";
         }
-        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 _typeof(o) {
+            "@babel/helpers - typeof";
+            return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
+                return typeof o;
+            } : function(o) {
+                return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+            }, _typeof(o);
         }
-        function _nonIterableRest() {
-            throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+        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;
+            }
         }
         var toRadians = function toRadians(deg) {
             return deg / 180 * Math.PI;
@@ -441,7 +432,7 @@ function initJscadutils(_CSG, options = {}) {
             solve90ac,
             solveab
         });
-        var div = function div(a, f) {
+        var div$1 = function div(a, f) {
             return a.map(function(e) {
                 return e / f;
             });
@@ -496,7 +487,7 @@ function initJscadutils(_CSG, options = {}) {
         };
         var array = Object.freeze({
             __proto__: null,
-            div,
+            div: div$1,
             addValue,
             addArray,
             add,
@@ -846,7 +837,7 @@ function initJscadutils(_CSG, options = {}) {
         var _scadApi$text = scadApi__default["default"].text, vector_text = _scadApi$text.vector_text, vector_char = _scadApi$text.vector_char;
         var union = scadApi__default["default"].booleanOps.union;
         init(CSG);
-        var debug = Debug("jscadUtils:group");
+        var debug$3 = Debug("jscadUtils:group");
         function JsCadUtilsGroup() {
             var names = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
             var parts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -857,7 +848,7 @@ function initJscadutils(_CSG, options = {}) {
             this.holes = holes;
         }
         JsCadUtilsGroup.prototype.add = function(object, name, hidden, subparts, parts) {
-            debug("add", object, name, hidden, subparts, parts);
+            debug$3("add", object, name, hidden, subparts, parts);
             var self = this;
             if (object.parts) {
                 if (name) {
@@ -892,13 +883,14 @@ function initJscadutils(_CSG, options = {}) {
                 if (pieces.length === 0) {
                     throw new Error("no pieces found in ".concat(self.name, " pieces: ").concat(pieces, " parts: ").concat(Object.keys(self.parts), " names: ").concat(self.names));
                 }
-                debug("combine", self.names, self.parts);
+                debug$3("combine", self.names, self.parts);
                 var g = union(mapPick(self.parts, pieces, function(value, key, index, object) {
+                    debug$3("combine mapPick", value, key, object);
                     return map ? map(value, key, index, object) : identity(value);
                 }, self.name));
                 return g.subtractIf(self.holes && Array.isArray(self.holes) ? union(self.holes) : self.holes, self.holes && !options.noholes);
             } catch (err) {
-                debug("combine error", this, pieces, options, err);
+                debug$3("combine error", this, pieces, options, err);
                 throw error('group::combine error "'.concat(err.message || err.toString(), '"\nthis: ').concat(this, '\npieces: "').concat(pieces, '"\noptions: ').concat(JSON.stringify(options, null, 2), "\nstack: ").concat(err.stack, "\n"), "JSCAD_UTILS_GROUP_ERROR");
             }
         };
@@ -922,7 +914,7 @@ function initJscadutils(_CSG, options = {}) {
             return self;
         };
         JsCadUtilsGroup.prototype.clone = function(name, map) {
-            debug("clone", name, _typeof(name), map);
+            debug$3("clone", name, _typeof(name), map);
             var self = this;
             if (typeof name == "function") {
                 map = name;
@@ -973,7 +965,7 @@ function initJscadutils(_CSG, options = {}) {
                 });
                 return self;
             } catch (err) {
-                debug("snap error", this, part, to, axis, delta, err);
+                debug$3("snap error", this, part, to, axis, delta, err);
                 throw error('group::snap error "'.concat(err.message || err.toString(), '"\nthis: ').concat(this, '\npart: "').concat(part, '"\nto: ').concat(to, '\naxis: "').concat(axis, '"\norientation: "').concat(orientation, '"\ndelta: "').concat(delta, '"\nstack: ').concat(err.stack, "\n"), "JSCAD_UTILS_GROUP_ERROR");
             }
         };
@@ -988,7 +980,7 @@ function initJscadutils(_CSG, options = {}) {
                 });
                 return self;
             } catch (err) {
-                debug("align error", this, part, to, axis, delta, err);
+                debug$3("align error", this, part, to, axis, delta, err);
                 throw error('group::align error "'.concat(err.message || err.toString(), '"\nthis: ').concat(this, '\npart: "').concat(part, '"\nto: ').concat(to, '\naxis: "').concat(axis, '"\ndelta: "').concat(delta, '"\nstack: ').concat(err.stack, "\n"), "JSCAD_UTILS_GROUP_ERROR");
             }
         };
@@ -1004,7 +996,7 @@ function initJscadutils(_CSG, options = {}) {
         JsCadUtilsGroup.prototype.connectTo = function connectTo(partName, connectorName, to, toConnectorName) {
             var mirror = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
             var normalrotation = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
-            debug("connectTo", {
+            debug$3("connectTo", {
                 partName,
                 connectorName,
                 to,
@@ -1016,12 +1008,12 @@ function initJscadutils(_CSG, options = {}) {
             var myConnector = connectorName.split(".").reduce(function(a, v) {
                 return a[v];
             }, self.parts[partName].properties);
-            debug("toConnector", to instanceof CSG.Connector);
+            debug$3("toConnector", to instanceof CSG.Connector);
             var toConnector = toConnectorName.split(".").reduce(function(a, v) {
                 return a[v];
             }, to.properties);
             var matrix = myConnector.getTransformationTo(toConnector, mirror, normalrotation);
-            debug("connectTo", matrix);
+            debug$3("connectTo", matrix);
             self.map(function(part) {
                 return part.transform(matrix);
             });
@@ -1041,7 +1033,7 @@ function initJscadutils(_CSG, options = {}) {
         JsCadUtilsGroup.prototype.translate = function translate(x, y, z) {
             var self = this;
             var t = Array.isArray(x) ? x : [ x, y, z ];
-            debug("translate", t);
+            debug$3("translate", t);
             self.map(function(part) {
                 return part.translate(t);
             });
@@ -1065,7 +1057,7 @@ function initJscadutils(_CSG, options = {}) {
             var a = [];
             p.forEach(function(name) {
                 if (!self.parts[name]) {
-                    debug("array error", _this, parts);
+                    debug$3("array error", _this, parts);
                     throw error('group::array error "'.concat(name, '" not found.\nthis: ').concat(_this, '\nparts: "').concat(parts, '"\n'), "JSCAD_UTILS_GROUP_ERROR");
                 }
                 a.push(map(CSG.fromPolygons(self.parts[name].toPolygons()), name));
@@ -1081,14 +1073,14 @@ function initJscadutils(_CSG, options = {}) {
             });
         };
         JsCadUtilsGroup.prototype.toString = function() {
-            return '{\n  name: "'.concat(this.name, '",\n  names: "').concat(this.names.join(","), '", \n  parts: "').concat(Object.keys(this.parts), '",\n  holes: "').concat(this.holes, '"\n}');
+            return '{\n  name: "'.concat(this.name, '",\n  names: "').concat(this.names.join(","), '", \n  parts: "').concat(Object.keys(this.parts), '",\n  holes: ').concat(Array.isArray(this.holes) ? this.holes.length : this.holes ? 1 : 0, "\n}");
         };
         JsCadUtilsGroup.prototype.setName = function(name) {
             this.name = name;
             return this;
         };
         function Group(objectNames, addObjects) {
-            debug("Group", objectNames, addObjects);
+            debug$3("Group", objectNames, addObjects);
             var self = {
                 name: "",
                 names: [],
@@ -1121,7 +1113,7 @@ function initJscadutils(_CSG, options = {}) {
             }
             return new JsCadUtilsGroup(self.names, self.parts, self.holes);
         }
-        var debug$1 = Debug("jscadUtils:util");
+        var debug$2 = Debug("jscadUtils:util");
         var NOZZEL_SIZE = .4;
         var nearest = {
             under: function under(desired) {
@@ -1156,7 +1148,7 @@ function initJscadutils(_CSG, options = {}) {
             return ((n = +n) || 1 / n) < 0;
         }
         function print(msg, o) {
-            debug$1(msg, JSON.stringify(o.getBounds()), JSON.stringify(this.size(o.getBounds())));
+            debug$2(msg, JSON.stringify(o.getBounds()), JSON.stringify(this.size(o.getBounds())));
         }
         function jscadToString(o) {
             if (_typeof(o) == "object") {
@@ -1217,7 +1209,7 @@ function initJscadutils(_CSG, options = {}) {
             });
         }
         function unitAxis(length, radius, centroid) {
-            debug$1("unitAxis", length, radius, centroid);
+            debug$2("unitAxis", length, radius, centroid);
             centroid = centroid || [ 0, 0, 0 ];
             var unitaxis = unitCube(length, radius).setColor(1, 0, 0).union([ unitCube(length, radius).rotateY(90).setColor(0, 1, 0), unitCube(length, radius).rotateX(90).setColor(0, 0, 1) ]);
             unitaxis.properties.origin = new CSG.Connector([ 0, 0, 0 ], [ 1, 0, 0 ], [ 0, 1, 0 ]);
@@ -1270,7 +1262,7 @@ function initJscadutils(_CSG, options = {}) {
             }, []);
         }
         function divA(a, f) {
-            return div(a, f);
+            return div$1(a, f);
         }
         function divxyz(size, x, y, z) {
             return {
@@ -1279,7 +1271,7 @@ function initJscadutils(_CSG, options = {}) {
                 z: size.z / z
             };
         }
-        function div$1(size, d) {
+        function div(size, d) {
             return this.divxyz(size, d, d, d);
         }
         function mulxyz(size, x, y, z) {
@@ -1430,7 +1422,7 @@ function initJscadutils(_CSG, options = {}) {
             }) : t;
         }
         function snap(moveobj, withobj, axis, orientation, delta) {
-            debug$1("snap", moveobj, withobj, axis, orientation, delta);
+            debug$2("snap", moveobj, withobj, axis, orientation, delta);
             var t = calcSnap(moveobj, withobj, axis, orientation, delta);
             return moveobj.translate(t);
         }
@@ -1438,7 +1430,7 @@ function initJscadutils(_CSG, options = {}) {
             return moveobj.translate(calcFlush(moveobj, withobj, axis, mside, wside));
         }
         function axisApply(axes, valfun, a) {
-            debug$1("axisApply", axes, valfun, a);
+            debug$2("axisApply", axes, valfun, a);
             var retval = a || [ 0, 0, 0 ];
             var lookup = {
                 x: 0,
@@ -1582,7 +1574,7 @@ function initJscadutils(_CSG, options = {}) {
             }));
             var theRotationAxis = rotationAxes[rotateaxis];
             var cutplane = CSG.OrthoNormalBasis.GetCartesian(info.orthoNormalCartesian[0], info.orthoNormalCartesian[1]).translate(cutDelta).rotate(rotationCenter, theRotationAxis, angle);
-            debug$1("bisect", debug$1.enabled && {
+            debug$2("bisect", debug$2.enabled && {
                 axis,
                 offset,
                 angle,
@@ -1663,21 +1655,18 @@ function initJscadutils(_CSG, options = {}) {
             return CSG.fromPolygons(polygons);
         }
         function slices2poly(slices, options, axis) {
-            debug$1("slices2poly", slices, options, axis);
+            debug$2("slices2poly", slices, options, axis);
             options = Object.assign({
                 twistangle: 0,
                 twiststeps: 0
             }, options);
             var twistangle = options && parseFloat(options.twistangle) || 0;
-            var twiststeps = options && parseInt(options.twiststeps) || CSG.defaultResolution3D;
-            if (twistangle == 0 || twiststeps < 1) {
-                twiststeps = 1;
-            }
+            options && parseInt(options.twiststeps) || CSG.defaultResolution3D;
             var normalVector = options.si.normalVector;
             var polygons = [];
             var first$1 = first(slices);
             var last$1 = last(slices);
-            debug$1("slices2poly first", first$1, first$1.offset, "last", last$1);
+            debug$2("slices2poly first", first$1, first$1.offset, "last", last$1);
             var up = first$1.offset[axis] > last$1.offset[axis];
             polygons = polygons.concat(first$1.poly._toPlanePolygons({
                 translation: first$1.offset,
@@ -1763,7 +1752,7 @@ function initJscadutils(_CSG, options = {}) {
             var b = object.getBounds();
             var absoluteRadius = Math.abs(radius);
             var si = sliceParams(orientation, radius, b);
-            debug$1("reShape", absoluteRadius, si);
+            debug$2("reShape", absoluteRadius, si);
             if (si.axis !== "z") throw new Error('reShape error: CAG._toPlanePolytons only uses the "z" axis.  You must use the "z" axis for now.');
             var cutplane = CSG.OrthoNormalBasis.GetCartesian(si.orthoNormalCartesian[0], si.orthoNormalCartesian[1]).translate(si.cutDelta);
             var slice = object.sectionCut(cutplane);
@@ -1774,7 +1763,7 @@ function initJscadutils(_CSG, options = {}) {
                 return si.positive ? absoluteRadius : 0;
             });
             var plane = si.positive ? cutplane.plane : cutplane.plane.flipped();
-            debug$1("reShape first/last", first, last);
+            debug$2("reShape first/last", first, last);
             var slices = slicer(first, last, slice, radius);
             var delta = slices2poly(slices, Object.assign(options, {
                 si
@@ -1838,7 +1827,7 @@ function initJscadutils(_CSG, options = {}) {
         function clone(o) {
             var c = CSG.fromPolygons(o.toPolygons());
             cloneProperties(o, c);
-            debug$1("clone", o, c, CSG);
+            debug$2("clone", o, c, CSG);
             return c;
         }
         function addConnector(object, name) {
@@ -1848,15 +1837,15 @@ function initJscadutils(_CSG, options = {}) {
             object.properties[name] = new CSG.Connector(point, axis, normal);
             return object;
         }
-        var debug$2 = Debug("jscadUtils:parts");
+        var debug$1 = Debug("jscadUtils:parts");
         var parts = {
-            BBox,
+            BBox: BBox$1,
             Cube,
             RoundedCube,
             Cylinder,
             Cone
         };
-        function BBox() {
+        function BBox$1() {
             function box(object) {
                 return CSG.cube({
                     center: object.centroid(),
@@ -1872,7 +1861,7 @@ function initJscadutils(_CSG, options = {}) {
             }, undefined);
         }
         function Cube(width) {
-            var r = div(fromxyz(width), 2);
+            var r = div$1(fromxyz(width), 2);
             return CSG.cube({
                 center: r,
                 radius: r
@@ -1887,7 +1876,7 @@ function initJscadutils(_CSG, options = {}) {
             } else {
                 var r = [ x / 2, y / 2 ];
             }
-            debug$2("RoundedCube", size$1, r, thickness, corner_radius);
+            debug$1("RoundedCube", size$1, r, thickness, corner_radius);
             var roundedcube = CAG.roundedRectangle({
                 center: [ r[0], r[1], 0 ],
                 radius: r,
@@ -1900,7 +1889,7 @@ function initJscadutils(_CSG, options = {}) {
         }
         function Cylinder(diameter, height) {
             var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-            debug$2("parts.Cylinder", diameter, height, options);
+            debug$1("parts.Cylinder", diameter, height, options);
             options = Object.assign({
                 start: [ 0, 0, 0 ],
                 end: [ 0, 0, height ],
@@ -1911,7 +1900,7 @@ function initJscadutils(_CSG, options = {}) {
         }
         function Cone(diameter1, diameter2, height) {
             var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-            debug$2("parts.Cone", diameter1, diameter2, height, options);
+            debug$1("parts.Cone", diameter1, diameter2, height, options);
             return CSG.cylinder(Object.assign({
                 start: [ 0, 0, 0 ],
                 end: [ 0, 0, height ],
@@ -1921,7 +1910,7 @@ function initJscadutils(_CSG, options = {}) {
             }, options));
         }
         function Hexagon(diameter, height) {
-            debug$2("hexagon", diameter, height);
+            debug$1("hexagon", diameter, height);
             var radius = diameter / 2;
             var sqrt3 = Math.sqrt(3) / 2;
             var hex = CAG.fromPoints([ [ radius, 0 ], [ radius / 2, radius * sqrt3 ], [ -radius / 2, radius * sqrt3 ], [ -radius, 0 ], [ -radius / 2, -radius * sqrt3 ], [ radius / 2, -radius * sqrt3 ] ]);
@@ -2019,7 +2008,7 @@ function initJscadutils(_CSG, options = {}) {
         var parts$1 = Object.freeze({
             __proto__: null,
             default: parts,
-            BBox,
+            BBox: BBox$1,
             Cube,
             RoundedCube,
             Cylinder,
@@ -2031,13 +2020,13 @@ function initJscadutils(_CSG, options = {}) {
             Board,
             Hardware
         });
-        var debug$3 = Debug("jscadUtils:boxes");
+        var debug = Debug("jscadUtils:boxes");
         function RabbetJoin(box, thickness, cutHeight) {
             depreciated("RabbetJoin", true, "Use 'Rabbet' instead");
             return rabbetJoin(box, thickness, cutHeight);
         }
         function topMiddleBottom(box, thickness) {
-            debug$3("TopMiddleBottom", box, thickness);
+            debug("TopMiddleBottom", box, thickness);
             var bottom = box.bisect("z", thickness, {
                 color: true
             });
@@ -2046,11 +2035,11 @@ function initJscadutils(_CSG, options = {}) {
         }
         function Rabett(box, thickness, gap, height, face) {
             var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
-            debug$3("Rabett", "thickness", thickness, "gap", gap, "height", height, "face", face);
+            debug("Rabett", "thickness", thickness, "gap", gap, "height", height, "face", face);
             gap = gap || .25;
             var inside = thickness - gap;
             var outside = -thickness + gap;
-            debug$3("inside", inside, "outside", outside);
+            debug("inside", inside, "outside", outside);
             var group = Group();
             var _box$bisect$parts = box.bisect("z", height, options).parts, top = _box$bisect$parts.positive, lower2_3rd = _box$bisect$parts.negative;
             var lowerBisectHeight = Math.sign(height) < 0 ? face * Math.sign(height) : height - face;
@@ -2072,7 +2061,7 @@ function initJscadutils(_CSG, options = {}) {
                 topWidth: -thickness,
                 bottomWidth: thickness
             }, options);
-            debug$3("RabettTopBottom", box, thickness, gap, options);
+            debug("RabettTopBottom", box, thickness, gap, options);
             var group = Group("", {
                 box
             });
@@ -2118,7 +2107,7 @@ function initJscadutils(_CSG, options = {}) {
         };
         var Rectangle = function Rectangle(size, thickness, cb) {
             thickness = thickness || 2;
-            var s = div(xyz2array(size), 2);
+            var s = div$1(xyz2array(size), 2);
             var r = add(s, thickness);
             var box = CSG.cube({
                 center: r,
@@ -2138,16 +2127,16 @@ function initJscadutils(_CSG, options = {}) {
             if (exteriorcb) box = exteriorcb(box);
             return box;
         };
-        var BBox$1 = function BBox(o) {
+        var BBox = function BBox(o) {
             depreciated("BBox", true, "Use 'parts.BBox' instead");
-            var s = div(xyz2array(o.size()), 2);
+            var s = div$1(xyz2array(o.size()), 2);
             return CSG.cube({
                 center: s,
                 radius: s
             }).align(o, "xyz");
         };
         function getRadius(o) {
-            return div(xyz2array(o.size()), 2);
+            return div$1(xyz2array(o.size()), 2);
         }
         function rabbetJoin(box, thickness) {
             var gap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : .25;
@@ -2175,7 +2164,7 @@ function initJscadutils(_CSG, options = {}) {
             CutOut,
             Rectangle,
             Hollow,
-            BBox: BBox$1
+            BBox
         });
         var compatV1 = _objectSpread2(_objectSpread2({}, util), {}, {
             group: Group,
@@ -2195,6 +2184,9 @@ function initJscadutils(_CSG, options = {}) {
         exports.parts = parts$1;
         exports.triUtils = triUtils;
         exports.util = util;
+        Object.defineProperty(exports, "__esModule", {
+            value: true
+        });
         return exports;
     }({}, jsCadCSG, scadApi);
     const debug = jscadUtils.Debug("jscadUtils:initJscadutils");
@@ -2269,7 +2261,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));
@@ -2322,9 +2315,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;
@@ -2332,13 +2336,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);
@@ -2357,9 +2361,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");
@@ -2383,30 +2387,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;
@@ -2415,15 +2420,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");
@@ -2451,10 +2456,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;
         }
@@ -2570,8 +2578,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");
@@ -2587,12 +2597,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");
@@ -2618,7 +2653,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() {
@@ -2738,6 +2773,7 @@ function initJscadRPi() {
         exports.HQCameraModule = HQCameraModule;
         exports.Hat = Hat;
         exports.HatStandoff = HatStandoff;
+        exports.HyperPixel4Rectangular = HyperPixel4Rectangular;
         exports.MiniPiTFT = miniPiTFT;
         exports.PiTFT22 = PiTFT22;
         exports.PiTFT24 = PiTFT24;