@duet3d/objectmodel 3.5.0-beta.22 → 3.5.0-beta.24

package/dist/ModelObject.d.ts

@@ -29,7 +29,7 @@ export declare abstract class ModelObject implements IModelObject {
      * @param key Property key of the derived class
      * @param constructor Constructor for creating new elements
      */
-    protected wrapModelProperty<K extends keyof this, T extends IModelObject>(key: K, constructor: {
+    static wrapModelProperty<S extends IModelObject, K extends keyof S, T extends IModelObject>(self: S, key: K, constructor: {
         new (): T;
     }): void;
 }

package/dist/ModelObject.js

@@ -174,9 +174,9 @@ class ModelObject {
      * @param key Property key of the derived class
      * @param constructor Constructor for creating new elements
      */
-    wrapModelProperty(key, constructor) {
-        let propertyValue = this[key];
-        Object.defineProperty(this, key, {
+    static wrapModelProperty(self, key, constructor) {
+        let propertyValue = self[key];
+        Object.defineProperty(self, key, {
             get() { return propertyValue; },
             set(newValue) {
                 if (newValue === null) {

package/dist/boards/index.js

@@ -69,12 +69,12 @@ class Board extends ModelObject_1.default {
         this.v12 = null;
         this.vIn = null;
         this.wifiFirmwareFileName = null;
-        this.wrapModelProperty("accelerometer", Accelerometer);
-        this.wrapModelProperty("closedLoop", ClosedLoop);
-        this.wrapModelProperty("directDisplay", DirectDisplay);
-        this.wrapModelProperty("mcuTemp", MinMaxCurrent);
-        this.wrapModelProperty("v12", MinMaxCurrent);
-        this.wrapModelProperty("vIn", MinMaxCurrent);
+        ModelObject_1.default.wrapModelProperty(this, "accelerometer", Accelerometer);
+        ModelObject_1.default.wrapModelProperty(this, "closedLoop", ClosedLoop);
+        ModelObject_1.default.wrapModelProperty(this, "directDisplay", DirectDisplay);
+        ModelObject_1.default.wrapModelProperty(this, "mcuTemp", MinMaxCurrent);
+        ModelObject_1.default.wrapModelProperty(this, "v12", MinMaxCurrent);
+        ModelObject_1.default.wrapModelProperty(this, "vIn", MinMaxCurrent);
     }
 }
 exports.Board = Board;

package/dist/job/index.js

@@ -59,8 +59,8 @@ class Job extends ModelObject_1.default {
         this.rawExtrusion = null;
         this.timesLeft = new TimesLeft();
         this.warmUpDuration = null;
-        this.wrapModelProperty("build", Build_1.default);
-        this.wrapModelProperty("file", GCodeFileInfo_1.default);
+        ModelObject_1.default.wrapModelProperty(this, "build", Build_1.default);
+        ModelObject_1.default.wrapModelProperty(this, "file", GCodeFileInfo_1.default);
     }
 }
 exports.Job = Job;

package/dist/move/Extruder.js

@@ -32,7 +32,7 @@ class Extruder extends ModelObject_1.default {
         this.rawPosition = 0;
         this.speed = 100;
         this.stepsPerMm = 420;
-        this.wrapModelProperty("driver", DriverId_1.default);
+        ModelObject_1.default.wrapModelProperty(this, "driver", DriverId_1.default);
     }
 }
 exports.Extruder = Extruder;

package/dist/move/MoveCompensation.js

@@ -39,8 +39,8 @@ class MoveCompensation extends ModelObject_1.default {
         this.probeGrid = new ProbeGrid();
         this.skew = new Skew();
         this.type = MoveCompensationType.none;
-        this.wrapModelProperty("liveGrid", ProbeGrid);
-        this.wrapModelProperty("meshDeviation", MoveCalibration_1.MoveDeviations);
+        ModelObject_1.default.wrapModelProperty(this, "liveGrid", ProbeGrid);
+        ModelObject_1.default.wrapModelProperty(this, "meshDeviation", MoveCalibration_1.MoveDeviations);
     }
 }
 exports.MoveCompensation = MoveCompensation;

package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js

@@ -30,7 +30,7 @@ class LaserFilamentMonitor extends FilamentMonitorBase_1.default {
         super(FilamentMonitorBase_1.FilamentMonitorType.laser);
         this.calibrated = new LaserFilamentMonitorCalibrated();
         this.configured = new LaserFilamentMonitorConfigured();
-        this.wrapModelProperty("calibrated", LaserFilamentMonitorCalibrated);
+        ModelObject_1.default.wrapModelProperty(this, "calibrated", LaserFilamentMonitorCalibrated);
     }
     update(jsonElement) {
         if (jsonElement === null) {

package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.js

@@ -29,7 +29,7 @@ class PulsedFilamentMonitor extends FilamentMonitorBase_1.default {
         super(FilamentMonitorBase_1.FilamentMonitorType.pulsed);
         this.calibrated = new PulsedFilamentMonitorCalibrated();
         this.configured = new PulsedFilamentMonitorConfigured();
-        this.wrapModelProperty("calibrated", PulsedFilamentMonitorCalibrated);
+        ModelObject_1.default.wrapModelProperty(this, "calibrated", PulsedFilamentMonitorCalibrated);
     }
     update(jsonElement) {
         if (jsonElement === null) {

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js

@@ -30,7 +30,7 @@ class RotatingMagnetFilamentMonitor extends FilamentMonitorBase_1.default {
         super(FilamentMonitorBase_1.FilamentMonitorType.rotatingMagnet);
         this.calibrated = new RotatingMagnetFilamentMonitorCalibrated();
         this.configured = new RotatingMagnetFilamentMonitorConfigured();
-        this.wrapModelProperty("calibrated", RotatingMagnetFilamentMonitorCalibrated);
+        ModelObject_1.default.wrapModelProperty(this, "calibrated", RotatingMagnetFilamentMonitorCalibrated);
     }
     update(jsonElement) {
         if (jsonElement === null) {

package/dist/state/index.d.ts

@@ -7,6 +7,11 @@ export declare class BeepRequest extends ModelObject {
     duration: number;
     frequency: number;
 }
+export declare class ConfigErr extends ModelObject {
+    file: string | null;
+    line: number;
+    message: string;
+}
 export declare class GpOutputPort extends ModelObject {
     freq: number;
     pwm: number;
@@ -27,6 +32,7 @@ export declare class State extends ModelObject {
     atxPower: boolean | null;
     atxPowerPort: string | null;
     beep: BeepRequest | null;
+    configErr: ConfigErr | null;
     currentTool: number;
     deferredPowerDown: boolean | null;
     displayMessage: string;

package/dist/state/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.State = exports.MachineMode = exports.LogLevel = exports.GpOutputPort = exports.BeepRequest = void 0;
+exports.State = exports.MachineMode = exports.LogLevel = exports.GpOutputPort = exports.ConfigErr = exports.BeepRequest = void 0;
 const ModelObject_1 = require("../ModelObject");
 const ModelCollection_1 = require("../ModelCollection");
 const MessageBox_1 = require("./MessageBox");
@@ -28,6 +28,15 @@ class BeepRequest extends ModelObject_1.default {
     }
 }
 exports.BeepRequest = BeepRequest;
+class ConfigErr extends ModelObject_1.default {
+    constructor() {
+        super(...arguments);
+        this.file = null;
+        this.line = -1;
+        this.message = "";
+    }
+}
+exports.ConfigErr = ConfigErr;
 class GpOutputPort extends ModelObject_1.default {
     constructor() {
         super(...arguments);
@@ -55,6 +64,7 @@ class State extends ModelObject_1.default {
         this.atxPower = null;
         this.atxPowerPort = null;
         this.beep = null;
+        this.configErr = null;
         this.currentTool = -1;
         this.deferredPowerDown = null;
         this.displayMessage = "";
@@ -78,8 +88,9 @@ class State extends ModelObject_1.default {
         this.thisInput = null;
         this.time = null;
         this.upTime = 0;
-        this.wrapModelProperty("beep", BeepRequest);
-        this.wrapModelProperty("messageBox", MessageBox_1.default);
+        ModelObject_1.default.wrapModelProperty(this, "beep", BeepRequest);
+        ModelObject_1.default.wrapModelProperty(this, "configErr", ConfigErr);
+        ModelObject_1.default.wrapModelProperty(this, "messageBox", MessageBox_1.default);
     }
 }
 exports.State = State;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.5.0-beta.22",
+  "version": "3.5.0-beta.24",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",