@duet3d/objectmodel 3.7.0-beta.10 → 3.7.0-beta.12

package/dist/ModelCollection.d.ts

@@ -1,4 +1,8 @@
 import type { IModelObject } from "./ModelObject";
+/**
+ * Factory creating the item for a given index
+ */
+export type ItemFactory<T> = (index: number) => T;
 /**
  * Class for storing model object items in an array
  */
@@ -6,10 +10,11 @@ export declare class ModelCollection<T extends IModelObject | null> extends Arra
     /**
      * Constructor of this class
      * @param itemConstructor Item constructor type that items must derive from
+     * @param itemFactory Factory to use for collections whose item class depends on the position, e.g. boards
      */
     constructor(itemConstructor: {
         new (): T;
-    });
+    }, itemFactory?: ItemFactory<T> | null);
     /**
      * Overridden push method to perform better type checks
      * @param items Items to add

package/dist/ModelCollection.js

@@ -1,4 +1,15 @@
 import { isModelObject } from "./ModelObject";
+/**
+ * Create the item for a given index. This is deliberately not a method of the collection because
+ * a non-public member would make the class nominally typed, which breaks assignability of the
+ * reactive proxies consumers wrap the object model in
+ * @param collection Collection the item is created for
+ * @param index Index the new item is going to be stored at
+ * @returns New item
+ */
+function createItem(collection, index) {
+    return (collection.$itemFactory !== null) ? collection.$itemFactory(index) : new collection.$itemConstructor();
+}
 /**
  * Class for storing model object items in an array
  */
