@duet3d/objectmodel 3.7.0-alpha.9 → 3.7.0-beta.10

package/dist/sensors/AnalogSensor.js

@@ -13,8 +13,13 @@ export var AnalogSensorType;
     AnalogSensorType["bme280"] = "bme280";
     AnalogSensorType["bme280pressure"] = "bmepressure";
     AnalogSensorType["bme280humidity"] = "bmehumidity";
-    AnalogSensorType["currentLoop"] = "currentloooppyro";
-    AnalogSensorType["ads131chan0"] = "ads131.chan0";
+    AnalogSensorType["bme68x"] = "bme68x";
+    AnalogSensorType["bme68xpressure"] = "bme68xpressure";
+    AnalogSensorType["bme68xhumidity"] = "bme68xhumidity";
+    AnalogSensorType["bme68xgas"] = "bme68xgas";
+    AnalogSensorType["currentLoop"] = "currentloop";
+    AnalogSensorType["ads131chan0Unipolar"] = "ads131.chan0.u";
+    AnalogSensorType["ads131chan0Bipolar"] = "ads131.chan0.b";
     AnalogSensorType["ads131chan1"] = "ads131.chan1";
     AnalogSensorType["mcuTemp"] = "mcutemp";
     AnalogSensorType["drivers"] = "drivers";
@@ -41,6 +46,10 @@ export var TemperatureError;
     TemperatureError["overOrUnderVoltage"] = "overOrUnderVoltage";
     TemperatureError["badVref"] = "badVref";
     TemperatureError["badVssa"] = "badVssa";
