@jwc/jscad-raspberrypi 3.1.0 → 3.2.1

package/examples/example.jscad

@@ -1,25 +1,32 @@
 function main() {
   util.init(CSG);
 
-  var pi = RaspberryPi.BPlus().align('mb', util.unitCube(), 'xy');
+  var pi = RaspberryPi.BPlus(5, 25).align('mb', util.unitCube(), 'xy');
 
   /**
    * Add a spacer to support the screen.
    */
-  pi.add(RaspberryPi.Spacer({}, pi.parts.mb), 'spacer');
+  // pi.add(RaspberryPi.Spacer({}, pi.parts.mb), 'spacer');
 
   /**
    * Add the screen and align it with the pi and the top of the spacer.
    */
   pi.add(
-    RaspberryPi.PiTFT24({}, pi.parts.mb).snap(
-      'mb',
-      pi.parts.spacer,
-      'z',
-      'outside-'
-    ),
-    'screen'
+    RaspberryPi.MiniPiTFT()
+      .snap('board', pi.parts.mb, 'x', 'inside-')
+      .snap('board', pi.parts.mb, 'y', 'inside+')
+      .snap('board', pi.parts.mb, 'z', 'outside-', 15),
+    'miniPiTFT',
+    true,
+    'miniPiTFT'
   );
+
+  pi.add(RaspberryPi.ActiveCoolingFan()
+    .snap('board', pi.parts.mb, 'x', 'inside-')
+    .snap('board', pi.parts.mb, 'y', 'inside+')
+    .snap('board', pi.parts.cpu, 'z', 'outside-', 1)
+    .translate([0, -6, 0]), "activeCoolingFan", true, 'activeCoolingFan');
+
   return pi.combineAll();
 }
 

package/examples/hq_camera-module.jscad

@@ -0,0 +1,10 @@
+function main() {
+  util.init(CSG);
+
+  var camera = RaspberryPi.HQCameraModule();
+
+  return camera.combine();
+}
+
+// include:js
+// endinject

package/examples/miniPiTFT.jscad

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

package/examples/pi4.jscad

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

package/examples/pi5.jscad

@@ -0,0 +1,20 @@
+function main() {
+  util.init(CSG, { debug: 'jscadRPi*,jscadUtils:util' });
+
+  var pi = RaspberryPi.BPlus(5, 25);
+
+  pi.add(
+    RaspberryPi.PiTFT24({}, pi.parts.mb).snap(
+      'mb',
+      pi.parts.spacer,
+      'z',
+      'outside-'
+    ),
+    'screen'
+  );
+
+  return pi.combineAll().Center();
+}
+
+// include:js
+// endinject

package/gulpfile.js

@@ -13,8 +13,8 @@ var debug = require("gulp-debug");
 var inject = require("gulp-inject");
 var plumber = require("gulp-plumber");
 var terser = require("gulp-terser");
-var rollupResolve = require("rollup-plugin-node-resolve");
-var rollupBabel = require("rollup-plugin-babel");
+var rollupResolve = require("@rollup/plugin-node-resolve");
+var rollupBabel = require("@rollup/plugin-babel");
 var jscadFiles = require("gulp-jscad-files");
 var pkg = require("./package.json");
 