@@ -6,11 +17,13 @@ export class ModelCollection extends Array {
     /**
      * Constructor of this class
      * @param itemConstructor Item constructor type that items must derive from
+     * @param itemFactory Factory to use for collections whose item class depends on the position, e.g. boards
      */
-    constructor(itemConstructor) {
+    constructor(itemConstructor, itemFactory = null) {
         super();
         Object.setPrototypeOf(this, ModelCollection.prototype);
         Object.defineProperty(this, "$itemConstructor", { enumerable: false, value: itemConstructor });
+        Object.defineProperty(this, "$itemFactory", { enumerable: false, value: itemFactory });
     }
     // Unfortunately it isn't possible to override index operators in JS/TS
     /**
@@ -24,7 +37,7 @@ export class ModelCollection extends Array {
                 super.push(item);
             }
             else {
-                const newItem = new that.$itemConstructor();
+                const newItem = createItem(that, this.length);
                 super.push(newItem.update(item));
             }
         }
@@ -55,7 +68,7 @@ export class ModelCollection extends Array {
                     this[i] = jsonElement[i];
                 }
                 else {
-                    const refItem = new that.$itemConstructor();
+                    const refItem = createItem(that, i);
                     this[i] = refItem.update(newItem, authoritative);
                 }
             }
@@ -79,7 +92,7 @@ export class ModelCollection extends Array {
                 super.push(itemToAdd);
             }
             else {
-                const newItem = new that.$itemConstructor();
+                const newItem = createItem(that, i);
                 super.push(newItem.update(itemToAdd, authoritative));
             }
         }

package/dist/ObjectModel.js

@@ -1,7 +1,7 @@
 import ModelCollection from "./ModelCollection";
 import ModelDictionary from "./ModelDictionary";
 import ModelObject from "./ModelObject";
-import Board from "./boards";
+import Board, { getBoard } from "./boards";
 import Directories from "./directories";
 import Fan from "./fans";
 import Heat from "./heat";
@@ -25,7 +25,7 @@ import LedStrip from "./ledStrips";
 export class ObjectModel extends ModelObject {
     constructor() {
         super();
-        this.boards = new ModelCollection(Board);
+        this.boards = new ModelCollection(Board, getBoard);
         this.directories = new Directories();
         this.fans = new ModelCollection(Fan);
         this.global = new ModelDictionary(false);

package/dist/boards/directDisplay/DirectDisplayScreen.d.ts

@@ -1,6 +1,6 @@
 import type { IModelObject } from "../../ModelObject";
 import DirectDisplayScreenBase from "./DirectDisplayScreenBase";
 export declare class DirectDisplayScreen extends DirectDisplayScreenBase {
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default DirectDisplayScreen;

package/dist/boards/directDisplay/DirectDisplayScreen.js

@@ -1,14 +1,14 @@
 import { getDirectDisplayScreen } from ".";
 import DirectDisplayScreenBase from "./DirectDisplayScreenBase";
 export class DirectDisplayScreen extends DirectDisplayScreenBase {
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
         if (typeof jsonElement.controller === "string" && jsonElement.controller !== this.controller) {
-            return getDirectDisplayScreen(jsonElement.controller).update(jsonElement);
+            return getDirectDisplayScreen(jsonElement.controller).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default DirectDisplayScreen;

package/dist/boards/directDisplay/DirectDisplayScreenST7567.d.ts

@@ -4,6 +4,6 @@ export declare class DirectDisplayScreenST7567 extends DirectDisplayScreenBase {
     constructor();
     contrast: number;
     resistorRatio: number;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default DirectDisplayScreenST7567;

package/dist/boards/directDisplay/DirectDisplayScreenST7567.js

@@ -6,14 +6,14 @@ export class DirectDisplayScreenST7567 extends DirectDisplayScreenBase {
         this.contrast = 30;
         this.resistorRatio = 6;
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
         if (typeof jsonElement.controller === "string" && jsonElement.controller !== this.controller) {
-            return getDirectDisplayScreen(jsonElement.controller).update(jsonElement);
+            return getDirectDisplayScreen(jsonElement.controller).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default DirectDisplayScreenST7567;

package/dist/boards/index.d.ts

@@ -30,30 +30,43 @@ export declare class Board extends ModelObject {
     constructor();
     accelerometer: Accelerometer | null;
     canAddress: number | null;
-    closedLoop: BoardClosedLoop | null;
-    directDisplay: DirectDisplay | null;
     drivers: ModelCollection<Driver> | null;
     firmwareDate: string;
     firmwareFileName: string;
-    firmwareName: string;
     firmwareVersion: string;
     freeRam: number | null;
-    iapFileNameSBC: string | null;
-    iapFileNameSD: string | null;
-    inductiveSensor: InductiveSensor | null;
-    maxHeaters: number;
     maxMotors: number;
     mcuTemp: MinMaxCurrent | null;
     name: string;
     shortName: string;
-    state: BoardState;
-    supportsDirectDisplay: boolean;
-    timeout: number;
     uniqueId: string | null;
     v12: MinMaxCurrent | null;
     vIn: MinMaxCurrent | null;
+}
+export declare class MainBoard extends Board {
+    constructor();
+    directDisplay: DirectDisplay | null;
+    firmwareName: string;
+    iapFileNameSBC: string | null;
+    iapFileNameSD: string | null;
+    maxHeaters: number;
+    supportsDirectDisplay: boolean;
     wifiFirmwareFileName: string | null;
 }
+export declare class ExpansionBoard extends Board {
+    constructor();
+    closedLoop: BoardClosedLoop | null;
+    inductiveSensor: InductiveSensor | null;
+    state: BoardState;
+    timeout: number;
+}
 export default Board;
+/**
+ * Create the board instance for a given index. The first item is always the mainboard,
+ * every other item is an expansion board connected over CAN
+ * @param index Index in the boards array
+ * @returns New board instance
+ */
+export declare function getBoard(index: number): Board;
 export * from "./directDisplay";
 export * from "./Driver";

package/dist/boards/index.js

@@ -41,39 +41,58 @@ export class Board extends ModelObject {
         super();
         this.accelerometer = null;
         this.canAddress = null;
-        this.closedLoop = null;
-        this.directDisplay = null;
         this.drivers = null;
         this.firmwareDate = "";
         this.firmwareFileName = "";
-        this.firmwareName = "";
         this.firmwareVersion = "";
         this.freeRam = null;
-        this.iapFileNameSBC = null;
-        this.iapFileNameSD = null;
-        this.inductiveSensor = null;
-        this.maxHeaters = 0;
         this.maxMotors = 0;
         this.mcuTemp = null;
         this.name = "";
         this.shortName = "";
-        this.state = BoardState.unknown;
-        this.supportsDirectDisplay = false;
-        this.timeout = 10;
         this.uniqueId = null;
         this.v12 = null;
         this.vIn = null;
-        this.wifiFirmwareFileName = null;
         ModelObject.wrapModelProperty(this, "accelerometer", Accelerometer);
-        ModelObject.wrapModelProperty(this, "closedLoop", BoardClosedLoop);
-        ModelObject.wrapModelProperty(this, "directDisplay", DirectDisplay);
         ModelObject.wrapModelCollectionProperty(this, "drivers", Driver);
-        ModelObject.wrapModelProperty(this, "inductiveSensor", InductiveSensor);
         ModelObject.wrapModelProperty(this, "mcuTemp", MinMaxCurrent);
         ModelObject.wrapModelProperty(this, "v12", MinMaxCurrent);
         ModelObject.wrapModelProperty(this, "vIn", MinMaxCurrent);
     }
 }
+export class MainBoard extends Board {
+    constructor() {
+        super();
+        this.directDisplay = null;
+        this.firmwareName = "";
+        this.iapFileNameSBC = null;
+        this.iapFileNameSD = null;
+        this.maxHeaters = 0;
+        this.supportsDirectDisplay = false;
+        this.wifiFirmwareFileName = null;
+        ModelObject.wrapModelProperty(this, "directDisplay", DirectDisplay);
+    }
+}
+export class ExpansionBoard extends Board {
+    constructor() {
+        super();
+        this.closedLoop = null;
+        this.inductiveSensor = null;
+        this.state = BoardState.unknown;
+        this.timeout = 10;
+        ModelObject.wrapModelProperty(this, "closedLoop", BoardClosedLoop);
+        ModelObject.wrapModelProperty(this, "inductiveSensor", InductiveSensor);
+    }
+}
 export default Board;
+/**
+ * Create the board instance for a given index. The first item is always the mainboard,
+ * every other item is an expansion board connected over CAN
+ * @param index Index in the boards array
+ * @returns New board instance
+ */
+export function getBoard(index) {
+    return (index === 0) ? new MainBoard() : new ExpansionBoard();
+}
 export * from "./directDisplay";
 export * from "./Driver";

package/dist/documentation.json

@@ -47,14 +47,8 @@
 	"boards[].firmwareName": "Name of the firmware build",
 	"boards[].firmwareVersion": "Version of the firmware build",
 	"boards[].freeRam": "Amount of free RAM on this board (in bytes or null if unknown)",
-	"boards[].iapFileNameSBC": {
-		"summary": "Filename of the IAP binary that is used for updates from the SBC or null if unsupported",
-		"remarks": "This is only available for the mainboard (first board item)"
-	},
-	"boards[].iapFileNameSD": {
-		"summary": "Filename of the IAP binary that is used for updates from the SD card or null if unsupported",
-		"remarks": "This is only available for the mainboard (first board item)"
-	},
+	"boards[].iapFileNameSBC": "Filename of the IAP binary that is used for updates from the SBC or null if unsupported",
+	"boards[].iapFileNameSD": "Filename of the IAP binary that is used for updates from the SD card or null if unsupported",
 	"boards[].inductiveSensor": "Information about an inductive sensor or null if not present",
 	"boards[].maxHeaters": "Maximum number of heaters this board can control",
 	"boards[].maxMotors": "Maximum number of motors this board can drive",
@@ -1010,7 +1004,8 @@
 			"8": "A switch that is triggered when the probe is activated (unfiltered)",
 			"9": "A BLTouch probe",
 			"10": "Z motor stall detection",
-			"11": "Analog scanning probe"
+			"11": "Analog scanning probe",
+			"12": null
 		}
 	},
 	"sensors.probes[].value": "Current analog values of the probe",

