@duet3d/objectmodel 3.5.0-rc.9 → 3.5.1

package/dist/ModelCollection.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initCollection = exports.ModelCollection = void 0;
+exports.ModelCollection = void 0;
+exports.initCollection = initCollection;
 const ModelObject_1 = require("./ModelObject");
 const index_1 = require("./index");
 /**
@@ -103,4 +104,3 @@ function initCollection(itemType, data) {
     }
     return result;
 }
-exports.initCollection = initCollection;

package/dist/ModelDictionary.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initDictionary = exports.ModelDictionary = void 0;
+exports.ModelDictionary = void 0;
+exports.initDictionary = initDictionary;
 const ModelObject_1 = require("./ModelObject");
 /**
  * Dictionary class to map object model data
@@ -105,4 +106,3 @@ function initDictionary(nullDeletesKeys, itemConstructor, data) {
     }
     return result;
 }
-exports.initDictionary = initDictionary;

package/dist/ModelObject.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initObject = exports.ModelObject = exports.isModelObject = void 0;
+exports.ModelObject = void 0;
+exports.isModelObject = isModelObject;
+exports.initObject = initObject;
 const index_1 = require("./index");
 /**
  * Check whether a given value provides model update functionality
@@ -9,7 +11,6 @@ const index_1 = require("./index");
 function isModelObject(value) {
     return (value instanceof Object) && value.update !== undefined;
 }
-exports.isModelObject = isModelObject;
 /**
  * Base class for object model classes
  */
@@ -237,4 +238,3 @@ exports.default = ModelObject;
 function initObject(itemType, data) {
     return new itemType().update(data);
 }
-exports.initObject = initObject;

package/dist/boards/directDisplay/index.js

@@ -14,7 +14,8 @@ 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.getDirectDisplayScreen = exports.DirectDisplay = exports.DirectDisplayEncoder = exports.DirectDisplayController = void 0;
+exports.DirectDisplay = exports.DirectDisplayEncoder = exports.DirectDisplayController = void 0;
+exports.getDirectDisplayScreen = getDirectDisplayScreen;
 const ModelObject_1 = require("../../ModelObject");
 const DirectDisplayScreen_1 = require("./DirectDisplayScreen");
 const DirectDisplayScreenST7567_1 = require("./DirectDisplayScreenST7567");
@@ -51,6 +52,5 @@ function getDirectDisplayScreen(controller) {
             return new DirectDisplayScreenST7567_1.DirectDisplayScreenST7567();
     }
 }
-exports.getDirectDisplayScreen = getDirectDisplayScreen;
 __exportStar(require("./DirectDisplayScreen"), exports);
 __exportStar(require("./DirectDisplayScreenST7567"), exports);

package/dist/boards/index.d.ts

@@ -3,6 +3,7 @@ import ModelObject from "../ModelObject";
 import DirectDisplay from "./directDisplay";
 import Driver from "./Driver";
 export declare class Accelerometer extends ModelObject {
+    orientation: number;
     points: number;
     runs: number;
 }
@@ -17,6 +18,8 @@ export declare enum BoardState {
     resetting = "resetting",
     running = "running"
 }