+    TemperatureError["readingTooLow"] = "readingTooLow";
+    TemperatureError["readingTooHigh"] = "readingTooHigh";
+    TemperatureError["ambientReadingTooLow"] = "ambientReadingTooLow";
+    TemperatureError["ambientReadingTooHigh"] = "ambientReadingTooHigh";
     TemperatureError["unknownError"] = "unknownError";
 })(TemperatureError || (TemperatureError = {}));
 export class AnalogSensor extends ModelObject {

package/dist/sensors/FilamentMonitors/FilamentMonitorBase.d.ts

@@ -26,6 +26,7 @@ export declare class FilamentMonitorBase extends ModelObject {
      */
     enabled: boolean;
     enableMode: FilamentMonitorEnableMode;
+    filamentPresent: boolean | null;
     status: FilamentMonitorStatus;
     type: FilamentMonitorType;
     constructor(type?: FilamentMonitorType);

package/dist/sensors/FilamentMonitors/FilamentMonitorBase.js

@@ -31,6 +31,7 @@ export class FilamentMonitorBase extends ModelObject {
          */
         this.enabled = false;
         this.enableMode = FilamentMonitorEnableMode.disabled;
+        this.filamentPresent = null;
         this.status = FilamentMonitorStatus.noDataReceived;
         this.type = type;
     }

package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.d.ts

@@ -4,7 +4,7 @@ import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
 export declare class LaserFilamentMonitorCalibrated extends ModelObject {
     percentMax: number;
     percentMin: number;
-    sensivity: number;
+    sensitivity: number;
     totalDistance: number;
 }
 export declare class LaserFilamentMonitorConfigured extends ModelObject {

package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js

@@ -7,7 +7,7 @@ export class LaserFilamentMonitorCalibrated extends ModelObject {
         super(...arguments);
         this.percentMax = 0;
         this.percentMin = 0;
-        this.sensivity = 0;
+        this.sensitivity = 0;
         this.totalDistance = 0;
     }
 }

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.d.ts

@@ -2,7 +2,7 @@ import ModelObject from "../../ModelObject";
 import type { IModelObject } from "../../ModelObject";
 import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
 export declare class RotatingMagnetFilamentMonitorCalibrated extends ModelObject {
-    mmPerPulse: number;
+    mmPerRev: number;
     percentMax: number;
     percentMin: number;
     totalDistance: number;
@@ -16,6 +16,7 @@ export declare class RotatingMagnetFilamentMonitorConfigured extends ModelObject
 }
 export declare class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor {
     constructor();
+    agc: number | null;
     calibrated: RotatingMagnetFilamentMonitorCalibrated | null;
     readonly configured: RotatingMagnetFilamentMonitorConfigured;
     update(jsonElement: any): IModelObject | null;

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js

@@ -5,7 +5,7 @@ import { getFilamentMonitor } from "./index";
 export class RotatingMagnetFilamentMonitorCalibrated extends ModelObject {
     constructor() {
         super(...arguments);
-        this.mmPerPulse = 0;
+        this.mmPerRev = 0;
         this.percentMax = 0;
         this.percentMin = 0;
         this.totalDistance = 0;
@@ -24,6 +24,7 @@ export class RotatingMagnetFilamentMonitorConfigured extends ModelObject {
 export class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor {
     constructor() {
         super(FilamentMonitorType.rotatingMagnet);
+        this.agc = null;
         this.calibrated = new RotatingMagnetFilamentMonitorCalibrated();
         this.configured = new RotatingMagnetFilamentMonitorConfigured();
         ModelObject.wrapModelProperty(this, "calibrated", RotatingMagnetFilamentMonitorCalibrated);

package/dist/sensors/Probe.d.ts

@@ -15,14 +15,12 @@ export declare enum ProbeType {
 }
 export declare class ProbeTouchMode extends ModelObject {
     active: boolean;
-    sensitivity: number;
+    speed: number;
     triggerHeight: number;
     threshold: number;
 }
 export declare class Probe extends ModelObject {
     constructor();
-    calibA: number | null;
-    calibB: number | null;
     calibrationTemperature: number;
     deployedByUser: boolean;
     disablesHeaters: boolean;

package/dist/sensors/Probe.js

@@ -18,7 +18,7 @@ export class ProbeTouchMode extends ModelObject {
     constructor() {
         super(...arguments);
         this.active = false;
-        this.sensitivity = 0;
+        this.speed = 0;
         this.triggerHeight = 0;
         this.threshold = 0;
     }
@@ -26,8 +26,6 @@ export class ProbeTouchMode extends ModelObject {
 export class Probe extends ModelObject {
     constructor() {
         super();
-        this.calibA = null;
-        this.calibB = null;
         this.calibrationTemperature = 0;
         this.deployedByUser = false;
         this.disablesHeaters = false;

package/dist/state/RestorePoint.d.ts

@@ -4,6 +4,7 @@ export declare class RestorePoint extends ModelObject {
     extruderPos: number;
     fanPwm: number;
     feedRate: number;
+    gCommandNumber: number;
     ioBits: number | null;
     laserPwm: number | null;
     toolNumber: number;

package/dist/state/RestorePoint.js

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

package/dist/state/index.d.ts

@@ -59,6 +59,7 @@ export declare class State extends ModelObject {
     readonly restorePoints: ModelCollection<RestorePoint>;
     startupError: StartupError | null;
     status: MachineStatus;
+    thisActive: boolean | null;
     thisInput: number | null;
     time: string | null;
     upTime: number;

package/dist/state/index.js

@@ -71,6 +71,7 @@ export class State extends ModelObject {
         this.restorePoints = new ModelCollection(RestorePoint);
         this.startupError = null;
         this.status = MachineStatus.starting;
+        this.thisActive = null;
         this.thisInput = null;
         this.time = null;
         this.upTime = 0;

package/dist/tools/index.d.ts

@@ -22,7 +22,7 @@ export declare class Tool extends ModelObject {
     name: string;
     number: number;
     offsets: Array<number>;
-    offsetsProbed: boolean;
+    offsetsProbed: number;
     retraction: ToolRetraction;
     spindle: number;
     spindleRpm: number;

package/dist/tools/index.js

@@ -25,7 +25,7 @@ export class Tool extends ModelObject {
         this.name = "";
         this.number = 0;
         this.offsets = [];
-        this.offsetsProbed = false;
+        this.offsetsProbed = 0;
         this.retraction = new ToolRetraction();
         this.spindle = -1;
         this.spindleRpm = 0;

package/dist/volumes/index.d.ts

@@ -4,7 +4,8 @@ export declare class Volume extends ModelObject {
     freeSpace: number | bigint | null;
     mounted: boolean;
     name: string | null;
-    openFiles: number | null;
+    openFiles: boolean | null;
+    partitionSize: number | bigint | null;
     path: string | null;
     speed: number | null;
 }

package/dist/volumes/index.js

@@ -7,6 +7,7 @@ export class Volume extends ModelObject {
         this.mounted = false;
         this.name = null;
         this.openFiles = null;
+        this.partitionSize = null;
         this.path = null;
         this.speed = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-alpha.9",
+  "version": "3.7.0-beta.10",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",
@@ -11,13 +11,14 @@
       "import": "./dist/index.js"
     },
     "./deprecations.json": "./dist/deprecations.json",
-    "./enums.json": "./dist/enums.json"
+    "./enums.json": "./dist/enums.json",
+    "./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"
+    "prepublishOnly": "npm test && node scripts/check-metadata.ts"
   },
   "repository": {
     "type": "git",
@@ -30,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"