package/dist/enums.json

@@ -276,7 +276,8 @@
 		"8",
 		"9",
 		"10",
-		"11"
+		"11",
+		"12"
 	],
 	"spindles[].state": [
 		"unconfigured",

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

@@ -4,6 +4,6 @@ export declare class CoreKinematics extends ZLeadscrewKinematics {
     constructor(name: KinematicsName);
     forwardMatrix: Array<Array<number>>;
     inverseMatrix: Array<Array<number>>;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default CoreKinematics;

package/dist/move/kinematics/CoreKinematics.js

@@ -14,14 +14,14 @@ export class CoreKinematics extends ZLeadscrewKinematics {
             [0, 0, 1]
         ];
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             throw new Error("Kinematics must not be null");
         }
         if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
-            return getKinematics(jsonElement.name).update(jsonElement);
+            return getKinematics(jsonElement.name).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default CoreKinematics;

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

@@ -16,6 +16,6 @@ export declare class DeltaKinematics extends KinematicsBase {
     readonly towers: ModelCollection<DeltaTower>;
     xTilt: number;
     yTilt: number;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default DeltaKinematics;

package/dist/move/kinematics/DeltaKinematics.js

@@ -22,14 +22,14 @@ export class DeltaKinematics extends KinematicsBase {
         this.xTilt = 0;
         this.yTilt = 0;
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             throw new Error("Kinematics must not be null");
         }
         if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
-            return getKinematics(jsonElement.name).update(jsonElement);
+            return getKinematics(jsonElement.name).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default DeltaKinematics;

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

@@ -4,6 +4,6 @@ export declare class HangprinterKinematics extends KinematicsBase {
     anchors: Array<Array<number>>;
     printRadius: number;
     constructor();
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default HangprinterKinematics;

package/dist/move/kinematics/HangprinterKinematics.js

@@ -11,14 +11,14 @@ export class HangprinterKinematics extends KinematicsBase {
         ];
         this.printRadius = 1500;
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             throw new Error("Kinematics must not be null");
         }
         if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
-            return getKinematics(jsonElement.name).update(jsonElement);
+            return getKinematics(jsonElement.name).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default HangprinterKinematics;

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

@@ -7,6 +7,6 @@ export declare class PolarKinematics extends KinematicsBase {
     radiusMin: number;
     ttAccMax: number;
     ttSpeedMax: number;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default PolarKinematics;

package/dist/move/kinematics/PolarKinematics.js

@@ -9,14 +9,14 @@ export class PolarKinematics extends KinematicsBase {
         this.ttAccMax = 0;
         this.ttSpeedMax = 0;
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             throw new Error("Kinematics must not be null");
         }
         if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
-            return getKinematics(jsonElement.name).update(jsonElement);
+            return getKinematics(jsonElement.name).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default PolarKinematics;

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

@@ -9,6 +9,6 @@ export declare class ScaraKinematics extends ZLeadscrewKinematics {
     thetaLimits: number[];
     xOffset: number;
     yOffset: number;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default ScaraKinematics;

package/dist/move/kinematics/ScaraKinematics.js

@@ -12,14 +12,14 @@ export class ScaraKinematics extends ZLeadscrewKinematics {
         this.xOffset = 0;
         this.yOffset = 0;
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             throw new Error("Kinematics must not be null");
         }
         if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
-            return getKinematics(jsonElement.name).update(jsonElement);
+            return getKinematics(jsonElement.name).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default ScaraKinematics;

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

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

package/dist/move/kinematics/index.js

@@ -8,14 +8,14 @@ export class Kinematics extends KinematicsBase {
     constructor(name = KinematicsName.cartesian) {
         super(name);
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             throw new Error("Kinematics must not be null");
         }
         if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
-            return getKinematics(jsonElement.name).update(jsonElement);
+            return getKinematics(jsonElement.name).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default Kinematics;

package/dist/plugins/PluginManifest.d.ts

@@ -64,6 +64,6 @@ export declare class PluginManifest extends ModelObject {
     rrfVersion: string | null;
     data: Map<string, any>;
     static checkVersion(actual: string, required: string): boolean;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default PluginManifest;

package/dist/plugins/PluginManifest.js

@@ -109,14 +109,14 @@ export class PluginManifest extends ModelObject {
         }
         return true;
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (typeof jsonElement.data === "object") {
             for (const key in jsonElement.data) {
                 this.data.set(key, jsonElement.data[key]);
             }
             delete jsonElement.data;
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default PluginManifest;

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

@@ -18,6 +18,6 @@ export declare class LaserFilamentMonitor extends Duet3DFilamentMonitor {
     constructor();
     calibrated: LaserFilamentMonitorCalibrated | null;
     readonly configured: LaserFilamentMonitorConfigured;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default LaserFilamentMonitor;

package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js

@@ -28,14 +28,14 @@ export class LaserFilamentMonitor extends Duet3DFilamentMonitor {
         this.configured = new LaserFilamentMonitorConfigured();
         ModelObject.wrapModelProperty(this, "calibrated", LaserFilamentMonitorCalibrated);
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
         if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
-            return getFilamentMonitor(jsonElement.type).update(jsonElement);
+            return getFilamentMonitor(jsonElement.type).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default LaserFilamentMonitor;

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

@@ -18,6 +18,6 @@ export declare class PulsedFilamentMonitor extends FilamentMonitorBase {
     calibrated: PulsedFilamentMonitorCalibrated | null;
     readonly configured: PulsedFilamentMonitorConfigured;
     position: number;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default PulsedFilamentMonitor;

package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.js

@@ -27,14 +27,14 @@ export class PulsedFilamentMonitor extends FilamentMonitorBase {
         this.position = 0;
         ModelObject.wrapModelProperty(this, "calibrated", PulsedFilamentMonitorCalibrated);
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
         if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
-            return getFilamentMonitor(jsonElement.type).update(jsonElement);
+            return getFilamentMonitor(jsonElement.type).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default PulsedFilamentMonitor;

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

@@ -19,6 +19,6 @@ export declare class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor
     agc: number | null;
     calibrated: RotatingMagnetFilamentMonitorCalibrated | null;
     readonly configured: RotatingMagnetFilamentMonitorConfigured;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default RotatingMagnetFilamentMonitor;

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js

@@ -29,14 +29,14 @@ export class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor {
         this.configured = new RotatingMagnetFilamentMonitorConfigured();
         ModelObject.wrapModelProperty(this, "calibrated", RotatingMagnetFilamentMonitorCalibrated);
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
         if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
-            return getFilamentMonitor(jsonElement.type).update(jsonElement);
+            return getFilamentMonitor(jsonElement.type).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default RotatingMagnetFilamentMonitor;

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

@@ -1,7 +1,7 @@
 import type { IModelObject } from "../../ModelObject";
 import FilamentMonitorBase, { FilamentMonitorType } from "./FilamentMonitorBase";
 export declare class FilamentMonitor extends FilamentMonitorBase {
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default FilamentMonitor;
 export declare function getFilamentMonitor(type: FilamentMonitorType): FilamentMonitorBase;

package/dist/sensors/FilamentMonitors/index.js

@@ -3,14 +3,14 @@ import LaserFilamentMonitor from "./LaserFilamentMonitor";
 import PulsedFilamentMonitor from "./PulsedFilamentMonitor";
 import RotatingMagnetFilamentMonitor from "./RotatingMagnetFilamentMonitor";
 export class FilamentMonitor extends FilamentMonitorBase {
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
         if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
-            return getFilamentMonitor(jsonElement.type).update(jsonElement);
+            return getFilamentMonitor(jsonElement.type).update(jsonElement, authoritative);
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default FilamentMonitor;

package/dist/sensors/Probe.d.ts

@@ -11,7 +11,8 @@ export declare enum ProbeType {
     unfilteredDigital = 8,
     blTouch = 9,
     zMotorStall = 10,
-    scanningAnalog = 11
+    scanningAnalog = 11,
+    loadCell = 12
 }
 export declare class ProbeTouchMode extends ModelObject {
     active: boolean;
@@ -29,6 +30,8 @@ export declare class Probe extends ModelObject {
      */
     diveHeight: number;
     diveHeights: Array<number>;
+    force: number | null;
+    gramsPerCount: number | null;
     isCalibrated: boolean | null;
     lastStopHeight: number;
     maxProbeCount: number;

package/dist/sensors/Probe.js

@@ -13,6 +13,7 @@ export var ProbeType;
     ProbeType[ProbeType["blTouch"] = 9] = "blTouch";
     ProbeType[ProbeType["zMotorStall"] = 10] = "zMotorStall";
     ProbeType[ProbeType["scanningAnalog"] = 11] = "scanningAnalog";
+    ProbeType[ProbeType["loadCell"] = 12] = "loadCell";
 })(ProbeType || (ProbeType = {}));
 export class ProbeTouchMode extends ModelObject {
     constructor() {
@@ -34,6 +35,8 @@ export class Probe extends ModelObject {
          */
         this.diveHeight = 5;
         this.diveHeights = [0, 0];
+        this.force = null;
+        this.gramsPerCount = null;
         this.isCalibrated = null;
         this.lastStopHeight = 0;
         this.maxProbeCount = 1;

package/dist/state/MessageBox.d.ts

@@ -22,6 +22,6 @@ export declare class MessageBox extends ModelObject {
     seq: number;
     timeout: number;
     title: string;
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default MessageBox;

package/dist/state/MessageBox.js

@@ -25,11 +25,11 @@ export class MessageBox extends ModelObject {
         this.timeout = 0;
         this.title = "";
     }
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement instanceof Object && (typeof jsonElement.default === "number" || typeof jsonElement.default === "string")) {
             this.default = jsonElement.default;
         }
-        return super.update(jsonElement);
+        return super.update(jsonElement, authoritative);
     }
 }
 export default MessageBox;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-beta.10",
+  "version": "3.7.0-beta.12",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",