+export declare class InductiveSensor extends ModelObject {
+}
 export declare class MinMaxCurrent extends ModelObject {
     current: number;
     min: number;
@@ -37,6 +40,7 @@ export declare class Board extends ModelObject {
     freeRam: number | null;
     iapFileNameSBC: string | null;
     iapFileNameSD: string | null;
+    inductiveSensor: InductiveSensor | null;
     maxHeaters: number;
     maxMotors: number;
     mcuTemp: MinMaxCurrent | null;

package/dist/boards/index.js

@@ -14,13 +14,14 @@ 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.Board = exports.MinMaxCurrent = exports.BoardState = exports.BoardClosedLoop = exports.Accelerometer = void 0;
+exports.Board = exports.MinMaxCurrent = exports.InductiveSensor = exports.BoardState = exports.BoardClosedLoop = exports.Accelerometer = void 0;
 const ModelObject_1 = require("../ModelObject");
 const directDisplay_1 = require("./directDisplay");
 const Driver_1 = require("./Driver");
 class Accelerometer extends ModelObject_1.default {
     constructor() {
         super(...arguments);
+        this.orientation = 20;
         this.points = 0;
         this.runs = 0;
     }
@@ -42,6 +43,9 @@ var BoardState;
     BoardState["resetting"] = "resetting";
     BoardState["running"] = "running";
 })(BoardState || (exports.BoardState = BoardState = {}));
+class InductiveSensor extends ModelObject_1.default {
+}
+exports.InductiveSensor = InductiveSensor;
 class MinMaxCurrent extends ModelObject_1.default {
     constructor() {
         super(...arguments);
@@ -67,6 +71,7 @@ class Board extends ModelObject_1.default {
         this.freeRam = null;
         this.iapFileNameSBC = null;
         this.iapFileNameSD = null;
+        this.inductiveSensor = null;
         this.maxHeaters = 0;
         this.maxMotors = 0;
         this.mcuTemp = null;
@@ -82,6 +87,7 @@ class Board extends ModelObject_1.default {
         ModelObject_1.default.wrapModelProperty(this, "closedLoop", BoardClosedLoop);
         ModelObject_1.default.wrapModelProperty(this, "directDisplay", directDisplay_1.default);
         ModelObject_1.default.wrapModelCollectionProperty(this, "drivers", Driver_1.default);
+        ModelObject_1.default.wrapModelProperty(this, "inductiveSensor", InductiveSensor);
         ModelObject_1.default.wrapModelProperty(this, "mcuTemp", MinMaxCurrent);
         ModelObject_1.default.wrapModelProperty(this, "v12", MinMaxCurrent);
         ModelObject_1.default.wrapModelProperty(this, "vIn", MinMaxCurrent);

package/dist/fans/index.d.ts

@@ -14,6 +14,7 @@ export declare class Fan extends ModelObject {
     name: string;
     requestedValue: number;
     rpm: number;
+    tachoPpr: number;
     readonly thermostatic: FanThermostaticControl;
 }
 export default Fan;

package/dist/fans/index.js

@@ -23,6 +23,7 @@ class Fan extends ModelObject_1.default {
         this.name = "";
         this.requestedValue = 0;
         this.rpm = -1;
+        this.tachoPpr = 2.0;
         this.thermostatic = new FanThermostaticControl();
     }
 }

package/dist/httpEndpoints/index.d.ts

@@ -0,0 +1,19 @@
+import ModelObject from "../ModelObject";
+export declare enum HttpEndpointType {
+    GET = "GET",
+    POST = "POST",
+    PUT = "PUT",
+    PATCH = "PATCH",
+    TRACE = "TRACE",
+    DELETE = "DELETE",
+    OPTIONS = "OPTIONS",
+    WebSocket = "WebSocket"
+}
+export declare class HttpEndpoint extends ModelObject {
+    endpointType: HttpEndpointType;
+    namespace: string;
+    path: string;
+    isUploadRequest: boolean;
+    unixSocket: string;
+}
+export default HttpEndpoint;

package/dist/httpEndpoints/index.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpEndpoint = exports.HttpEndpointType = void 0;
+const ModelObject_1 = require("../ModelObject");
+var HttpEndpointType;
+(function (HttpEndpointType) {
+    HttpEndpointType["GET"] = "GET";
+    HttpEndpointType["POST"] = "POST";
+    HttpEndpointType["PUT"] = "PUT";
+    HttpEndpointType["PATCH"] = "PATCH";
+    HttpEndpointType["TRACE"] = "TRACE";
+    HttpEndpointType["DELETE"] = "DELETE";
+    HttpEndpointType["OPTIONS"] = "OPTIONS";
+    HttpEndpointType["WebSocket"] = "WebSocket";
+})(HttpEndpointType = exports.HttpEndpointType || (exports.HttpEndpointType = {}));
+class HttpEndpoint extends ModelObject_1.default {
+    constructor() {
+        super(...arguments);
+        this.endpointType = HttpEndpointType.GET;
+        this.namespace = "";
+        this.path = "";
+        this.isUploadRequest = false;
+        this.unixSocket = "";
+    }
+}
+exports.HttpEndpoint = HttpEndpoint;
+exports.default = HttpEndpoint;

package/dist/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.setArrayItem = void 0;
+exports.setArrayItem = setArrayItem;
 // Expose all the sub-exports
 __exportStar(require("./ModelCollection"), exports);
 __exportStar(require("./ModelDictionary"), exports);
@@ -52,4 +52,3 @@ globalThis._duetModelSetArray = (array, index, value) => array[index] = value;
 function setArrayItem(array, index, value) {
     globalThis._duetModelSetArray(array, index, value);
 }
-exports.setArrayItem = setArrayItem;

package/dist/move/Axis.d.ts

@@ -19,6 +19,26 @@ export declare enum AxisLetter {
     d = "d",
     e = "e",
     f = "f",
+    g = "g",
+    h = "h",
+    i = "i",
+    j = "j",
+    k = "k",
+    l = "l",
+    m = "m",
+    n = "n",
+    o = "o",
+    p = "p",
+    q = "q",
+    r = "r",
+    s = "s",
+    t = "t",
+    u = "u",
+    v = "v",
+    w = "w",
+    x = "x",
+    y = "y",
+    z = "z",
     none = ""
 }
 export declare class Axis extends ModelObject {

package/dist/move/Axis.js

@@ -23,6 +23,26 @@ var AxisLetter;
     AxisLetter["d"] = "d";
     AxisLetter["e"] = "e";
     AxisLetter["f"] = "f";
+    AxisLetter["g"] = "g";
+    AxisLetter["h"] = "h";
+    AxisLetter["i"] = "i";
+    AxisLetter["j"] = "j";
+    AxisLetter["k"] = "k";
+    AxisLetter["l"] = "l";
+    AxisLetter["m"] = "m";
+    AxisLetter["n"] = "n";
+    AxisLetter["o"] = "o";
+    AxisLetter["p"] = "p";
+    AxisLetter["q"] = "q";
+    AxisLetter["r"] = "r";
+    AxisLetter["s"] = "s";
+    AxisLetter["t"] = "t";
+    AxisLetter["u"] = "u";
+    AxisLetter["v"] = "v";
+    AxisLetter["w"] = "w";
+    AxisLetter["x"] = "x";
+    AxisLetter["y"] = "y";
+    AxisLetter["z"] = "z";
     AxisLetter["none"] = "";
 })(AxisLetter || (exports.AxisLetter = AxisLetter = {}));
 class Axis extends ModelObject_1.default {

package/dist/move/DriverId.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DriverId = exports.isDriverId = void 0;
+exports.DriverId = void 0;
+exports.isDriverId = isDriverId;
 const ModelObject_1 = require("../ModelObject");
 function isDriverId(value) {
     return (value instanceof Object) && value.board !== undefined && value.driver !== undefined;
 }
-exports.isDriverId = isDriverId;
 class DriverId extends ModelObject_1.default {
     constructor() {
         super(...arguments);

package/dist/move/kinematics/index.js

@@ -14,7 +14,8 @@ 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.getKinematics = exports.Kinematics = void 0;
+exports.Kinematics = void 0;
+exports.getKinematics = getKinematics;
 const KinematicsBase_1 = require("./KinematicsBase");
 const CoreKinematics_1 = require("./CoreKinematics");
 const DeltaKinematics_1 = require("./DeltaKinematics");
@@ -64,7 +65,6 @@ function getKinematics(name) {
             return new CoreKinematics_1.default(name);
     }
 }
-exports.getKinematics = getKinematics;
 __exportStar(require("./CoreKinematics"), exports);
 __exportStar(require("./DeltaKinematics"), exports);
 __exportStar(require("./HangprinterKinematics"), exports);

package/dist/plugins/PluginManifest.d.ts

@@ -55,6 +55,7 @@ export declare class PluginManifest extends ModelObject {
     sbcAutoRestart: boolean;
     sbcOutputRedirected: boolean;
     sbcPermissions: ModelSet<SbcPermission>;
+    sbcConfigFiles: Array<string>;
     sbcPackageDependencies: Array<string>;
     sbcPluginDependencies: Array<string>;
     sbcPythonDependencies: Array<string>;

package/dist/plugins/PluginManifest.js

@@ -60,6 +60,7 @@ class PluginManifest extends ModelObject_1.default {
         this.sbcAutoRestart = false;
         this.sbcOutputRedirected = true;
         this.sbcPermissions = new ModelSet_1.default();
+        this.sbcConfigFiles = [];
         this.sbcPackageDependencies = [];
         this.sbcPluginDependencies = [];
         this.sbcPythonDependencies = [];

package/dist/sbc/dsf/index.d.ts

@@ -5,6 +5,7 @@ import UserSession from "./UserSession";
 export declare class DSF extends ModelObject {
     buildDateTime: string;
     readonly httpEndpoints: ModelCollection<HttpEndpoint>;
+    is64Bit: boolean;
     pluginSupport: boolean;
     rootPluginSupport: boolean;
     readonly userSessions: ModelCollection<UserSession>;

package/dist/sbc/dsf/index.js

@@ -24,6 +24,7 @@ class DSF extends ModelObject_1.default {
         super(...arguments);
         this.buildDateTime = "";
         this.httpEndpoints = new ModelCollection_1.default(HttpEndpoint_1.default);
+        this.is64Bit = false;
         this.pluginSupport = false;
         this.rootPluginSupport = false;
         this.userSessions = new ModelCollection_1.default(UserSession_1.default);

package/dist/sensors/AnalogSensor.d.ts

@@ -44,9 +44,11 @@ export declare class AnalogSensor extends ModelObject {
     c: number | null;
     lastReading: number | null;
     name: string | null;
+    offsetAdj: number;
     port: string | null;
     r25: number | null;
     rRef: number | null;
+    slopeAdj: number;
     state: TemperatureError;
     type: AnalogSensorType;
 }

package/dist/sensors/AnalogSensor.js

@@ -51,9 +51,11 @@ class AnalogSensor extends ModelObject_1.default {
         this.c = null;
         this.lastReading = null;
         this.name = null;
+        this.offsetAdj = 0;
         this.port = null;
         this.r25 = null;
         this.rRef = null;
+        this.slopeAdj = 0;
         this.state = TemperatureError.ok;
         this.type = AnalogSensorType.unknown;
     }

package/dist/sensors/FilamentMonitors/index.js

@@ -14,7 +14,8 @@ 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.getFilamentMonitor = exports.FilamentMonitor = void 0;
+exports.FilamentMonitor = void 0;
+exports.getFilamentMonitor = getFilamentMonitor;
 const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
 const LaserFilamentMonitor_1 = require("./LaserFilamentMonitor");
 const PulsedFilamentMonitor_1 = require("./PulsedFilamentMonitor");
@@ -44,7 +45,6 @@ function getFilamentMonitor(type) {
             return new FilamentMonitor(type);
     }
 }
-exports.getFilamentMonitor = getFilamentMonitor;
 __exportStar(require("./FilamentMonitorBase"), exports);
 __exportStar(require("./Duet3DFilamentMonitor"), exports);
 __exportStar(require("./LaserFilamentMonitor"), exports);

package/dist/sensors/Probe.js

@@ -37,7 +37,7 @@ class Probe extends ModelObject_1.default {
         this.offsets = [0, 0];
         this.recoveryTime = 0;
         this.scanCoefficients = null;
-        this.speeds = [2, 2, 2];
+        this.speeds = [2, 2];
         this.temperatureCoefficients = [0, 0];
         this.threshold = 500;
         this.tolerance = 0.03;

package/dist/tools/ToolRetraction.d.ts

@@ -0,0 +1,9 @@
+import ModelObject from "../ModelObject";
+export declare class ToolRetraction extends ModelObject {
+    extraStart: number;
+    length: number;
+    speed: number;
+    unretractSpeed: number;
+    zHop: number;
+}
+export default ToolRetraction;

package/dist/tools/ToolRetraction.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ToolRetraction = void 0;
+const ModelObject_1 = require("../ModelObject");
+class ToolRetraction extends ModelObject_1.default {
+    constructor() {
+        super(...arguments);
+        this.extraStart = 0;
+        this.length = 0;
+        this.speed = 0;
+        this.unretractSpeed = 0;
+        this.zHop = 0;
+    }
+}
+exports.ToolRetraction = ToolRetraction;
+exports.default = ToolRetraction;

package/dist/tools/index.d.ts

@@ -1,4 +1,5 @@
 import ModelObject from "../ModelObject";
+import ToolRetraction from "./ToolRetraction";
 export declare enum ToolState {
     off = "off",
     active = "active",
@@ -18,6 +19,7 @@ export declare class Tool extends ModelObject {
     number: number;
     offsets: Array<number>;
     offsetsProbed: boolean;
+    retraction: ToolRetraction;
     spindle: number;
     spindleRpm: number;
     standby: Array<number>;

package/dist/tools/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tool = exports.ToolState = void 0;
 const ModelObject_1 = require("../ModelObject");
+const ToolRetraction_1 = require("./ToolRetraction");
 var ToolState;
 (function (ToolState) {
     ToolState["off"] = "off";
@@ -24,6 +25,7 @@ class Tool extends ModelObject_1.default {
         this.number = 0;
         this.offsets = [];
         this.offsetsProbed = false;
+        this.retraction = new ToolRetraction_1.default();
         this.spindle = -1;
         this.spindleRpm = 0;
         this.standby = [];

package/dist/userSessions/index.d.ts

@@ -0,0 +1,18 @@
+import ModelObject from "../ModelObject";
+export declare enum AccessLevel {
+    readOnly = "readOnly",
+    readWrite = "readWrite"
+}
+export declare enum SessionType {
+    local = "local",
+    http = "http",
+    telnet = "telnet"
+}
+export declare class UserSession extends ModelObject {
+    accessLevel: AccessLevel;
+    id: number;
+    origin: string | null;
+    originId: number;
+    sessionType: SessionType;
+}
+export default UserSession;

package/dist/userSessions/index.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserSession = exports.SessionType = exports.AccessLevel = void 0;
+const ModelObject_1 = require("../ModelObject");
+var AccessLevel;
+(function (AccessLevel) {
+    AccessLevel["readOnly"] = "readOnly";
+    AccessLevel["readWrite"] = "readWrite";
+})(AccessLevel = exports.AccessLevel || (exports.AccessLevel = {}));
+var SessionType;
+(function (SessionType) {
+    SessionType["local"] = "local";
+    SessionType["http"] = "http";
+    SessionType["telnet"] = "telnet";
+})(SessionType = exports.SessionType || (exports.SessionType = {}));
+class UserSession extends ModelObject_1.default {
+    constructor() {
+        super(...arguments);
+        this.accessLevel = AccessLevel.readOnly;
+        this.id = 0;
+        this.origin = null;
+        this.originId = -1;
+        this.sessionType = SessionType.local;
+    }
+}
+exports.UserSession = UserSession;
+exports.default = UserSession;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.5.0-rc.9",
+  "version": "3.5.1",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/Duet3D/ObjectModel#readme",
   "devDependencies": {
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.3"
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.4.5"
   },
   "files": [
     "/dist"