@duet3d/objectmodel 3.7.0-alpha.1 → 3.7.0-alpha.3

package/dist/boards/index.d.ts

@@ -16,7 +16,8 @@ export declare enum BoardState {
     flashing = "flashing",
     flashFailed = "flashFailed",
     resetting = "resetting",
-    running = "running"
+    running = "running",
+    timedOut = "timedOut"
 }
 export declare class InductiveSensor extends ModelObject {
 }

package/dist/boards/index.js

@@ -42,6 +42,7 @@ var BoardState;
     BoardState["flashFailed"] = "flashFailed";
     BoardState["resetting"] = "resetting";
     BoardState["running"] = "running";
+    BoardState["timedOut"] = "timedOut";
 })(BoardState || (exports.BoardState = BoardState = {}));
 class InductiveSensor extends ModelObject_1.default {
 }

package/dist/heat/index.d.ts

@@ -2,8 +2,16 @@ import ModelCollection from "../ModelCollection";
 import ModelObject from "../ModelObject";
 import Heater from "./Heater";
 export declare class Heat extends ModelObject {
+    /**
+     * @deprecated use bedHeaterMapping instead
+     */
     bedHeaters: Array<number>;
+    bedHeaterMapping: Array<Array<number>>;
+    /**
+     * @deprecated use chamberHeaterMapping instead
+     */
     chamberHeaters: Array<number>;
+    chamberHeaterMapping: Array<Array<number>>;
     coldExtrudeTemperature: number;
     coldRetractTemperature: number;
     readonly heaters: ModelCollection<Heater | null>;

package/dist/heat/index.js

@@ -21,8 +21,16 @@ const Heater_1 = require("./Heater");
 class Heat extends ModelObject_1.default {
     constructor() {
         super(...arguments);
+        /**
+         * @deprecated use bedHeaterMapping instead
+         */
         this.bedHeaters = new Array();
+        this.bedHeaterMapping = [];
+        /**
+         * @deprecated use chamberHeaterMapping instead
+         */
         this.chamberHeaters = new Array();
+        this.chamberHeaterMapping = [];
         this.coldExtrudeTemperature = 160;
         this.coldRetractTemperature = 90;
         this.heaters = new ModelCollection_1.default(Heater_1.default);

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

@@ -4,7 +4,11 @@ import Build from "./Build";
 import GCodeFileInfo from "./GCodeFileInfo";
 export declare class Layer extends ModelObject {
     duration: number;
+    /**
+     * @deprecated use filamentUsage instead
+     */
     filament: Array<number>;
+    filamentUsage: number;
     fractionPrinted: number;
     height: number;
     temperatures: Array<number>;

package/dist/job/index.js

@@ -23,7 +23,11 @@ class Layer extends ModelObject_1.default {
     constructor() {
         super(...arguments);
         this.duration = 0;
+        /**
+         * @deprecated use filamentUsage instead
+         */
         this.filament = new Array();
+        this.filamentUsage = 0;
         this.fractionPrinted = 0;
         this.height = 0;
         this.temperatures = new Array();

package/dist/sensors/AnalogSensor.d.ts

@@ -13,6 +13,8 @@ export declare enum AnalogSensorType {
     bme280pressure = "bmepressure",
     bme280humidity = "bmehumidity",
     currentLoop = "currentloooppyro",
+    ads131chan0 = "ads131.chan0",
+    ads131chan1 = "ads131.chan1",
     mcuTemp = "mcutemp",
     drivers = "drivers",
     driversDuex = "driversduex",

package/dist/sensors/AnalogSensor.js

@@ -17,6 +17,8 @@ var AnalogSensorType;
     AnalogSensorType["bme280pressure"] = "bmepressure";
     AnalogSensorType["bme280humidity"] = "bmehumidity";
     AnalogSensorType["currentLoop"] = "currentloooppyro";
+    AnalogSensorType["ads131chan0"] = "ads131.chan0";
+    AnalogSensorType["ads131chan1"] = "ads131.chan1";
     AnalogSensorType["mcuTemp"] = "mcutemp";
     AnalogSensorType["drivers"] = "drivers";
     AnalogSensorType["driversDuex"] = "driversduex";

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

@@ -1,7 +1,6 @@
 import ModelObject, { IModelObject } from "../../ModelObject";
 import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
 export declare class LaserFilamentMonitorCalibrated extends ModelObject {
-    calibrationFactor: number;
     percentMax: number;
     percentMin: number;
     sensivity: number;
@@ -9,6 +8,7 @@ export declare class LaserFilamentMonitorCalibrated extends ModelObject {
 }
 export declare class LaserFilamentMonitorConfigured extends ModelObject {
     allMoves: boolean;
+    calibrationFactor: number;
     percentMax: number;
     percentMin: number;
     sampleDistance: number;

package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js

@@ -8,7 +8,6 @@ const index_1 = require("./index");
 class LaserFilamentMonitorCalibrated extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.calibrationFactor = 0;
         this.percentMax = 0;
         this.percentMin = 0;
         this.sensivity = 0;
@@ -20,6 +19,7 @@ class LaserFilamentMonitorConfigured extends ModelObject_1.default {
     constructor() {
         super(...arguments);
         this.allMoves = false;
+        this.calibrationFactor = 0;
         this.percentMax = 0;
         this.percentMin = 0;
         this.sampleDistance = 0;

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.7.0-alpha.1",
+  "version": "3.7.0-alpha.3",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
   },
   "homepage": "https://github.com/Duet3D/ObjectModel#readme",
   "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "jest": "^29.7.0",
+    "@types/jest": "^30.0.0",
+    "jest": "^30.2.0",
     "ts-jest": "^29.1.2",
     "typescript": "^5.4.5"
   },