@duet3d/objectmodel 3.5.0-b1 → 3.5.0-b11

package/dist/ModelDictionary.js

@@ -57,6 +57,11 @@ class ModelDictionary extends Map {
         if (jsonElement === null) {
             this.clear();
         }
+        else if (jsonElement instanceof Map) {
+            for (const [key, value] of jsonElement.entries()) {
+                this.set(key, value);
+            }
+        }
         else {
             for (const [key, value] of Object.entries(jsonElement)) {
                 this.set(key, value);

package/dist/ModelObject.js

@@ -137,6 +137,22 @@ class ModelObject {
                             console.warn(`Incompatible string target type ${typeof value} for property ${key}`);
                         }
                     }
+                    else if (propType === "function") {
+                        if (typeof value === "function") {
+                            this[ownKey] = value;
+                        }
+                        else if (process.env.NODE_ENV !== "production") {
+                            console.warn(`Incompatible function target type ${typeof value} for property ${key}`);
+                        }
+                    }
+                    else if (propType === "object") {
+                        if (typeof value === "object") {
+                            this[ownKey] = value;
+                        }
+                        else if (process.env.NODE_ENV !== "production") {
+                            console.warn(`Incompatible object target type ${typeof value} for property ${key}`);
+                        }
+                    }
                     else if (process.env.NODE_ENV !== "production") {
                         console.warn(`Incompatible type ${propType} for property ${key} (${typeof value})`);
                     }

package/dist/ObjectModel.d.ts

@@ -13,7 +13,6 @@ import Message from "./messages";
 import Move from "./move";
 import Network from "./network";
 import Plugin from "./plugins";
-import Scanner from "./scanner";
 import Sensors from "./sensors";
 import Spindle from "./spindles";
 import State from "./state";
@@ -37,7 +36,6 @@ export declare class ObjectModel extends ModelObject {
     readonly move: Move;
     readonly network: Network;
     readonly plugins: ModelDictionary<Plugin>;
-    readonly scanner: Scanner;
     readonly sensors: Sensors;
     readonly spindles: ModelCollection<Spindle | null>;
     readonly state: State;

package/dist/ObjectModel.js

@@ -16,7 +16,6 @@ const messages_1 = require("./messages");
 const move_1 = require("./move");
 const network_1 = require("./network");
 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");
@@ -42,7 +41,6 @@ class ObjectModel extends ModelObject_1.default {
         this.move = new move_1.default();
         this.network = new network_1.default();
         this.plugins = new ModelDictionary_1.default(true, plugins_1.default);
-        this.scanner = new scanner_1.default();
         this.sensors = new sensors_1.default();
         this.spindles = new ModelCollection_1.default(spindles_1.default);
         this.state = new state_1.default();

package/dist/boards/index.d.ts

@@ -33,6 +33,7 @@ export declare class Board extends ModelObject {
     directDisplay: DirectDisplay | null;
     firmwareDate: string;
     firmwareFileName: string;
+    firmwareName: string;
     firmwareVersion: string;
     iapFileNameSBC: string | null;
     iapFileNameSD: string | null;

package/dist/boards/index.js

@@ -54,6 +54,7 @@ class Board extends ModelObject_1.default {
         this.directDisplay = null;
         this.firmwareDate = "";
         this.firmwareFileName = "";
+        this.firmwareName = "";
         this.firmwareVersion = "";
         this.iapFileNameSBC = null;
         this.iapFileNameSD = null;

package/dist/index.d.ts

@@ -2,7 +2,6 @@ export * from "./ModelCollection";
 export * from "./ModelDictionary";
 export * from "./ModelObject";
 export * from "./boards";
-export * from "./state";
 export * from "./directories";
 export * from "./fans";
 export * from "./heat";
@@ -14,9 +13,9 @@ export * from "./messages";
 export * from "./move";
 export * from "./network";
 export * from "./plugins";
-export * from "./scanner";
 export * from "./sensors";
 export * from "./spindles";
+export * from "./state";
 export * from "./tools";
 export * from "./userSessions";
 export * from "./volumes";

package/dist/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./ModelCollection"), exports);
 __exportStar(require("./ModelDictionary"), exports);
 __exportStar(require("./ModelObject"), exports);
 __exportStar(require("./boards"), exports);
-__exportStar(require("./state"), exports);
 __exportStar(require("./directories"), exports);
 __exportStar(require("./fans"), exports);
 __exportStar(require("./heat"), exports);
@@ -32,9 +31,9 @@ __exportStar(require("./messages"), exports);
 __exportStar(require("./move"), exports);
 __exportStar(require("./network"), exports);
 __exportStar(require("./plugins"), exports);
-__exportStar(require("./scanner"), exports);
 __exportStar(require("./sensors"), exports);
 __exportStar(require("./spindles"), exports);
+__exportStar(require("./state"), exports);
 __exportStar(require("./tools"), exports);
 __exportStar(require("./userSessions"), exports);
 __exportStar(require("./volumes"), exports);
@@ -46,6 +45,8 @@ exports.default = ObjectModel_1.default;
 // This will become obsolete as soon as DWC is upgraded to Vue 3, but that isn't going to happen anytime soon.
 // Until then a Vue 2 user would have to call something like this on initialization to work around this limitation:
 // globalThis._duetModelSetArray = (array, index, value) => Vue.set(array, index, value);
+// or in TypeScript
+// (globalThis as any)._duetModelSetArray = (array: object, index: string | number, value: any) => Vue.set(array, index, value);
 globalThis._duetModelSetArray = (array, index, value) => array[index] = value;
 function setArrayItem(array, index, value) {
     globalThis._duetModelSetArray(array, index, value);

package/dist/inputs/CodeChannel.d.ts

@@ -11,6 +11,8 @@ export declare enum CodeChannel {
     daemon = 9,
     aux2 = 10,
     autopause = 11,
-    unknown = 12
+    file2 = 12,
+    queue2 = 13,
+    unknown = 14
 }
 export default CodeChannel;

package/dist/inputs/CodeChannel.js

@@ -15,6 +15,8 @@ var CodeChannel;
     CodeChannel[CodeChannel["daemon"] = 9] = "daemon";
     CodeChannel[CodeChannel["aux2"] = 10] = "aux2";
     CodeChannel[CodeChannel["autopause"] = 11] = "autopause";
-    CodeChannel[CodeChannel["unknown"] = 12] = "unknown";
+    CodeChannel[CodeChannel["file2"] = 12] = "file2";
+    CodeChannel[CodeChannel["queue2"] = 13] = "queue2";
+    CodeChannel[CodeChannel["unknown"] = 14] = "unknown";
 })(CodeChannel = exports.CodeChannel || (exports.CodeChannel = {}));
 exports.default = CodeChannel;

package/dist/job/index.d.ts

@@ -12,7 +12,6 @@ export declare class Layer extends ModelObject {
 export declare class TimesLeft extends ModelObject {
     filament: number | null;
     file: number | null;
-    layer: number | null;
     slicer: number | null;
 }
 export declare class Job extends ModelObject {

package/dist/job/index.js

@@ -35,7 +35,6 @@ class TimesLeft extends ModelObject_1.default {
         super(...arguments);
         this.filament = null;
         this.file = null;
-        this.layer = null;
         this.slicer = null;
     }
 }

package/dist/move/index.d.ts

@@ -9,6 +9,7 @@ import Kinematics from "./kinematics";
 export declare class CurrentMove extends ModelObject {
     acceleration: number;
     deceleration: number;
+    extrusionRate: number;
     laserPwm: number | null;
     requestedSpeed: number;
     topSpeed: number;
@@ -30,6 +31,7 @@ export declare class Move extends ModelObject {
     readonly calibration: MoveCalibration;
     readonly compensation: MoveCompensation;
     readonly currentMove: CurrentMove;
+    currentZHop: number;
     readonly extruders: ModelCollection<Extruder>;
     readonly idle: MotorsIdleControl;
     kinematics: Kinematics;

package/dist/move/index.js

@@ -28,6 +28,7 @@ class CurrentMove extends ModelObject_1.default {
         super(...arguments);
         this.acceleration = 0;
         this.deceleration = 0;
+        this.extrusionRate = 0;
         this.laserPwm = null;
         this.requestedSpeed = 0;
         this.topSpeed = 0;
@@ -65,6 +66,7 @@ class Move extends ModelObject_1.default {
         this.calibration = new MoveCalibration_1.default();
         this.compensation = new MoveCompensation_1.default();
         this.currentMove = new CurrentMove();
+        this.currentZHop = 0;
         this.extruders = new ModelCollection_1.default(Extruder_1.default);
         this.idle = new MotorsIdleControl();
         this.kinematics = new kinematics_1.default();

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

@@ -1,17 +1,17 @@
 import ModelObject from "../../ModelObject";
 export declare enum KinematicsName {
     cartesian = "cartesian",
-    coreXY = "corexy",
-    coreXYU = "corexyu",
-    coreXYUV = "corexyuv",
-    coreXZ = "corexz",
-    markForged = "markforged",
-    fiveBarScara = "fivebarscara",
-    hangprinter = "hangprinter",
+    coreXY = "coreXY",
+    coreXYU = "coreXYU",
+    coreXYUV = "coreXYUV",
+    coreXZ = "coreXZ",
+    markForged = "markForged",
+    fiveBarScara = "FiveBarScara",
+    hangprinter = "Hangprinter",
     delta = "delta",
-    polar = "polar",
-    rotaryDelta = "rotary delta",
-    scara = "scara",
+    polar = "Polar",
+    rotaryDelta = "Rotary delta",
+    scara = "Scara",
     unknown = "unknown"
 }
 export declare class MoveSegmentation extends ModelObject {

package/dist/move/kinematics/KinematicsBase.js

@@ -5,17 +5,17 @@ const ModelObject_1 = require("../../ModelObject");
 var KinematicsName;
 (function (KinematicsName) {
     KinematicsName["cartesian"] = "cartesian";
-    KinematicsName["coreXY"] = "corexy";
-    KinematicsName["coreXYU"] = "corexyu";
-    KinematicsName["coreXYUV"] = "corexyuv";
-    KinematicsName["coreXZ"] = "corexz";
-    KinematicsName["markForged"] = "markforged";
-    KinematicsName["fiveBarScara"] = "fivebarscara";
-    KinematicsName["hangprinter"] = "hangprinter";
+    KinematicsName["coreXY"] = "coreXY";
+    KinematicsName["coreXYU"] = "coreXYU";
+    KinematicsName["coreXYUV"] = "coreXYUV";
+    KinematicsName["coreXZ"] = "coreXZ";
+    KinematicsName["markForged"] = "markForged";
+    KinematicsName["fiveBarScara"] = "FiveBarScara";
+    KinematicsName["hangprinter"] = "Hangprinter";
     KinematicsName["delta"] = "delta";
-    KinematicsName["polar"] = "polar";
-    KinematicsName["rotaryDelta"] = "rotary delta";
-    KinematicsName["scara"] = "scara";
+    KinematicsName["polar"] = "Polar";
+    KinematicsName["rotaryDelta"] = "Rotary delta";
+    KinematicsName["scara"] = "Scara";
     KinematicsName["unknown"] = "unknown";
 })(KinematicsName = exports.KinematicsName || (exports.KinematicsName = {}));
 class MoveSegmentation extends ModelObject_1.default {

package/dist/sensors/AnalogSensor.d.ts

@@ -15,9 +15,31 @@ export declare enum AnalogSensorType {
     driversDuex = "driversduex",
     unknown = "unknown"
 }
+export declare enum TemperatureError {
+    ok = "ok",
+    shortCircuit = "shortCircuit",
+    shortToVcc = "shortToVcc",
+    shortToGround = "shortToGround",
+    openCircuit = "openCircuit",
+    timeout = "timeout",
+    ioError = "ioError",
+    hardwareError = "hardwareError",
+    notReady = "notReady",
+    invalidOutputNumber = "invalidOutputNumber",
+    busBusy = "busBusy",
+    badResponse = "badResponse",
+    unknownPort = "unknownPort",
+    notInitialised = "notInitialised",
+    unknownSensor = "unknownSensor",
+    overOrUnderVoltage = "overOrUnderVoltage",
+    badVref = "badVref",
+    badVssa = "badVssa",
+    unknownError = "unknownError"
+}
 export declare class AnalogSensor extends ModelObject {
     lastReading: number | null;
     name: string | null;
+    state: TemperatureError;
     type: AnalogSensorType;
 }
 export default AnalogSensor;

package/dist/sensors/AnalogSensor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnalogSensor = exports.AnalogSensorType = void 0;
+exports.AnalogSensor = exports.TemperatureError = exports.AnalogSensorType = void 0;
 const ModelObject_1 = require("../ModelObject");
 var AnalogSensorType;
 (function (AnalogSensorType) {
@@ -19,11 +19,34 @@ var AnalogSensorType;
     AnalogSensorType["driversDuex"] = "driversduex";
     AnalogSensorType["unknown"] = "unknown";
 })(AnalogSensorType = exports.AnalogSensorType || (exports.AnalogSensorType = {}));
+var TemperatureError;
+(function (TemperatureError) {
+    TemperatureError["ok"] = "ok";
+    TemperatureError["shortCircuit"] = "shortCircuit";
+    TemperatureError["shortToVcc"] = "shortToVcc";
+    TemperatureError["shortToGround"] = "shortToGround";
+    TemperatureError["openCircuit"] = "openCircuit";
+    TemperatureError["timeout"] = "timeout";
+    TemperatureError["ioError"] = "ioError";
+    TemperatureError["hardwareError"] = "hardwareError";
+    TemperatureError["notReady"] = "notReady";
+    TemperatureError["invalidOutputNumber"] = "invalidOutputNumber";
+    TemperatureError["busBusy"] = "busBusy";
+    TemperatureError["badResponse"] = "badResponse";
+    TemperatureError["unknownPort"] = "unknownPort";
+    TemperatureError["notInitialised"] = "notInitialised";
+    TemperatureError["unknownSensor"] = "unknownSensor";
+    TemperatureError["overOrUnderVoltage"] = "overOrUnderVoltage";
+    TemperatureError["badVref"] = "badVref";
+    TemperatureError["badVssa"] = "badVssa";
+    TemperatureError["unknownError"] = "unknownError";
+})(TemperatureError = exports.TemperatureError || (exports.TemperatureError = {}));
 class AnalogSensor extends ModelObject_1.default {
     constructor() {
         super(...arguments);
         this.lastReading = null;
         this.name = null;
+        this.state = TemperatureError.ok;
         this.type = AnalogSensorType.unknown;
     }
 }

package/dist/spindles/index.d.ts

@@ -10,8 +10,11 @@ export declare class Spindle extends ModelObject {
     canReverse: boolean;
     current: number;
     frequency: number;
+    idlePwm: number;
     min: number;
+    minPwm: number;
     max: number;
+    maxPwm: number;
     state: SpindleState;
 }
 export default Spindle;

package/dist/spindles/index.js

@@ -16,8 +16,11 @@ class Spindle extends ModelObject_1.default {
         this.canReverse = false;
         this.current = 0;
         this.frequency = 0;
+        this.idlePwm = 0;
         this.min = 60;
+        this.minPwm = 0;
         this.max = 10000;
+        this.maxPwm = 1;
         this.state = SpindleState.unconfigured;
     }
 }

package/package.json

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