@duet3d/objectmodel 3.5.0-rc.3 → 3.5.0-rc.5

package/dist/boards/index.d.ts

@@ -29,7 +29,7 @@ export declare class Board extends ModelObject {
     canAddress: number | null;
     closedLoop: BoardClosedLoop | null;
     directDisplay: DirectDisplay | null;
-    drivers: ModelCollection<Driver>;
+    drivers: ModelCollection<Driver> | null;
     firmwareDate: string;
     firmwareFileName: string;
     firmwareName: string;

package/dist/boards/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Board = exports.MinMaxCurrent = exports.BoardState = exports.BoardClosedLoop = exports.Accelerometer = void 0;
-const ModelCollection_1 = require("../ModelCollection");
 const ModelObject_1 = require("../ModelObject");
 const directDisplay_1 = require("./directDisplay");
 const Driver_1 = require("./Driver");
@@ -60,7 +59,7 @@ class Board extends ModelObject_1.default {
         this.canAddress = null;
         this.closedLoop = null;
         this.directDisplay = null;
-        this.drivers = new ModelCollection_1.default(Driver_1.default);
+        this.drivers = null;
         this.firmwareDate = "";
         this.firmwareFileName = "";
         this.firmwareName = "";

package/dist/plugins/PluginManifest.d.ts

@@ -52,6 +52,7 @@ export declare class PluginManifest extends ModelObject {
     sbcExecutable: string | null;
     sbcExecutableArguments: string | null;
     sbcExtraExecutables: Array<string>;
+    sbcAutoRestart: boolean;
     sbcOutputRedirected: boolean;
     sbcPermissions: ModelSet<SbcPermission>;
     sbcPackageDependencies: Array<string>;

package/dist/plugins/PluginManifest.js

@@ -57,6 +57,7 @@ class PluginManifest extends ModelObject_1.default {
         this.sbcExecutable = null;
         this.sbcExecutableArguments = null;
         this.sbcExtraExecutables = [];
+        this.sbcAutoRestart = false;
         this.sbcOutputRedirected = true;
         this.sbcPermissions = new ModelSet_1.default();
         this.sbcPackageDependencies = [];

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

@@ -2,12 +2,13 @@ import ModelCollection from "../../ModelCollection";
 import ModelObject from "../../ModelObject";
 import HttpEndpoint from "./HttpEndpoint";
 import UserSession from "./UserSession";
-export declare class SBC extends ModelObject {
+export declare class DSF extends ModelObject {
+    buildDateTime: string;
     readonly httpEndpoints: ModelCollection<HttpEndpoint>;
     pluginSupport: boolean;
     rootPluginSupport: boolean;
     readonly userSessions: ModelCollection<UserSession>;
     version: string;
 }
-export default SBC;
+export default DSF;
 export * from "./HttpEndpoint";

package/dist/sbc/dsf/index.js

@@ -14,14 +14,15 @@ 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.SBC = void 0;
+exports.DSF = void 0;
 const ModelCollection_1 = require("../../ModelCollection");
 const ModelObject_1 = require("../../ModelObject");
 const HttpEndpoint_1 = require("./HttpEndpoint");
 const UserSession_1 = require("./UserSession");
-class SBC extends ModelObject_1.default {
+class DSF extends ModelObject_1.default {
     constructor() {
         super(...arguments);
+        this.buildDateTime = "";
         this.httpEndpoints = new ModelCollection_1.default(HttpEndpoint_1.default);
         this.pluginSupport = false;
         this.rootPluginSupport = false;
@@ -29,6 +30,6 @@ class SBC extends ModelObject_1.default {
         this.version = "";
     }
 }
-exports.SBC = SBC;
-exports.default = SBC;
+exports.DSF = DSF;
+exports.default = DSF;
 __exportStar(require("./HttpEndpoint"), exports);

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

@@ -0,0 +1,10 @@
+import { FilamentMonitorBase, FilamentMonitorType } from "./FilamentMonitorBase";
+export declare class Duet3DFilamentMonitor extends FilamentMonitorBase {
+    avgPercentage: number | null;
+    lastPercentage: number | null;
+    maxPercentage: number | null;
+    minPercentage: number | null;
+    totalExtrusion: number;
+    constructor(type?: FilamentMonitorType);
+}
+export default Duet3DFilamentMonitor;

package/dist/sensors/FilamentMonitors/Duet3DFilamentMonitor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Duet3DFilamentMonitor = void 0;
+const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
+class Duet3DFilamentMonitor extends FilamentMonitorBase_1.FilamentMonitorBase {
+    constructor(type = FilamentMonitorBase_1.FilamentMonitorType.unknown) {
+        super(type);
+        this.avgPercentage = null;
+        this.lastPercentage = null;
+        this.maxPercentage = null;
+        this.minPercentage = null;
+        this.totalExtrusion = 0;
+    }
+}
+exports.Duet3DFilamentMonitor = Duet3DFilamentMonitor;
+exports.default = Duet3DFilamentMonitor;

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

@@ -9,7 +9,7 @@ export declare enum FilamentMonitorStatus {
     sensorError = "sensorError"
 }
 export declare enum FilamentMonitorType {
-    simple = "simple",
+    switch = "switch",
     laser = "laser",
     pulsed = "pulsed",
     rotatingMagnet = "rotatingMagnet",

package/dist/sensors/FilamentMonitors/FilamentMonitorBase.js

@@ -14,7 +14,7 @@ var FilamentMonitorStatus;
 })(FilamentMonitorStatus || (exports.FilamentMonitorStatus = FilamentMonitorStatus = {}));
 var FilamentMonitorType;
 (function (FilamentMonitorType) {
-    FilamentMonitorType["simple"] = "simple";
+    FilamentMonitorType["switch"] = "switch";
     FilamentMonitorType["laser"] = "laser";
     FilamentMonitorType["pulsed"] = "pulsed";
     FilamentMonitorType["rotatingMagnet"] = "rotatingMagnet";

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

@@ -1,5 +1,5 @@
 import ModelObject, { IModelObject } from "../../ModelObject";
-import FilamentMonitorBase from "./FilamentMonitorBase";
+import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
 export declare class LaserFilamentMonitorCalibrated extends ModelObject {
     calibrationFactor: number;
     percentMax: number;
@@ -13,7 +13,7 @@ export declare class LaserFilamentMonitorConfigured extends ModelObject {
     percentMin: number;
     sampleDistance: number;
 }
-export declare class LaserFilamentMonitor extends FilamentMonitorBase {
+export declare class LaserFilamentMonitor extends Duet3DFilamentMonitor {
     constructor();
     calibrated: LaserFilamentMonitorCalibrated | null;
     readonly configured: LaserFilamentMonitorConfigured;

package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LaserFilamentMonitor = exports.LaserFilamentMonitorConfigured = exports.LaserFilamentMonitorCalibrated = void 0;
 const ModelObject_1 = require("../../ModelObject");
 const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
+const Duet3DFilamentMonitor_1 = require("./Duet3DFilamentMonitor");
 const index_1 = require("./index");
 class LaserFilamentMonitorCalibrated extends ModelObject_1.default {
     constructor() {
@@ -25,7 +26,7 @@ class LaserFilamentMonitorConfigured extends ModelObject_1.default {
     }
 }
 exports.LaserFilamentMonitorConfigured = LaserFilamentMonitorConfigured;
-class LaserFilamentMonitor extends FilamentMonitorBase_1.default {
+class LaserFilamentMonitor extends Duet3DFilamentMonitor_1.Duet3DFilamentMonitor {
     constructor() {
         super(FilamentMonitorBase_1.FilamentMonitorType.laser);
         this.calibrated = new LaserFilamentMonitorCalibrated();

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

@@ -1,5 +1,5 @@
 import ModelObject, { IModelObject } from "../../ModelObject";
-import FilamentMonitorBase from "./FilamentMonitorBase";
+import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
 export declare class RotatingMagnetFilamentMonitorCalibrated extends ModelObject {
     mmPerPulse: number;
     percentMax: number;
@@ -13,7 +13,7 @@ export declare class RotatingMagnetFilamentMonitorConfigured extends ModelObject
     percentMin: number;
     sampleDistance: number;
 }
-export declare class RotatingMagnetFilamentMonitor extends FilamentMonitorBase {
+export declare class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor {
     constructor();
     calibrated: RotatingMagnetFilamentMonitorCalibrated | null;
     readonly configured: RotatingMagnetFilamentMonitorConfigured;

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RotatingMagnetFilamentMonitor = exports.RotatingMagnetFilamentMonitorConfigured = exports.RotatingMagnetFilamentMonitorCalibrated = void 0;
 const ModelObject_1 = require("../../ModelObject");
 const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
+const Duet3DFilamentMonitor_1 = require("./Duet3DFilamentMonitor");
 const index_1 = require("./index");
 class RotatingMagnetFilamentMonitorCalibrated extends ModelObject_1.default {
     constructor() {
@@ -25,7 +26,7 @@ class RotatingMagnetFilamentMonitorConfigured extends ModelObject_1.default {
     }
 }
 exports.RotatingMagnetFilamentMonitorConfigured = RotatingMagnetFilamentMonitorConfigured;
-class RotatingMagnetFilamentMonitor extends FilamentMonitorBase_1.default {
+class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor_1.Duet3DFilamentMonitor {
     constructor() {
         super(FilamentMonitorBase_1.FilamentMonitorType.rotatingMagnet);
         this.calibrated = new RotatingMagnetFilamentMonitorCalibrated();

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

@@ -6,6 +6,7 @@ export declare class FilamentMonitor extends FilamentMonitorBase {
 export default FilamentMonitor;
 export declare function getFilamentMonitor(type: FilamentMonitorType): FilamentMonitorBase;
 export * from "./FilamentMonitorBase";
+export * from "./Duet3DFilamentMonitor";
 export * from "./LaserFilamentMonitor";
 export * from "./PulsedFilamentMonitor";
 export * from "./RotatingMagnetFilamentMonitor";

package/dist/sensors/FilamentMonitors/index.js

@@ -46,6 +46,7 @@ function getFilamentMonitor(type) {
 }
 exports.getFilamentMonitor = getFilamentMonitor;
 __exportStar(require("./FilamentMonitorBase"), exports);
+__exportStar(require("./Duet3DFilamentMonitor"), exports);
 __exportStar(require("./LaserFilamentMonitor"), exports);
 __exportStar(require("./PulsedFilamentMonitor"), exports);
 __exportStar(require("./RotatingMagnetFilamentMonitor"), exports);

package/dist/sensors/Probe.d.ts

@@ -10,7 +10,8 @@ export declare enum ProbeType {
     zSwitch_obsolete = 7,
     unfilteredDigital = 8,
     blTouch = 9,
-    zMotorStall = 10
+    zMotorStall = 10,
+    scanningAnalog = 11
 }
 export declare class Probe extends ModelObject {
     calibA: number | null;

package/dist/sensors/Probe.js

@@ -15,6 +15,7 @@ var ProbeType;
     ProbeType[ProbeType["unfilteredDigital"] = 8] = "unfilteredDigital";
     ProbeType[ProbeType["blTouch"] = 9] = "blTouch";
     ProbeType[ProbeType["zMotorStall"] = 10] = "zMotorStall";
+    ProbeType[ProbeType["scanningAnalog"] = 11] = "scanningAnalog";
 })(ProbeType || (exports.ProbeType = ProbeType = {}));
 class Probe extends ModelObject_1.default {
     constructor() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.5.0-rc.3",
+  "version": "3.5.0-rc.5",
   "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.4.0",
-    "jest": "^29.4.1",
-    "ts-jest": "^29.0.5",
-    "typescript": "^5.0.2"
+    "@types/jest": "^29.5.6",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.2"
   },
   "files": [
     "/dist"