@duet3d/objectmodel 3.7.0-beta.1 → 3.7.0-beta.3

package/dist/boards/index.d.ts

@@ -48,6 +48,7 @@ export declare class Board extends ModelObject {
     shortName: string;
     state: BoardState;
     supportsDirectDisplay: boolean;
+    timeout: number;
     uniqueId: string | null;
     v12: MinMaxCurrent | null;
     vIn: MinMaxCurrent | null;

package/dist/boards/index.js

@@ -59,6 +59,7 @@ export class Board extends ModelObject {
         this.shortName = "";
         this.state = BoardState.unknown;
         this.supportsDirectDisplay = false;
+        this.timeout = 10;
         this.uniqueId = null;
         this.v12 = null;
         this.vIn = null;

package/dist/documentation.json

@@ -74,6 +74,7 @@
 		}
 	},
 	"boards[].supportsDirectDisplay": "Indicates if this board supports external displays",
+	"boards[].timeout": "Connection timeout of this board (in s)",
 	"boards[].uniqueId": "Unique identifier of the board or null if unknown",
 	"boards[].v12": "Minimum, maximum, and current voltages on the 12V rail or null if unknown",
 	"boards[].v12.current": "Current value",
@@ -578,7 +579,7 @@
 	"move.motionSystems[].restorePoints[].extruderPos": "The virtual extruder position at the start of this move",
 	"move.motionSystems[].restorePoints[].fanPwm": "PWM value of the tool fan (0..1)",
 	"move.motionSystems[].restorePoints[].feedRate": "Requested feedrate (in mm/s)",
-	"move.motionSystems[].restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point",
+	"move.motionSystems[].restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point, or -1 if unknown",
 	"move.motionSystems[].restorePoints[].ioBits": "The output port bits setting for this move or null if not applicable",
 	"move.motionSystems[].restorePoints[].laserPwm": "Laser PWM value (0..1) or null if not applicable",
 	"move.motionSystems[].restorePoints[].toolNumber": "The tool number that was active",
@@ -782,6 +783,9 @@
 	"sbc.memory.total": "Total memory (in bytes)",
 	"sbc.model": "SBC model or null if unknown",
 	"sbc.serial": "Serial of the SBC or null if unknown",
+	"sbc.upgrade": "Details about a software upgrade in progress or null if no upgrade is running",
+	"sbc.upgrade.message": "Description of the current upgrade step",
+	"sbc.upgrade.progress": "Progress of the current upgrade step (0..1) or null if indeterminate",
 	"sbc.uptime": "Uptime of the running system (in s)",
 	"sensors": "Information about connected sensors including Z-probes and endstops",
 	"sensors.analog": "List of analog sensors",
@@ -1047,7 +1051,7 @@
 	"state.restorePoints[].extruderPos": "The virtual extruder position at the start of this move",
 	"state.restorePoints[].fanPwm": "PWM value of the tool fan (0..1)",
 	"state.restorePoints[].feedRate": "Requested feedrate (in mm/s)",
-	"state.restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point",
+	"state.restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point, or -1 if unknown",
 	"state.restorePoints[].ioBits": "The output port bits setting for this move or null if not applicable",
 	"state.restorePoints[].laserPwm": "Laser PWM value (0..1) or null if not applicable",
 	"state.restorePoints[].toolNumber": "The tool number that was active",

package/dist/sbc/Upgrade.d.ts

@@ -0,0 +1,6 @@
+import ModelObject from "../ModelObject";
+export declare class Upgrade extends ModelObject {
+    message: string;
+    progress: number | null;
+}
+export default Upgrade;

package/dist/sbc/Upgrade.js

@@ -0,0 +1,9 @@
+import ModelObject from "../ModelObject";
+export class Upgrade extends ModelObject {
+    constructor() {
+        super(...arguments);
+        this.message = "";
+        this.progress = null;
+    }
+}
+export default Upgrade;

package/dist/sbc/index.d.ts

@@ -2,7 +2,9 @@ import ModelObject from "../ModelObject";
 import DSF from "./dsf";
 import CPU from "./CPU";
 import Memory from "./Memory";
+import Upgrade from "./Upgrade";
 export declare class SBC extends ModelObject {
+    constructor();
     appArmor: boolean;
     readonly cpu: CPU;
     readonly dsf: DSF;
@@ -11,9 +13,11 @@ export declare class SBC extends ModelObject {
     readonly memory: Memory;
     model: string | null;
     serial: string | null;
+    upgrade: Upgrade | null;
     uptime: number | null;
 }
 export default SBC;
 export * from "./dsf";
 export * from "./CPU";
 export * from "./Memory";
+export * from "./Upgrade";

package/dist/sbc/index.js

@@ -2,9 +2,10 @@ import ModelObject from "../ModelObject";
 import DSF from "./dsf";
 import CPU from "./CPU";
 import Memory from "./Memory";
+import Upgrade from "./Upgrade";
 export class SBC extends ModelObject {
     constructor() {
-        super(...arguments);
+        super();
         this.appArmor = false;
         this.cpu = new CPU();
         this.dsf = new DSF();
@@ -13,10 +14,13 @@ export class SBC extends ModelObject {
         this.memory = new Memory();
         this.model = null;
         this.serial = null;
+        this.upgrade = null;
         this.uptime = null;
+        ModelObject.wrapModelProperty(this, "upgrade", Upgrade);
     }
 }
 export default SBC;
 export * from "./dsf";
 export * from "./CPU";
 export * from "./Memory";
+export * from "./Upgrade";

package/dist/state/RestorePoint.js

@@ -6,7 +6,7 @@ export class RestorePoint extends ModelObject {
         this.extruderPos = 0;
         this.fanPwm = 0;
         this.feedRate = 0;
-        this.gCommandNumber = 0;
+        this.gCommandNumber = -1;
         this.ioBits = null;
         this.laserPwm = null;
         this.toolNumber = -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-beta.1",
+  "version": "3.7.0-beta.3",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",
@@ -15,8 +15,8 @@
     "./documentation.json": "./dist/documentation.json"
   },
   "scripts": {
-    "test": "jest --config jestconfig.json",
-    "build": "tsc && tsx scripts/extract-metadata.ts",
+    "test": "tsc -p tsconfig.test.json --noEmit && jest --config jestconfig.json",
+    "build": "tsc && node scripts/extract-metadata.ts",
     "prepare": "npm run build",
     "prepublishOnly": "npm test"
   },
@@ -31,12 +31,12 @@
   },
   "homepage": "https://github.com/Duet3D/ObjectModel#readme",
   "devDependencies": {
+    "@swc/core": "^1.15.43",
+    "@swc/jest": "^0.2.39",
     "@types/jest": "^30.0.0",
-    "@types/node": "^25.0.0",
-    "jest": "^30.2.0",
-    "ts-jest": "^29.1.2",
-    "tsx": "^4.20.0",
-    "typescript": "^6.0.3"
+    "@types/node": "^26.1.1",
+    "jest": "^30.4.2",
+    "typescript": "^7.0.2"
   },
   "files": [
     "/dist"