@jwc/jscad-raspberrypi 3.2.0 → 3.3.0

package/src/active-cooling-fan.js

@@ -1,66 +1,6 @@
 import { Group, parts as Parts } from '@jwc/jscad-utils';
 
-function boardButton(name, board, midline) {
-  var g = Group(name);
-  g.add(
-    Parts.Cube([6.5, 6.5, 2])
-      .color('silver')
-      .snap(board, 'xy', 'inside-')
-      .snap(board, 'z', 'outside-')
-      .midlineTo('y', midline),
-    'base'
-  );
-  g.add(
-    Parts.Cylinder(3, 1)
-      .color('black')
-      .align(g.parts.base, 'xy')
-      .snap(g.parts.base, 'z', 'outside-'),
-    'push'
-  );
 
-  return g;
-}
-
-function buttonCap(name, button) {
-  var g = Group(name);
-  g.add(
-    Parts.Cylinder(4, 3)
-      .fillet(1, 'z+')
-      // .translate([0, 0, 1])
-      .union(
-        Parts.Cylinder(6, 0.5).bisect('x', -0.5).parts.negative //.translate([0, 0, 1])
-      )
-
-      .color('blue')
-      .align(button, 'xy')
-      .snap(button, 'z', 'outside-'),
-    'cap'
-  );
-
-  g.add(
-    Parts.Cylinder(7, 0.75)
-      .bisect('x', -0.5)
-      .parts.negative.color('green')
-      .union(Parts.Cylinder(4.5, 2).color('yellow').translate([0, 0, 0]))
-      .align(g.parts.cap, 'xy')
-      .snap(g.parts.cap, 'z', 'inside-'),
-    // .color('red'),
-    'clearance',
-    true
-  );
-  return g;
-}
-
-/**
- * Returns an Adafruit miniPiTFT Hat with buttons.
- *
- * 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
- */
 export default function activeCoolingFan() {
   var g = Group('ActiveCoolingFan');
 
@@ -75,86 +15,7 @@ export default function activeCoolingFan() {
 
   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;
 }

package/src/boardutils.js

@@ -1,7 +1,7 @@
-import { util, array } from '@jwc/jscad-utils';
 import jsCadCSG from '@jscad/csg';
-const { CSG } = jsCadCSG;
 import scadApi from '@jscad/scad-api';
+import { array, util } from '@jwc/jscad-utils';
+const { CSG } = jsCadCSG;
 const { union } = scadApi.booleanOps;
 
 export function CornerHole(r, size, center) {
@@ -62,13 +62,20 @@ export function CornerHoles(hole_r, boardinfo) {
   return util.mirrored4(CornerHole(hole_r, boardinfo.size, 3.5));
 }
 
-export function RightSide(o, mb) {
+/**
+ * @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
+ */
+export function RightSide(o, mb, offset = [2, 0, 0]) {
   return o.translate(
     array.add(
       o.calcSnap(mb, 'z', 'outside-'),
       o.calcSnap(mb, 'x', 'inside+'),
       o.calcSnap(mb, 'y', 'inside-'),
-      [2, 0, 0]
+      offset
     )
   );
 }

package/src/bplus.js

@@ -4,15 +4,16 @@ import * as BPlusMounting from './bplus-mounting';
 import * as RPiParts from './rpi-parts';
 const debug = Debug('jscadRPi:BPlus');
 
-
 function pi4(group, clearance, mb) {
   /**
-     * Model 4
-     */
+   * Model 4
+   */
   group.add(
-    RightSide(Parts.Cube([21.5, 16.5, 13.5]).color('lightgray'), mb)
-      .translate([2, 0, 0])
-      .midlineTo('y', 45.75),
+    RightSide(
+      Parts.Cube([21.5, 16.5, 13.5]).color('lightgray'),
+      mb,
+      [3, 0, 0]
+    ).midlineTo('y', 45.75),
     'ethernet'
   );
 
@@ -196,30 +197,42 @@ function pi4(group, clearance, mb) {
   );
 }
 
-
 function pi5(group, clearance, mb) {
   /**
    * Model 5
    */
 
   group.add(
-    Parts.Cube([12, 12, 3]).color('lightgray')
-      .translate([24, 15, 2]),
+    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(
-    Parts.Cube([12, 12, clearance]).color('red')
-      .translate([24, 15, 2]),
+    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(Parts.Cube([21.5, 16.5, 13.5]).color('lightgray'), mb)
-      .translate([2, 0, 0])
-      .midlineTo('y', 10.2),
+    RightSide(
+      Parts.Cube([21.5, 16.5, 13.5]).color('lightgray'),
+      mb,
+      [3, 0, 0]
+    ).midlineTo('y', 10.2),
     'ethernet'
   );
 
@@ -233,17 +246,23 @@ function pi5(group, clearance, mb) {
     '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 = Group();
   usb.add(
     Parts.Cube([17, 13.1, 15])
       .snap(group.parts.ethernet, 'x', 'inside+', -1)
-      .snap(mb, 'z', 'outside-', 1.5)
+      .snap(mb, 'z', 'outside-', 0.5)
       .color('lightgray'),
     'body'
   );
 
   usb.add(
-    Parts.Cube([1, 15, 16])
+    Parts.Cube([1, 15, 16.5])
       .snap(usb.parts.body, 'x', 'outside-')
       .align(usb.parts.body, 'yz')
       .color('lightgray'),
@@ -255,14 +274,14 @@ function pi5(group, clearance, mb) {
       .clone()
       // .translate(usbTranslation)
 
-      .translate(util.calcmidlineTo(usb.parts.body, 'y', 29.7)),
+      .translate(util.calcmidlineTo(usb.parts.body, 'y', 29.1)),
     'usb1',
     false,
     'usb1'
   );
 
   group.add(
-    Parts.Cube([clearance, 15, 16])
+    Parts.Cube([clearance, 15, 16.5])
       .align(group.parts.usb1, 'yz')
       .snap(group.parts.usb1, 'x', 'outside-')
       .color('red'),
@@ -293,7 +312,7 @@ function pi5(group, clearance, mb) {
     Parts.Cube([10, 7.5, 3.2])
       .snap(usb.parts.body, 'y', 'inside-', -1)
       .snap(mb, 'z', 'outside-')
-      .midlineTo('x', 3.5 + 7.7)
+      .midlineTo('x', 11.2)
       .color('lightgray'),
     'usbc'
   );
@@ -311,7 +330,7 @@ function pi5(group, clearance, mb) {
     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)
+      .midlineTo('x', 25.8)
       .color('lightgray'),
     'hdmi1'
   );
@@ -329,7 +348,7 @@ function pi5(group, clearance, mb) {
     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)
+      .midlineTo('x', 39.2)
       .color('lightgray'),
     'hdmi2'
   );
@@ -344,36 +363,20 @@ function pi5(group, clearance, mb) {
   );
 
   group.add(
-    RPiParts.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(
-    Parts.Cylinder(6, clearance)
-      .rotateX(90)
-      .align(group.parts.avjack, 'xz')
-      .snap(group.parts.avjack, 'y', 'outside+')
-      .color('red'),
-    'clearance-avjack',
-    true
+    RPiParts.CamDisplay().snap(mb, 'z', 'outside-').midlineTo('x', 55),
+    'camera0'
   );
 
   group.add(
-    RPiParts.Ribbon()
-      .snap(mb, 'z', 'outside-')
-      .midlineTo('x', 3.5 + 7.7 + 14.8 + 13.5 + 7),
-    'camera'
+    RPiParts.CamDisplay().snap(mb, 'z', 'outside-').midlineTo('x', 50),
+    'camera1'
   );
 
   group.add(
-    RPiParts.Ribbon()
+    RPiParts.PCIe()
       .snap(mb, 'z', 'outside-')
-      .midlineTo('x', 4)
-      .midlineTo('y', 24.5 + 3.5),
+      .midlineTo('x', 3.5)
+      .midlineTo('y', 30),
     'display'
   );
 
@@ -389,20 +392,38 @@ function pi5(group, clearance, mb) {
     RPiParts.BoardLed()
       .snap(mb, 'z', 'outside-')
       .midlineTo('x', 1.1)
-      .midlineTo('y', 8)
+      .midlineTo('y', 13.3)
       .color('lightgreen'),
-    'activityled'
+    'statusled'
   );
+
   group.add(
-    RPiParts.BoardLed()
-      .snap(mb, 'z', 'outside-')
-      .midlineTo('x', 1.1)
-      .midlineTo('y', 12)
+    Parts.Cylinder(2, clearance)
+      .rotateY(90)
+      .align(group.parts.statusled, 'yz')
+      .snap(mb, 'x', 'outside+')
       .color('red'),
-    'powerled'
+    'clearance-statusled',
+    true
   );
 
+  group.add(
+    RPiParts.PSW()
+      .snap('block', mb, 'z', 'outside-')
+      .snap('block', mb, 'x', 'inside-')
+      .midlineTo('block', 'y', 18.4),
+    'powerswitch'
+  );
 
+  group.add(
+    Parts.Cylinder(3, clearance)
+      .rotateY(90)
+      .align(group.parts.powerswitch, 'yz')
+      .snap(group.parts.powerswitch, 'x', 'outside+')
+      .color('red'),
+    'clearance-powerswitch',
+    true
+  );
 }
 
 /**
@@ -570,7 +591,6 @@ export default function BPlus(model = 2, options) {
     }
   } else if (model == 4) {
     pi4(group, clearance, mb);
-
   } else {
     pi5(group, clearance, mb);
   }
@@ -593,21 +613,41 @@ export default function BPlus(model = 2, options) {
 
   /** Add fan mounting holes for PI 5 */
   if (model >= 5) {
-    group.holes.push(RPiParts.MountingHole(3.25, 8)
-      .snap(mb, 'xy', 'inside-')
-      .align(mb, 'z')
-      .midlineTo('x', 3.5)
-      .midlineTo('y', 6 + 3.5));
+    group.holes.push(
+      RPiParts.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(RPiParts.MountingHole(3.25, 8)
-      .snap(mb, 'xy', 'inside-')
-      .align(mb, 'z')
-      .midlineTo('x', 3.5 + 58)
-      .midlineTo('y', 52.5 - 6));
+    group.holes.push(
+      RPiParts.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);
+
+    const fanClearance = 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;

package/src/hq_camera-module.js

@@ -1,6 +1,7 @@
-import { Group, parts as Parts } from '@jwc/jscad-utils';
+import { Debug, Group, parts as Parts } from '@jwc/jscad-utils';
+const debug = Debug('jscadRPi:HQCameraModule');
 
-/** @typedef {typeof import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
+/** @typedef {import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
 
 /**
  * Returns a Raspberry Pi HQ camera JsCadUtilsGroup object.
@@ -34,19 +35,20 @@ import { Group, parts as Parts } from '@jwc/jscad-utils';
  *    ]
  *
  * @function CameraModuleV2
+ * @param {boolean} [flipTripodMount=false] - Flip the tripod mount to the other side of the board.
  * @return {JsCadUtilsGroup} {description}
  */
-export default function HQCameraModule() {
-  var t = 1.1;
-  var height = { sensor: 4 - t, board: t };
-  var camera = Group();
+export default function HQCameraModule(flipTripodMount = false) {
+  const t = 1.1;
+  const height = { sensor: 4 - t, board: t };
+  const camera = Group();
 
   camera.add(
     Parts.RoundedCube(38, 38, t, 1.4).Center().color('green', 0.75),
     'board'
   );
 
-  var hole = Parts.Cylinder(3.25, 10)
+  const hole = Parts.Cylinder(3.25, 10)
     .snap(camera.parts.board, 'xy', 'inside+', 1.25)
     .translate([-4, -4, -5])
 
@@ -57,18 +59,18 @@ export default function HQCameraModule() {
   camera.add(hole.rotateZ(-90), 'hole4', true);
   camera.holes.push(...camera.array('hole1,hole2,hole3,hole4'));
 
-  var sensor = Parts.Cube([8.5, 8.5, 1])
+  const sensor = Parts.Cube([8.5, 8.5, 1])
     .snap(camera.parts.board, 'z', 'outside-')
     .align(camera.parts.board, 'xy')
     .color('white');
   camera.add(sensor, 'sensor');
 
-  var mount = Parts.Cylinder(36, 10.2)
+  const mount = Parts.Cylinder(36, 10.2)
     .snap(camera.parts.board, 'z', 'outside-')
     .align(camera.parts.board, 'xy')
     .color('black');
 
-  var mountInside = Parts.Cylinder(30.75, 10.2)
+  const mountInside = Parts.Cylinder(30.75, 10.2)
     .snap(camera.parts.board, 'z', 'outside-')
     .align(camera.parts.board, 'xy')
     .color('black');
@@ -76,21 +78,21 @@ export default function HQCameraModule() {
 
   camera.add(mount, 'mount-clearance', true);
 
-  var tripodMount = Parts.Cube([13.97, 12, 11])
+  const tripodMountBase = Parts.Cube([24.5, 10, 7.62])
     .snap(mount, 'z', 'inside+')
-    .snap(camera.parts.board, 'y', 'outside+')
+    .snap(camera.parts.board, 'y', 'inside-', -1)
+    .align(mount, 'x')
+    .color('darkgray')
+    .subtract(mountInside)
+
+  const tripodMount = Parts.Cube([14, 11.5, 11.5])
+    .snap(tripodMountBase, 'z', flipTripodMount ? 'inside-' : 'inside+')
+    .snap(tripodMountBase, 'y', 'outside+')
     .align(mount, 'x')
     .color('gray');
 
   camera.add(
-    tripodMount.union(
-      Parts.Cube([24.5, 10, 7.62])
-        .snap(mount, 'z', 'inside+')
-        .snap(tripodMount, 'y', 'outside-')
-        .align(mount, 'x')
-        .color('darkgray')
-        .subtract(mountInside)
-    ),
+    tripodMountBase.union(tripodMount),
     'tripodMount'
   );
 
@@ -110,5 +112,7 @@ export default function HQCameraModule() {
     'ribbon-nogo'
   );
 
+  debug("camera parts", camera.parts);
+
   return camera;
 }

package/src/hyper-pixel-4-rectangular.js

@@ -0,0 +1,58 @@
+import { booleanOps } from '@jscad/scad-api';
+import { Debug, Group, parts as Parts } from '@jwc/jscad-utils';
+import { Mountingpad } from './rpi-parts';
+
+const { union } = booleanOps;
+const debug = Debug('jscadRPi:HyperPixel4Rectangular');
+
+/** @typedef {typeof import("@jwc/jscad-utils/src/group").JsCadUtilsGroup} JsCadUtilsGroup */
+
+
+export default function HyperPixel4Rectangular(pi) {
+  const group = Group();
+
+  const board = Parts.Cube([97.85, 58.14, 1.65]).Center();
+  const notch = 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');
+
+  const lcd = 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');
+
+
+  const 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]);
+
+  const 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('pi.parts', pi ? pi.parts : null);
+  debug('group.parts', group.parts);
+  if (pi) {
+    group.align('pad1', pi.parts.hole1, 'xy').snap('pad1', pi.parts.mb, 'z', 'outside-');
+  }
+  return group;
+}

package/src/index.js

@@ -5,6 +5,7 @@ import CameraModuleV2 from './camera-module-v2';
 import Hat from './hat';
 import HatStandoff from './hat-standoff';
 import HQCameraModule from './hq_camera-module';
+import HyperPixel4Rectangular from './hyper-pixel-4-rectangular';
 import MiniPiTFT from './miniPiTFT';
 import PiTFT22 from './pi-tft22';
 import PiTFT24 from './pi-tft24';
@@ -14,7 +15,7 @@ export {
   ActiveCoolingFan, BPlus,
   CameraModuleV1,
   CameraModuleV2, Hat,
-  HatStandoff, HQCameraModule, MiniPiTFT, PiTFT22,
+  HatStandoff, HQCameraModule, HyperPixel4Rectangular, MiniPiTFT, PiTFT22,
   PiTFT24, Spacer
 };
 

package/src/miniPiTFT.js

@@ -143,7 +143,7 @@ export default function miniPiTFT() {
   );
 
   g.add(
-    Parts.Tube(7, 3, 7.5)
+    Parts.Tube(7, 3, 8.5)
       .snap(board, 'x', 'inside-')
       .snap(board, 'y', 'inside+')
       .snap(board, 'z', 'outside+')