@@ -58,7 +58,7 @@ gulp.task("v1compat", function () {
     .src("src/v1compat.js")
     .pipe(plumber())
     .pipe(
-      inject(gulp.src("dist/index.js").pipe(debug({ title: "injecting:" })), {
+      inject(gulp.src("dist/index.js")/* .pipe(debug({ title: "injecting:" })) */, {
         relative: true,
         starttag: "// include:compat",
         endtag: "// end:compat",
@@ -92,7 +92,7 @@ gulp.task("examples", function () {
               },
             })
           )
-          .pipe(debug({ title: "injecting:" })),
+          /* .pipe(debug({ title: "injecting:" })) */,
         {
           //   relative: true,
           starttag: "// include:js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwc/jscad-raspberrypi",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "jscad parts library for RaspberryPi",
   "main": "src/index.js",
   "scripts": {
@@ -26,41 +26,10 @@
     "url": "git@gitlab.com:johnwebbcole/jscad-raspberrypi.git"
   },
   "license": "ISC",
-  "devDependencies": {
-    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/register": "^7.11.5",
-    "@jwc/jscad-test-utils": "^1.0.6",
-    "@vuepress/plugin-active-header-links": "^1.6.0",
-    "@vuepress/plugin-google-analytics": "^1.6.0",
-    "ava": "^3.12.1",
-    "del": "^6.0.0",
-    "eslint": "^7.9.0",
-    "eslint-plugin-ava": "^11.0.0",
-    "fsevents": "^2.1.3",
-    "gulp": "^4.0.2",
-    "gulp-debug": "^4.0.0",
-    "gulp-eslint": "^6.0.0",
-    "gulp-inject": "^5.0.5",
-    "gulp-jscad-files": "^4.1.0",
-    "gulp-jsdoc-to-markdown": "^1.2.1",
-    "gulp-load-plugins": "^2.0.4",
-    "gulp-plumber": "^1.2.1",
-    "gulp-terser": "^1.4.0",
-    "gulp-util": "^3.0.7",
-    "gulp-watch": "^5.0.1",
-    "looks-same": "^7.2.3",
-    "nyc": "^15.1.0",
-    "rollup": "^2.28.2",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-commonjs": "^10.0.2",
-    "rollup-plugin-node-resolve": "^5.2.0",
-    "vuepress-jsdoc": "^3.2.0"
-  },
   "dependencies": {
-    "@jscad/csg": "^0.7.0",
-    "@jscad/scad-api": "^0.5.1",
-    "@jwc/jscad-utils": "^4.8.1"
+    "@jscad/csg": "0.7.0",
+    "@jscad/scad-api": "0.5.1",
+    "@jwc/jscad-utils": "4.9.0"
   },
   "ava": {
     "files": [
@@ -79,9 +48,32 @@
       "@babel/preset-env"
     ]
   },
-  "optionalDependencies": {},
-  "peerDependencies": {
-    "gl": "^4.3.3",
-    "vuepress": "^1.0.3"
+  "devDependencies": {
+    "@babel/core": "7.28.4",
+    "@babel/preset-env": "7.28.3",
+    "@babel/register": "7.28.3",
+    "@jwc/jscad-test-utils": "2.0.0",
+    "@rollup/plugin-babel": "6.0.4",
+    "@rollup/plugin-commonjs": "28.0.6",
+    "@rollup/plugin-node-resolve": "16.0.1",
+    "ava": "6.4.1",
+    "del": "8.0.1",
+    "eslint": "9.36.0",
+    "eslint-plugin-ava": "15.1.0",
+    "gulp": "5.0.1",
+    "gulp-debug": "5.0.1",
+    "gulp-eslint": "6.0.0",
+    "gulp-inject": "5.0.5",
+    "gulp-jscad-files": "4.1.0",
+    "gulp-jsdoc-to-markdown": "1.2.2",
+    "gulp-load-plugins": "2.0.8",
+    "gulp-plumber": "1.2.1",
+    "gulp-terser": "2.1.0",
+    "gulp-util": "3.0.8",
+    "gulp-watch": "5.0.1",
+    "looks-same": "10.0.1",
+    "nyc": "17.1.0",
+    "rollup": "4.52.2",
+    "vuepress-jsdoc": "5.0.0"
   }
 }

package/src/active-cooling-fan.js

@@ -0,0 +1,160 @@
+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');
+
+  var board = Parts.Cube([64, 42.5, 1])
+    .subtract(Parts.Cube([64 - 58, 31.3, 1])
+      .translate([0, 42.5 - 31.3, 0]).color('orange')
+      .union(Parts.Cube([28, 42.5 - 31.3, 1])
+        .translate([64 - 28, 0, 0]).color('blue')))
+    .union(Parts.Cube([19, 40, 9]).translate([64 - 58, 2.5, 0])).color('silver')
+    .union(Parts.Cube([30, 30, 9]).translate([(64 - 58) + 19, 42.5 - 31.3, 0]).color('black'))
+    ;
+
+  g.add(board, 'board');
+
+  // g.add(
+  //   Parts.Cube([31, 18, 2])
+  //     .color('white')
+  //     .snap(board, 'x', 'inside+')
+  //     .snap(board, 'y', 'inside-')
+  //     .snap(board, 'z', 'outside-'),
+  //   'screen'
+  // );
+
+  // g.add(
+  //   Parts.Cube([util.inch(0.98), util.inch(0.58), 2.01])
+  //     .color('black')
+  //     .snap(board, 'x', 'inside-', util.inch(0.34))
+  //     .snap(board, 'y', 'inside+', -util.inch(0.32))
+  //     .snap(board, 'z', 'outside-'),
+  //   'display'
+  // );
+
+  // g.add(
+  //   g.parts.display
+  //     .stretch('z', 5)
+  //     .chamfer(-5, 'z+')
+  //     .align(g.parts.display, 'xy')
+  //     .color('red'),
+  //   'display-clearance',
+  //   true
+  // );
+
+  // g.add(
+  //   boardButton('button1', board, util.inch(0.53)),
+  //   'button1',
+  //   false,
+  //   'button1-'
+  // );
+
+  // g.add(
+  //   boardButton('button2', board, util.inch(0.18)),
+  //   'button2',
+  //   false,
+  //   'button2-'
+  // );
+
+  // g.add(
+  //   buttonCap('buttonCap1', g.parts.button1),
+  //   'buttonCap1',
+  //   true,
+  //   'buttonCap1-'
+  // );
+  // g.add(
+  //   buttonCap('buttonCap2', g.parts.button2),
+  //   'buttonCap2',
+  //   true,
+  //   'buttonCap2-'
+  // );
+
+  // g.add(
+  //   Parts.Cube([1, 5, 0.5])
+  //     .color('blue')
+  //     .align(g.parts.buttonCap1, 'x')
+  //     .snap(g.parts.buttonCap1, 'y', 'outside+', 1)
+  //     .snap(g.parts.buttonCap1, 'z', 'inside-'),
+  //   'button-connector',
+  //   true
+  // );
+
+  // g.add(
+  //   g.parts['button-connector'].enlarge(0.5, 0.5, 0.5).color('red'),
+  //   'button-connector-clearance',
+  //   true
+  // );
+
+  // g.add(
+  //   Parts.Tube(7, 3, 7.5)
+  //     .snap(board, 'x', 'inside-')
+  //     .snap(board, 'y', 'inside+')
+  //     .snap(board, 'z', 'outside+')
+  //     .color('yellow'),
+  //   'standoff',
+  //   true
+  // );
+
+  return g;
+}

package/src/bplus.js

@@ -199,8 +199,23 @@ function pi4(group, clearance, mb) {
 
 function pi5(group, clearance, mb) {
   /**
-     * Model 5
-     */
+   * Model 5
+   */
+
+  group.add(
+    Parts.Cube([12, 12, 3]).color('lightgray')
+      .translate([24, 15, 2]),
+    'cpu'
+  );
+
+  group.add(
+    Parts.Cube([12, 12, clearance]).color('red')
+      .translate([24, 15, 2]),
+    'clearance-cpu',
+    true,
+    'clearance'
+  );
+
   group.add(
     RightSide(Parts.Cube([21.5, 16.5, 13.5]).color('lightgray'), mb)
       .translate([2, 0, 0])
@@ -386,6 +401,8 @@ function pi5(group, clearance, mb) {
       .color('red'),
     'powerled'
   );
+
+
 }
 
 /**
@@ -574,5 +591,24 @@ export default function BPlus(model = 2, options) {
   group.add(group.holes[2], 'hole3', true);
   group.add(group.holes[3], 'hole4', true);
 
+  /** Add fan mounting holes for PI 5 */
+  if (model >= 5) {
+    group.holes.push(RPiParts.MountingHole(3.25, 8)
+      .snap(mb, 'xy', 'inside-')
+      .align(mb, 'z')
+      .midlineTo('x', 3.5)
+      .midlineTo('y', 6 + 3.5));
+
+    group.add(group.holes[4], 'fan1hole', true);
+
+    group.holes.push(RPiParts.MountingHole(3.25, 8)
+      .snap(mb, 'xy', 'inside-')
+      .align(mb, 'z')
+      .midlineTo('x', 3.5 + 58)
+      .midlineTo('y', 52.5 - 6));
+
+    group.add(group.holes[5], 'fan2hole', true);
+  }
+
   return group;
 }

package/src/index.js

@@ -1,3 +1,4 @@
+import ActiveCoolingFan from './active-cooling-fan';
 import BPlus from './bplus';
 import CameraModuleV1 from './camera-module-v1';
 import CameraModuleV2 from './camera-module-v2';
@@ -10,14 +11,10 @@ import PiTFT24 from './pi-tft24';
 import Spacer from './spacer';
 
 export {
-  BPlus,
+  ActiveCoolingFan, BPlus,
   CameraModuleV1,
-  CameraModuleV2,
-  HQCameraModule,
-  Hat,
-  HatStandoff,
-  PiTFT22,
-  PiTFT24,
-  MiniPiTFT,
-  Spacer,
+  CameraModuleV2, Hat,
+  HatStandoff, HQCameraModule, MiniPiTFT, PiTFT22,
+  PiTFT24, Spacer
 };
+