@duet3d/objectmodel 3.7.0-beta.8 → 3.7.0-rc.1

package/dist/enums.json

@@ -127,12 +127,12 @@
 		"coreXYUV",
 		"coreXZ",
 		"markForged",
-		"fiveBarScara",
-		"hangprinter",
-		"linearDelta",
-		"polar",
-		"rotaryDelta",
-		"scara",
+		"FiveBarScara",
+		"Hangprinter",
+		"delta",
+		"Polar",
+		"Rotary delta",
+		"Scara",
 		"unknown"
 	],
 	"move.shaping.type": [
@@ -276,7 +276,8 @@
 		"8",
 		"9",
 		"10",
-		"11"
+		"11",
+		"12"
 	],
 	"spindles[].state": [
 		"unconfigured",

package/dist/move/index.d.ts

@@ -43,6 +43,7 @@ export declare class Move extends ModelObject {
     readonly keepout: ModelCollection<KeepoutZone | null>;
     kinematics: Kinematics;
     limitAxes: boolean;
+    minSpeed: number;
     noMovesBeforeHoming: boolean;
     readonly motionSystems: ModelCollection<MotionSystem>;
     /**

package/dist/move/index.js

@@ -57,6 +57,7 @@ export class Move extends ModelObject {
         this.keepout = new ModelCollection(KeepoutZone);
         this.kinematics = new CoreKinematics(KinematicsName.cartesian);
         this.limitAxes = true;
+        this.minSpeed = 30;
         this.noMovesBeforeHoming = true;
         this.motionSystems = new ModelCollection(MotionSystem);
         /**

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/KinematicsBase.d.ts

@@ -6,12 +6,12 @@ export declare enum KinematicsName {
     coreXYUV = "coreXYUV",
     coreXZ = "coreXZ",
     markForged = "markForged",
-    fiveBarScara = "fiveBarScara",
-    hangprinter = "hangprinter",
-    linearDelta = "linearDelta",
-    polar = "polar",
-    rotaryDelta = "rotaryDelta",
-    scara = "scara",
+    fiveBarScara = "FiveBarScara",
+    hangprinter = "Hangprinter",
+    linearDelta = "delta",
+    polar = "Polar",
+    rotaryDelta = "Rotary delta",
+    scara = "Scara",
     unknown = "unknown"
 }
 export declare class MoveSegmentation extends ModelObject {

package/dist/move/kinematics/KinematicsBase.js

@@ -1,4 +1,5 @@
 import ModelObject from "../../ModelObject";
+// Values are the spellings reported by RepRapFirmware, which are inconsistently capitalized
 export var KinematicsName;
 (function (KinematicsName) {
     KinematicsName["cartesian"] = "cartesian";
@@ -7,12 +8,12 @@ export var KinematicsName;
     KinematicsName["coreXYUV"] = "coreXYUV";
     KinematicsName["coreXZ"] = "coreXZ";
     KinematicsName["markForged"] = "markForged";
-    KinematicsName["fiveBarScara"] = "fiveBarScara";
-    KinematicsName["hangprinter"] = "hangprinter";
-    KinematicsName["linearDelta"] = "linearDelta";
-    KinematicsName["polar"] = "polar";
-    KinematicsName["rotaryDelta"] = "rotaryDelta";
-    KinematicsName["scara"] = "scara";
+    KinematicsName["fiveBarScara"] = "FiveBarScara";
+    KinematicsName["hangprinter"] = "Hangprinter";
+    KinematicsName["linearDelta"] = "delta";
+    KinematicsName["polar"] = "Polar";
+    KinematicsName["rotaryDelta"] = "Rotary delta";
+    KinematicsName["scara"] = "Scara";
     KinematicsName["unknown"] = "unknown";
 })(KinematicsName || (KinematicsName = {}));
 export class MoveSegmentation extends ModelObject {

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,14 @@ export declare enum ProbeType {
     unfilteredDigital = 8,
     blTouch = 9,
     zMotorStall = 10,
-    scanningAnalog = 11
+    scanningAnalog = 11,
+    loadCell = 12
+}
+export declare class ProbeLoadCell extends ModelObject {
+    force: number;
+    gramsPerCount: number;
+    preload: number;
+    preloadWindow: Array<number>;
 }
 export declare class ProbeTouchMode extends ModelObject {
     active: boolean;
@@ -31,6 +38,7 @@ export declare class Probe extends ModelObject {
     diveHeights: Array<number>;
     isCalibrated: boolean | null;
     lastStopHeight: number;
+    loadCell: ProbeLoadCell | null;
     maxProbeCount: number;
     measuredHeight: number | null;
     offsets: Array<number>;

package/dist/sensors/Probe.js

@@ -13,7 +13,17 @@ 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 ProbeLoadCell extends ModelObject {
+    constructor() {
+        super(...arguments);
+        this.force = 0;
+        this.gramsPerCount = 0;
+        this.preload = 0;
+        this.preloadWindow = [0, 0];
+    }
+}
 export class ProbeTouchMode extends ModelObject {
     constructor() {
         super(...arguments);
@@ -36,6 +46,7 @@ export class Probe extends ModelObject {
         this.diveHeights = [0, 0];
         this.isCalibrated = null;
         this.lastStopHeight = 0;
+        this.loadCell = null;
         this.maxProbeCount = 1;
         this.measuredHeight = null;
         this.offsets = [0, 0];
@@ -50,6 +61,7 @@ export class Probe extends ModelObject {
         this.triggerHeight = 0.7;
         this.type = ProbeType.none;
         this.value = [];
+        ModelObject.wrapModelProperty(this, "loadCell", ProbeLoadCell);
         ModelObject.wrapModelProperty(this, "touchMode", ProbeTouchMode);
     }
 }

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.8",
+  "version": "3.7.0-rc.1",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",
@@ -18,7 +18,7 @@
     "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",