@duet3d/objectmodel 3.4.0-b9 → 3.5.0-b1

package/dist/ModelCollection.d.ts

@@ -2,7 +2,7 @@ import { IModelObject } from "./ModelObject";
 /**
  * Class for storing model object items in an array
  */
-export declare class ModelCollection<T extends IModelObject> extends Array<T> implements IModelObject {
+export declare class ModelCollection<T extends IModelObject | null> extends Array<T> implements IModelObject {
     private readonly itemConstructor;
     /**
      * Constructor of this class

package/dist/ModelCollection.js

@@ -72,7 +72,14 @@ class ModelCollection extends Array {
         }
         // Add new items
         for (let i = this.length; i < jsonElement.length; i++) {
-            this.push(jsonElement[i]);
+            const itemToAdd = jsonElement[i];
+            if (itemToAdd === null) {
+                super.push(itemToAdd);
+            }
+            else {
+                const newItem = new this.itemConstructor();
+                super.push(newItem.update(itemToAdd));
+            }
         }
         return this;
     }

package/dist/ModelObject.js

@@ -43,6 +43,9 @@ class ModelObject {
                                 console.warn(`Model object ${key} changed but it could not be set due to missing setter`);
                             }
                         }
+                        else if (process.env.NODE_ENV !== "production") {
+                            console.warn(`Model object ${key} changed but it lacks the property descriptor`);
+                        }
                     }
                 }
                 else if (prop instanceof Array) {
@@ -111,7 +114,7 @@ class ModelObject {
                         }
                     }
                     else if (propType === "number") {
-                        if (typeof value === "number") {
+                        if (typeof value === "number" || typeof value === "bigint") {
                             this[ownKey] = value;
                         }
                         else if (process.env.NODE_ENV !== "production") {
@@ -184,7 +187,24 @@ function initObject(itemType, data) {
     for (let key in data) {
         const resultKey = result[key];
         if (isModelObject(resultKey)) {
-            resultKey.update(data[key]);
+            const updatedObject = resultKey.update(data[key]);
+            if (resultKey !== updatedObject) {
+                const propDescriptor = Object.getOwnPropertyDescriptor(result, key);
+                if (propDescriptor !== undefined) {
+                    if (propDescriptor.writable) {
+                        result[key] = updatedObject;
+                    }
+                    else if (propDescriptor.set !== undefined) {
+                        propDescriptor.set(updatedObject);
+                    }
+                    else if (process.env.NODE_ENV !== "production") {
+                        console.warn(`Model object ${key} changed but it could not be set due to missing setter`);
+                    }
+                }
+                else if (process.env.NODE_ENV !== "production") {
+                    console.warn(`Model object ${key} changed but it lacks the property descriptor`);
+                }
+            }
         }
         else {
             result[key] = data[key];

package/dist/ObjectModel.d.ts

@@ -2,7 +2,6 @@ import ModelCollection from "./ModelCollection";
 import ModelDictionary from "./ModelDictionary";
 import ModelObject from "./ModelObject";
 import Board from "./boards";
-import State from "./state";
 import Directories from "./directories";
 import Fan from "./fans";
 import Heat from "./heat";
@@ -17,6 +16,8 @@ import Plugin from "./plugins";
 import Scanner from "./scanner";
 import Sensors from "./sensors";
 import Spindle from "./spindles";
+import State from "./state";
+import Tool from "./tools";
 import UserSession from "./userSessions";
 import Volume from "./volumes";
 /**
@@ -25,11 +26,11 @@ import Volume from "./volumes";
 export declare class ObjectModel extends ModelObject {
     readonly boards: ModelCollection<Board>;
     readonly directories: Directories;
-    readonly fans: ModelCollection<Fan>;
+    readonly fans: ModelCollection<Fan | null>;
     readonly global: ModelDictionary<any>;
     readonly heat: Heat;
     readonly httpEndpoints: ModelCollection<HttpEndpoint>;
-    readonly inputs: ModelCollection<InputChannel>;
+    readonly inputs: ModelCollection<InputChannel | null>;
     readonly job: Job;
     readonly limits: Limits;
     readonly messages: ModelCollection<Message>;
@@ -38,8 +39,9 @@ export declare class ObjectModel extends ModelObject {
     readonly plugins: ModelDictionary<Plugin>;
     readonly scanner: Scanner;
     readonly sensors: Sensors;
-    readonly spindles: ModelCollection<Spindle>;
+    readonly spindles: ModelCollection<Spindle | null>;
     readonly state: State;
+    readonly tools: ModelCollection<Tool | null>;
     readonly userSessions: ModelCollection<UserSession>;
     readonly volumes: ModelCollection<Volume>;
 }

package/dist/ObjectModel.js

@@ -5,7 +5,6 @@ const ModelCollection_1 = require("./ModelCollection");
 const ModelDictionary_1 = require("./ModelDictionary");
 const ModelObject_1 = require("./ModelObject");
 const boards_1 = require("./boards");
-const state_1 = require("./state");
 const directories_1 = require("./directories");
 const fans_1 = require("./fans");
 const heat_1 = require("./heat");
@@ -20,6 +19,8 @@ const plugins_1 = require("./plugins");
 const scanner_1 = require("./scanner");
 const sensors_1 = require("./sensors");
 const spindles_1 = require("./spindles");
+const state_1 = require("./state");
+const tools_1 = require("./tools");
 const userSessions_1 = require("./userSessions");
 const volumes_1 = require("./volumes");
 /**
@@ -45,6 +46,7 @@ class ObjectModel extends ModelObject_1.default {
         this.sensors = new sensors_1.default();
         this.spindles = new ModelCollection_1.default(spindles_1.default);
         this.state = new state_1.default();
+        this.tools = new ModelCollection_1.default(tools_1.default);
         this.userSessions = new ModelCollection_1.default(userSessions_1.default);
         this.volumes = new ModelCollection_1.default(volumes_1.default);
     }

package/dist/boards/index.d.ts

@@ -46,5 +46,6 @@ export declare class Board extends ModelObject {
     uniqueId: string | null;
     v12: MinMaxCurrent | null;
     vIn: MinMaxCurrent | null;
+    wifiFirmwareFileName: string | null;
 }
 export default Board;

package/dist/boards/index.js

@@ -49,7 +49,7 @@ class Board extends ModelObject_1.default {
         super();
         this.accelerometer = null;
         this.bootloaderFileName = null;
-        this.canAddress = 0;
+        this.canAddress = null;
         this.closedLoop = null;
         this.directDisplay = null;
         this.firmwareDate = "";
@@ -67,6 +67,7 @@ class Board extends ModelObject_1.default {
         this.uniqueId = null;
         this.v12 = null;
         this.vIn = null;
+        this.wifiFirmwareFileName = null;
         this.wrapModelProperty("accelerometer", Accelerometer);
         this.wrapModelProperty("closedLoop", ClosedLoop);
         this.wrapModelProperty("directDisplay", DirectDisplay);

package/dist/fans/index.d.ts

@@ -3,6 +3,7 @@ export declare class FanThermostaticControl extends ModelObject {
     heaters: Array<number>;
     highTemperature: number | null;
     lowTemperature: number | null;
+    sensors: Array<number>;
 }
 export declare class Fan extends ModelObject {
     actualValue: number;

package/dist/fans/index.js

@@ -5,9 +5,10 @@ const ModelObject_1 = require("../ModelObject");
 class FanThermostaticControl extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.heaters = new Array();
+        this.heaters = []; // *** deprecated as of v3.5, use sensors instead
         this.highTemperature = null;
         this.lowTemperature = null;
+        this.sensors = [];
     }
 }
 exports.FanThermostaticControl = FanThermostaticControl;

package/dist/heat/Heater.d.ts

@@ -15,6 +15,9 @@ export declare class Heater extends ModelObject {
     avgPwm: number;
     current: number;
     max: number;
+    maxBadReadings: number;
+    maxHeatingFaultTime: number;
+    maxTempExcursion: number;
     min: number;
     readonly model: HeaterModel;
     readonly monitors: ModelCollection<HeaterMonitor>;

package/dist/heat/Heater.js

@@ -21,6 +21,9 @@ class Heater extends ModelObject_1.default {
         this.avgPwm = 0;
         this.current = -273.15;
         this.max = 285;
+        this.maxBadReadings = 3;
+        this.maxHeatingFaultTime = 5;
+        this.maxTempExcursion = 15;
         this.min = -10;
         this.model = new HeaterModel_1.default();
         this.monitors = new ModelCollection_1.default(HeaterMonitor_1.default);

package/dist/heat/HeaterModel.d.ts

@@ -16,6 +16,6 @@ export declare class HeaterModel extends ModelObject {
     inverted: boolean;
     maxPwm: number;
     readonly pid: HeaterModelPID;
-    standardVoltage: number | null;
+    standardVoltage: number;
 }
 export default HeaterModel;

package/dist/heat/HeaterModel.js

@@ -25,7 +25,7 @@ class HeaterModel extends ModelObject_1.default {
         this.inverted = false;
         this.maxPwm = 1;
         this.pid = new HeaterModelPID();
-        this.standardVoltage = null;
+        this.standardVoltage = 0;
     }
 }
 exports.HeaterModel = HeaterModel;

package/dist/heat/HeaterMonitor.d.ts

@@ -11,8 +11,8 @@ export declare enum HeaterMonitorCondition {
     tooLow = "tooLow"
 }
 export declare class HeaterMonitor extends ModelObject {
-    action: HeaterMonitorAction;
+    action: HeaterMonitorAction | null;
     condition: HeaterMonitorCondition;
-    limit: number;
+    limit: number | null;
 }
 export default HeaterMonitor;

package/dist/heat/HeaterMonitor.js

@@ -18,9 +18,9 @@ var HeaterMonitorCondition;
 class HeaterMonitor extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.action = HeaterMonitorAction.generateFault;
+        this.action = null;
         this.condition = HeaterMonitorCondition.disabled;
-        this.limit = 2000;
+        this.limit = null;
     }
 }
 exports.HeaterMonitor = HeaterMonitor;

package/dist/heat/index.d.ts

@@ -6,7 +6,7 @@ export declare class Heat extends ModelObject {
     chamberHeaters: Array<number>;
     coldExtrudeTemperature: number;
     coldRetractTemperature: number;
-    readonly heaters: ModelCollection<Heater>;
+    readonly heaters: ModelCollection<Heater | null>;
 }
 export default Heat;
 export * from "./Heater";

package/dist/index.d.ts

@@ -17,6 +17,7 @@ export * from "./plugins";
 export * from "./scanner";
 export * from "./sensors";
 export * from "./spindles";
+export * from "./tools";
 export * from "./userSessions";
 export * from "./volumes";
 export * from "./ObjectModel";

package/dist/index.js

@@ -35,6 +35,7 @@ __exportStar(require("./plugins"), exports);
 __exportStar(require("./scanner"), exports);
 __exportStar(require("./sensors"), exports);
 __exportStar(require("./spindles"), exports);
+__exportStar(require("./tools"), exports);
 __exportStar(require("./userSessions"), exports);
 __exportStar(require("./volumes"), exports);
 __exportStar(require("./ObjectModel"), exports);

package/dist/inputs/InputChannel.d.ts

@@ -2,7 +2,7 @@ import ModelObject from "../ModelObject";
 import Compatibility from "./Compatibility";
 export declare enum DistanceUnit {
     mm = "mm",
-    inch = "inch"
+    inch = "in"
 }
 export declare enum InputChannelState {
     awaitingAcknowledgement = "awaitingAcknowledgement",
@@ -19,10 +19,12 @@ export declare class InputChannel extends ModelObject {
     feedRate: number;
     inMacro: boolean;
     macroRestartable: boolean;
+    motionSystem: number;
     name: string;
+    selectedPlane: number;
     stackDepth: number;
     state: InputChannelState;
-    lineNumber: bigint;
+    lineNumber: number | bigint;
     volumetric: boolean;
 }
 export default InputChannel;

package/dist/inputs/InputChannel.js

@@ -6,7 +6,7 @@ const Compatibility_1 = require("./Compatibility");
 var DistanceUnit;
 (function (DistanceUnit) {
     DistanceUnit["mm"] = "mm";
-    DistanceUnit["inch"] = "inch";
+    DistanceUnit["inch"] = "in";
 })(DistanceUnit = exports.DistanceUnit || (exports.DistanceUnit = {}));
 var InputChannelState;
 (function (InputChannelState) {
@@ -26,10 +26,12 @@ class InputChannel extends ModelObject_1.default {
         this.feedRate = 50;
         this.inMacro = false;
         this.macroRestartable = false;
+        this.motionSystem = 0;
         this.name = "";
+        this.selectedPlane = 0;
         this.stackDepth = 0;
         this.state = InputChannelState.idle;
-        this.lineNumber = 0n;
+        this.lineNumber = 0;
         this.volumetric = false;
     }
 }

package/dist/job/GCodeFileInfo.d.ts

@@ -9,9 +9,9 @@ export declare class GCodeFileInfo extends ModelObject {
     lastModified: string | null;
     layerHeight: number;
     numLayers: number;
-    printTime: bigint | null;
-    simulatedTime: bigint | null;
-    size: bigint;
+    printTime: number | bigint | null;
+    simulatedTime: number | bigint | null;
+    size: number | bigint;
     readonly thumbnails: ModelCollection<ThumbnailInfo>;
 }
 export default GCodeFileInfo;

package/dist/job/GCodeFileInfo.js

@@ -16,7 +16,7 @@ class GCodeFileInfo extends ModelObject_1.default {
         this.numLayers = 0;
         this.printTime = null;
         this.simulatedTime = null;
-        this.size = 0n;
+        this.size = 0;
         this.thumbnails = new ModelCollection_1.default(ThumbnailInfo_1.default);
     }
 }

package/dist/job/index.d.ts

@@ -20,7 +20,7 @@ export declare class Job extends ModelObject {
     build: Build;
     duration: number | null;
     file: GCodeFileInfo | null;
-    filePosition: bigint | null;
+    filePosition: number | bigint | null;
     lastDuration: number | null;
     lastFileName: string | null;
     lastFileAborted: boolean;

package/dist/move/DriverId.d.ts

@@ -1,7 +1,7 @@
 import ModelObject, { IModelObject } from "../ModelObject";
 export declare function isDriverId(value: any): value is DriverId;
 export declare class DriverId extends ModelObject {
-    board: number;
+    board: number | null;
     driver: number;
     equals(value?: DriverId | null): boolean;
     update(jsonElement: any): IModelObject | null;

package/dist/move/DriverId.js

@@ -3,22 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriverId = exports.isDriverId = void 0;
 const ModelObject_1 = require("../ModelObject");
 function isDriverId(value) {
-    return (value instanceof Object) && (typeof value.board === "number") && (typeof value.driver === "number");
+    return (value instanceof Object) && value.board !== undefined && value.driver !== undefined;
 }
 exports.isDriverId = isDriverId;
 class DriverId extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.board = 0;
+        this.board = null;
         this.driver = 0;
     }
     equals(value) {
-        return isDriverId(value) && value.board === this.board && value.driver === this.driver;
+        if (isDriverId(value)) {
+            if (!this.board && !value.board) {
+                return this.driver === value.driver;
+            }
+            return (value.board === this.board) && (value.driver === this.driver);
+        }
+        return false;
     }
     update(jsonElement) {
         if (isDriverId(jsonElement)) {
             this.board = jsonElement.board;
             this.driver = jsonElement.driver;
+            return this;
         }
         if (typeof jsonElement === "string") {
             const matches = /(\d+)\.(\d+)/.exec(jsonElement);
@@ -27,7 +34,7 @@ class DriverId extends ModelObject_1.default {
                 this.driver = Number(matches[2]);
             }
             else {
-                this.board = 0;
+                this.board = null;
                 this.driver = Number(jsonElement);
             }
             return this;
@@ -35,7 +42,7 @@ class DriverId extends ModelObject_1.default {
         return null;
     }
     toString() {
-        return `${this.board}.${this.driver}`;
+        return (this.board === null) ? this.driver.toString() : `${this.board}.${this.driver}`;
     }
 }
 exports.DriverId = DriverId;

package/dist/move/Extruder.d.ts

@@ -12,6 +12,7 @@ export declare class Extruder extends ModelObject {
     current: number;
     driver: DriverId | null;
     filament: string;
+    filamentDiameter: number;
     factor: number;
     jerk: number;
     readonly microstepping: Microstepping;

package/dist/move/Extruder.js

@@ -20,6 +20,7 @@ class Extruder extends ModelObject_1.default {
         this.current = 0;
         this.driver = null;
         this.filament = "";
+        this.filamentDiameter = 1.75;
         this.factor = 1;
         this.jerk = 15;
         this.microstepping = new Microstepping_1.default();

package/dist/move/kinematics/HangprinterKinematics.js

@@ -9,6 +9,7 @@ class HangprinterKinematics extends KinematicsBase_1.default {
         this.anchors = [
             [0, -2000, -100],
             [2000, 1000, -100],
+            [-2000, 1000, -100],
             [0, 0, 3000]
         ];
         this.printRadius = 1500;

package/dist/move/kinematics/index.d.ts

@@ -1,7 +1,7 @@
 import { IModelObject } from "../../ModelObject";
 import KinematicsBase, { KinematicsName } from "./KinematicsBase";
 export declare class Kinematics extends KinematicsBase {
-    constructor();
+    constructor(name?: KinematicsName);
     update(jsonElement: any): IModelObject | null;
 }
 export default Kinematics;

package/dist/move/kinematics/index.js

@@ -22,8 +22,8 @@ const HangprinterKinematics_1 = require("./HangprinterKinematics");
 const ScaraKinematics_1 = require("./ScaraKinematics");
 const PolarKinematics_1 = require("./PolarKinematics");
 class Kinematics extends KinematicsBase_1.default {
-    constructor() {
-        super(KinematicsBase_1.KinematicsName.unknown);
+    constructor(name = KinematicsBase_1.KinematicsName.unknown) {
+        super(name);
     }
     update(jsonElement) {
         if (jsonElement === null) {
@@ -47,8 +47,9 @@ function getKinematics(name) {
         case KinematicsBase_1.KinematicsName.markForged:
             return new CoreKinematics_1.default(name);
         case KinematicsBase_1.KinematicsName.delta:
-        case KinematicsBase_1.KinematicsName.rotaryDelta:
             return new DeltaKinematics_1.default(name);
+        case KinematicsBase_1.KinematicsName.rotaryDelta:
+            return new Kinematics(name);
         case KinematicsBase_1.KinematicsName.hangprinter:
             return new HangprinterKinematics_1.default();
         case KinematicsBase_1.KinematicsName.fiveBarScara:

package/dist/network/NetworkInterface.d.ts

@@ -7,6 +7,17 @@ export declare enum NetworkProtocol {
     Telnet = "telnet",
     SSH = "ssh"
 }
+export declare enum NetworkInterfaceState {
+    disabled = "disabled",
+    enabled = "enabled",
+    starting1 = "starting1",
+    starting2 = "starting2",
+    changingMode = "changingMode",
+    establishingLink = "establishingLink",
+    obtainingIP = "obtainingIP",
+    connected = "connected",
+    active = "active"
+}
 export declare enum NetworkInterfaceType {
     lan = "lan",
     wifi = "wifi"
@@ -22,6 +33,7 @@ export declare class NetworkInterface extends ModelObject {
     numReconnects: number | null;
     signal: number | null;
     speed: number | null;
+    state: NetworkInterfaceState | null;
     subnet: string | null;
     type: NetworkInterfaceType;
 }

package/dist/network/NetworkInterface.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkInterface = exports.NetworkInterfaceType = exports.NetworkProtocol = void 0;
+exports.NetworkInterface = exports.NetworkInterfaceType = exports.NetworkInterfaceState = exports.NetworkProtocol = void 0;
 const ModelObject_1 = require("../ModelObject");
 var NetworkProtocol;
 (function (NetworkProtocol) {
@@ -11,6 +11,18 @@ var NetworkProtocol;
     NetworkProtocol["Telnet"] = "telnet";
     NetworkProtocol["SSH"] = "ssh";
 })(NetworkProtocol = exports.NetworkProtocol || (exports.NetworkProtocol = {}));
+var NetworkInterfaceState;
+(function (NetworkInterfaceState) {
+    NetworkInterfaceState["disabled"] = "disabled";
+    NetworkInterfaceState["enabled"] = "enabled";
+    NetworkInterfaceState["starting1"] = "starting1";
+    NetworkInterfaceState["starting2"] = "starting2";
+    NetworkInterfaceState["changingMode"] = "changingMode";
+    NetworkInterfaceState["establishingLink"] = "establishingLink";
+    NetworkInterfaceState["obtainingIP"] = "obtainingIP";
+    NetworkInterfaceState["connected"] = "connected";
+    NetworkInterfaceState["active"] = "active";
+})(NetworkInterfaceState = exports.NetworkInterfaceState || (exports.NetworkInterfaceState = {}));
 var NetworkInterfaceType;
 (function (NetworkInterfaceType) {
     NetworkInterfaceType["lan"] = "lan";
@@ -29,6 +41,7 @@ class NetworkInterface extends ModelObject_1.default {
         this.numReconnects = null;
         this.signal = null;
         this.speed = null;
+        this.state = null;
         this.subnet = null;
         this.type = NetworkInterfaceType.wifi;
     }

package/dist/plugins/PluginManifest.d.ts

@@ -13,7 +13,7 @@ export declare enum SbcPermission {
     readFilaments = "readFilaments",
     writeFilaments = "writeFilaments",
     readFirmware = "readFirmware",
-    writeFirmware = "writeFilaments",
+    writeFirmware = "writeFirmware",
     readGCodes = "readGCodes",
     writeGCodes = "writeGCodes",
     readMacros = "readMacros",
@@ -41,6 +41,7 @@ export declare class PluginManifest extends ModelObject {
     version: string;
     license: string;
     homepage: string | null;
+    tags: Array<string>;
     dwcVersion: string | null;
     dwcDependencies: Array<string>;
     sbcRequired: boolean;

package/dist/plugins/PluginManifest.js

@@ -29,7 +29,7 @@ var SbcPermission;
     SbcPermission["readFilaments"] = "readFilaments";
     SbcPermission["writeFilaments"] = "writeFilaments";
     SbcPermission["readFirmware"] = "readFirmware";
-    SbcPermission["writeFirmware"] = "writeFilaments";
+    SbcPermission["writeFirmware"] = "writeFirmware";
     SbcPermission["readGCodes"] = "readGCodes";
     SbcPermission["writeGCodes"] = "writeGCodes";
     SbcPermission["readMacros"] = "readMacros";
@@ -56,6 +56,7 @@ class PluginManifest extends ModelObject_1.default {
         this.version = "1.0.0";
         this.license = "LGPL-3.0-or-later";
         this.homepage = null;
+        this.tags = [];
         this.dwcVersion = null;
         this.dwcDependencies = [];
         this.sbcRequired = false;

package/dist/sensors/AnalogSensor.d.ts

@@ -6,7 +6,6 @@ export declare enum AnalogSensorType {
     max31855 = "thermocouplemax31855",
     max31856 = "thermocouplemax31856",
     linearAnalog = "linearanalog",
-    dht11 = "dht11",
     dht21 = "dht21",
     dht22 = "dht22",
     dhtHumidity = "dhthumidity",

package/dist/sensors/AnalogSensor.js

@@ -10,7 +10,6 @@ var AnalogSensorType;
     AnalogSensorType["max31855"] = "thermocouplemax31855";
     AnalogSensorType["max31856"] = "thermocouplemax31856";
     AnalogSensorType["linearAnalog"] = "linearanalog";
-    AnalogSensorType["dht11"] = "dht11";
     AnalogSensorType["dht21"] = "dht21";
     AnalogSensorType["dht22"] = "dht22";
     AnalogSensorType["dhtHumidity"] = "dhthumidity";

package/dist/sensors/index.d.ts

@@ -8,11 +8,11 @@ export declare class GpInputPort extends ModelObject {
     value: number;
 }
 export declare class Sensors extends ModelObject {
-    readonly analog: ModelCollection<AnalogSensor>;
-    readonly endstops: ModelCollection<Endstop>;
-    readonly filamentMonitors: ModelCollection<FilamentMonitor>;
-    readonly gpIn: ModelCollection<GpInputPort>;
-    readonly probes: ModelCollection<Probe>;
+    readonly analog: ModelCollection<AnalogSensor | null>;
+    readonly endstops: ModelCollection<Endstop | null>;
+    readonly filamentMonitors: ModelCollection<FilamentMonitor | null>;
+    readonly gpIn: ModelCollection<GpInputPort | null>;
+    readonly probes: ModelCollection<Probe | null>;
 }
 export default Sensors;
 export * from "./FilamentMonitors";

package/dist/state/MachineStatus.d.ts

@@ -3,13 +3,13 @@ export declare enum MachineStatus {
     starting = "starting",
     updating = "updating",
     off = "off",
-    Halted = "halted",
-    Pausing = "pausing",
+    halted = "halted",
+    pausing = "pausing",
     paused = "paused",
     resuming = "resuming",
     cancelling = "cancelling",
     processing = "processing",
-    simulating = "processing",
+    simulating = "simulating",
     busy = "busy",
     changingTool = "changingTool",
     idle = "idle"

package/dist/state/MachineStatus.js

@@ -7,13 +7,13 @@ var MachineStatus;
     MachineStatus["starting"] = "starting";
     MachineStatus["updating"] = "updating";
     MachineStatus["off"] = "off";
-    MachineStatus["Halted"] = "halted";
-    MachineStatus["Pausing"] = "pausing";
+    MachineStatus["halted"] = "halted";
+    MachineStatus["pausing"] = "pausing";
     MachineStatus["paused"] = "paused";
     MachineStatus["resuming"] = "resuming";
     MachineStatus["cancelling"] = "cancelling";
     MachineStatus["processing"] = "processing";
-    MachineStatus["simulating"] = "processing";
+    MachineStatus["simulating"] = "simulating";
     MachineStatus["busy"] = "busy";
     MachineStatus["changingTool"] = "changingTool";
     MachineStatus["idle"] = "idle";

package/dist/state/MessageBox.d.ts

@@ -3,11 +3,20 @@ export declare enum MessageBoxMode {
     noButtons = 0,
     closeOnly = 1,
     okOnly = 2,
-    okCancel = 3
+    okCancel = 3,
+    multipleChoice = 4,
+    intInput = 5,
+    floatInput = 6,
+    stringInput = 7
 }
 export declare class MessageBox extends ModelObject {
-    axisControls: number;
+    axisControls: number | null;
+    cancelButton: boolean;
+    choices: Array<string> | null;
+    default: number | string | null;
+    max: number | null;
     message: string;
+    min: number | null;
     mode: MessageBoxMode;
     seq: number;
     timeout: number;

package/dist/state/MessageBox.js

@@ -8,12 +8,21 @@ var MessageBoxMode;
     MessageBoxMode[MessageBoxMode["closeOnly"] = 1] = "closeOnly";
     MessageBoxMode[MessageBoxMode["okOnly"] = 2] = "okOnly";
     MessageBoxMode[MessageBoxMode["okCancel"] = 3] = "okCancel";
+    MessageBoxMode[MessageBoxMode["multipleChoice"] = 4] = "multipleChoice";
+    MessageBoxMode[MessageBoxMode["intInput"] = 5] = "intInput";
+    MessageBoxMode[MessageBoxMode["floatInput"] = 6] = "floatInput";
+    MessageBoxMode[MessageBoxMode["stringInput"] = 7] = "stringInput";
 })(MessageBoxMode = exports.MessageBoxMode || (exports.MessageBoxMode = {}));
 class MessageBox extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.axisControls = 0;
+        this.axisControls = null;
+        this.cancelButton = false;
+        this.choices = null;
+        this.default = null;
+        this.max = null;
         this.message = "";
+        this.min = null;
         this.mode = MessageBoxMode.okOnly;
         this.seq = -1;
         this.timeout = 0;

package/dist/state/index.d.ts

@@ -32,7 +32,7 @@ export declare class State extends ModelObject {
     dsfVersion: string | null;
     dsfPluginSupport: boolean;
     dsfRootPluginSupport: boolean;
-    readonly gpOut: ModelCollection<GpOutputPort>;
+    readonly gpOut: ModelCollection<GpOutputPort | null>;
     laserPwm: number | null;
     logFile: string | null;
     logLevel: LogLevel;

package/dist/volumes/index.d.ts

@@ -1,7 +1,7 @@
 import ModelObject from "../ModelObject";
 export declare class Volume extends ModelObject {
-    capacity: bigint | null;
-    freeSpace: bigint | null;
+    capacity: number | bigint | null;
+    freeSpace: number | bigint | null;
     mounted: boolean;
     name: string | null;
     openFiles: number | null;

package/package.json

@@ -1,30 +1,32 @@
-{
-  "name": "@duet3d/objectmodel",
-  "version": "3.4.0-b9",
-  "description": "TypeScript implementation of the Duet3D Object Model",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "test": "jest --config jestconfig.json",
-    "build": "tsc",
-    "prepare" : "npm run build",
-    "prepublishOnly" : "npm test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Duet3D/ObjectModel.git"
-  },
-  "author": "Christian Hammacher",
-  "license": "LGPL-2.1",
-  "bugs": {
-    "url": "https://github.com/Duet3D/ObjectModel/issues"
-  },
-  "homepage": "https://github.com/Duet3D/ObjectModel#readme",
-  "devDependencies": {
-    "@types/jest": "^27.0.3",
-    "jest": "^27.4.5",
-    "ts-jest": "^27.1.2",
-    "typescript": "^4.5.2"
-  },
-  "files": ["/dist"]
-}
+{
+  "name": "@duet3d/objectmodel",
+  "version": "3.5.0-b1",
+  "description": "TypeScript implementation of the Duet3D Object Model",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "test": "jest --config jestconfig.json",
+    "build": "tsc",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Duet3D/ObjectModel.git"
+  },
+  "author": "Christian Hammacher",
+  "license": "LGPL-2.1",
+  "bugs": {
+    "url": "https://github.com/Duet3D/ObjectModel/issues"
+  },
+  "homepage": "https://github.com/Duet3D/ObjectModel#readme",
+  "devDependencies": {
+    "@types/jest": "^27.5.0",
+    "jest": "^27.5.1",
+    "ts-jest": "^27.1.4",
+    "typescript": "^4.6.4"
+  },
+  "files": [
+    "/dist"
+  ]
+}