@duet3d/objectmodel 3.7.0-alpha.14 → 3.7.0-alpha.15

package/dist/boards/Driver.d.ts

@@ -21,7 +21,7 @@ export declare enum DriverMode {
 }
 export declare class DriverConfig extends ModelObject {
     direction: boolean;
-    mode: DriverMode;
+    mode: DriverMode | null;
 }
 export default class Driver extends ModelObject {
     constructor();

package/dist/boards/Driver.js

@@ -33,7 +33,7 @@ export class DriverConfig extends ModelObject {
     constructor() {
         super(...arguments);
         this.direction = true;
-        this.mode = DriverMode.spreadCycle;
+        this.mode = null;
     }
 }
 export default class Driver extends ModelObject {

package/dist/boards/directDisplay/DirectDisplayScreenST7567.js

@@ -11,7 +11,7 @@ export class DirectDisplayScreenST7567 extends DirectDisplayScreenBase {
             return null;
         }
         if (typeof jsonElement.controller === "string" && jsonElement.controller !== this.controller) {
-            return getDirectDisplayScreen(jsonElement.type).update(jsonElement);
+            return getDirectDisplayScreen(jsonElement.controller).update(jsonElement);
         }
         return super.update(jsonElement);
     }

package/dist/boards/index.d.ts

@@ -29,7 +29,6 @@ export declare class MinMaxCurrent extends ModelObject {
 export declare class Board extends ModelObject {
     constructor();
     accelerometer: Accelerometer | null;
-    bootloaderFileName: string | null;
     canAddress: number | null;
     closedLoop: BoardClosedLoop | null;
     directDisplay: DirectDisplay | null;

package/dist/boards/index.js

@@ -40,7 +40,6 @@ export class Board extends ModelObject {
     constructor() {
         super();
         this.accelerometer = null;
-        this.bootloaderFileName = null;
         this.canAddress = null;
         this.closedLoop = null;
         this.directDisplay = null;

package/dist/documentation.json

@@ -10,7 +10,6 @@
 	},
 	"boards[].accelerometer.points": "Number of collected data points in the last run or 0 if it failed",
 	"boards[].accelerometer.runs": "Number of completed sampling runs",
-	"boards[].bootloaderFileName": "Filename of the bootloader binary or null if unknown",
 	"boards[].canAddress": "CAN address of this board or null if not applicable",
 	"boards[].closedLoop": "Closed loop data of this board or null if unknown",
 	"boards[].closedLoop.points": "Number of collected data points in the last run or 0 if it failed",
@@ -168,12 +167,19 @@
 	"heat.heaters[].model.pid": "Details about the PID controller",
 	"heat.heaters[].model.pid.d": "Derivative value of the PID regulator",
 	"heat.heaters[].model.pid.i": "Integral value of the PID regulator",
-	"heat.heaters[].model.pid.overridden": "Indicates if custom PID values are used",
 	"heat.heaters[].model.pid.p": "Proportional value of the PID regulator",
 	"heat.heaters[].model.pid.used": "Indicates if PID control is being used",
 	"heat.heaters[].model.standardVoltage": "Standard voltage or null if unknown",
 	"heat.heaters[].monitors": "Monitors of this heater",
-	"heat.heaters[].monitors[].action": "Action to perform when the trigger condition is met",
+	"heat.heaters[].monitors[].action": {
+		"summary": "Action to perform when the trigger condition is met",
+		"values": {
+			"0": "Generate a heater fault",
+			"1": "Permanently switch off the heater",
+			"2": "Temporarily switch off the heater until the condition is no longer met",
+			"3": "Shut down the printer"
+		}
+	},
 	"heat.heaters[].monitors[].condition": {
 		"summary": "Condition to meet to perform an action",
 		"values": {
@@ -624,11 +630,25 @@
 	"network.interfaces[].firmwareVersion": "Version of the network interface or null if unknown. This is only reported by ESP-based boards in standalone mode",
 	"network.interfaces[].gateway": "IPv4 gateway of the network adapter or null if unknown",
 	"network.interfaces[].mac": "Physical address of the network adapter or null if unknown",
-	"network.interfaces[].numReconnects": "Number of reconnect attempts or null if unknown. This is only reported by ESP-based boards in standalone mode",
 	"network.interfaces[].rssi": "Received signal strength indicator of the WiFi adapter (only WiFi, in dBm, or null if unknown)",
 	"network.interfaces[].speed": "Speed of the network interface (in MBit, null if unknown, 0 if not connected)",
 	"network.interfaces[].ssid": "SSID of the WiFi network or null if not applicable",
-	"network.interfaces[].state": "State of this network interface or null if unknown",
+	"network.interfaces[].state": {
+		"summary": "State of this network interface or null if unknown",
+		"values": {
+			"disabled": null,
+			"enabled": null,
+			"initFailed": null,
+			"starting1": null,
+			"starting2": null,
+			"changingMode": null,
+			"establishingLink": null,
+			"obtainingIP": null,
+			"connected": null,
+			"active": null,
+			"idle": null
+		}
+	},
 	"network.interfaces[].subnet": "Subnet of the network adapter or null if unknown",
 	"network.interfaces[].type": {
 		"summary": "Type of this network interface",
@@ -801,6 +821,10 @@
 			"overOrUnderVoltage": "Sensor exceeded min/max voltage",
 			"badVref": "Bad VREF detected",
 			"badVssa": "Bad VSSA detected",
+			"readingTooLow": null,
+			"readingTooHigh": null,
+			"ambientReadingTooLow": null,
+			"ambientReadingTooHigh": null,
 			"unknownError": "Unknown error"
 		}
 	},
@@ -819,8 +843,13 @@
 			"bme280": "BME280 sensor",
 			"bmepressure": "BME280 pressure sensor",
 			"bmehumidity": "BME280 humidity sensor",
-			"currentloooppyro": "Current loop sensor",
-			"ads131.chan0": "ADS131 channel 0",
+			"bme68x": null,
+			"bme68xpressure": null,
+			"bme68xhumidity": null,
+			"bme68xgas": null,
+			"currentloop": "Current loop sensor",
+			"ads131.chan0.u": null,
+			"ads131.chan0.b": null,
 			"ads131.chan1": "ADS131 channel 1",
 			"mcutemp": "MCU temperature",
 			"drivers": "On-board stepper driver sensors",
@@ -877,8 +906,6 @@
 	"sensors.gpIn": "List of general-purpose input ports",
 	"sensors.gpIn[].value": "Value of this port (0..1)",
 	"sensors.probes": "List of configured probes",
-	"sensors.probes[].calibA": "Linear coefficient for scanning probes",
-	"sensors.probes[].calibB": "Quadratic coefficient for scanning probes",
 	"sensors.probes[].calibrationTemperature": "Calibration temperature (in C)",
 	"sensors.probes[].deployedByUser": "Indicates if the user has deployed the probe",
 	"sensors.probes[].disablesHeaters": "Whether probing disables the heater(s)",
@@ -939,7 +966,13 @@
 			"reverse": "Spindle is going in reverse"
 		}
 	},
-	"spindles[].type": "Spindle type",
+	"spindles[].type": {
+		"summary": "Spindle type",
+		"values": {
+			"enaDir": "Enable and direction",
+			"fwdRev": "Forward and reverse"
+		}
+	},
 	"state": "Information about the machine state",
 	"state.atxPower": "State of the ATX power pin (if controlled)",
 	"state.atxPowerPort": "Port of the ATX power pin or null if not assigned",

package/dist/enums.json

@@ -20,6 +20,12 @@
 		"running",
 		"timedOut"
 	],
+	"heat.heaters[].monitors[].action": [
+		"0",
+		"1",
+		"2",
+		"3"
+	],
 	"heat.heaters[].monitors[].condition": [
 		"disabled",
 		"tooHigh",
@@ -139,6 +145,19 @@
 		"ei3",
 		"custom"
 	],
+	"network.interfaces[].state": [
+		"disabled",
+		"enabled",
+		"initFailed",
+		"starting1",
+		"starting2",
+		"changingMode",
+		"establishingLink",
+		"obtainingIP",
+		"connected",
+		"active",
+		"idle"
+	],
 	"network.interfaces[].type": [
 		"ethernet",
 		"wifi"
@@ -185,6 +204,10 @@
 		"overOrUnderVoltage",
 		"badVref",
 		"badVssa",
+		"readingTooLow",
+		"readingTooHigh",
+		"ambientReadingTooLow",
+		"ambientReadingTooHigh",
 		"unknownError"
 	],
 	"sensors.analog[].type": [
@@ -200,8 +223,13 @@
 		"bme280",
 		"bmepressure",
 		"bmehumidity",
-		"currentloooppyro",
-		"ads131.chan0",
+		"bme68x",
+		"bme68xpressure",
+		"bme68xhumidity",
+		"bme68xgas",
+		"currentloop",
+		"ads131.chan0.u",
+		"ads131.chan0.b",
 		"ads131.chan1",
 		"mcutemp",
 		"drivers",
@@ -256,6 +284,10 @@
 		"forward",
 		"reverse"
 	],
+	"spindles[].type": [
+		"enaDir",
+		"fwdRev"
+	],
 	"state.logLevel": [
 		"debug",
 		"info",

package/dist/heat/HeaterModel.d.ts

@@ -2,7 +2,6 @@ import ModelObject from "../ModelObject";
 export declare class HeaterModelPID extends ModelObject {
     d: number;
     i: number;
-    overridden: boolean;
     p: number;
     used: boolean;
 }

package/dist/heat/HeaterModel.js

@@ -4,7 +4,6 @@ export class HeaterModelPID extends ModelObject {
         super(...arguments);
         this.d = 0;
         this.i = 0;
-        this.overridden = false;
         this.p = 0;
         this.used = true;
     }

package/dist/inputs/CodeChannel.d.ts

@@ -13,6 +13,7 @@ export declare enum CodeChannel {
     autopause = 11,
     file2 = 12,
     queue2 = 13,
-    unknown = 14
+    usb2 = 14,
+    unknown = 15
 }
 export default CodeChannel;

package/dist/inputs/CodeChannel.js

@@ -14,6 +14,7 @@ export var CodeChannel;
     CodeChannel[CodeChannel["autopause"] = 11] = "autopause";
     CodeChannel[CodeChannel["file2"] = 12] = "file2";
     CodeChannel[CodeChannel["queue2"] = 13] = "queue2";
-    CodeChannel[CodeChannel["unknown"] = 14] = "unknown";
+    CodeChannel[CodeChannel["usb2"] = 14] = "usb2";
+    CodeChannel[CodeChannel["unknown"] = 15] = "unknown";
 })(CodeChannel || (CodeChannel = {}));
 export default CodeChannel;

package/dist/job/GCodeFileInfo.d.ts

@@ -6,7 +6,7 @@ export declare class GCodeFileInfo extends ModelObject {
     readonly customInfo: ModelDictionary<any>;
     filament: Array<number>;
     fileName: string;
-    generatedBy: string;
+    generatedBy: string | null;
     height: number;
     lastModified: string | null;
     layerHeight: number;

package/dist/job/GCodeFileInfo.js

@@ -8,7 +8,7 @@ export class GCodeFileInfo extends ModelObject {
         this.customInfo = new ModelDictionary(false);
         this.filament = new Array();
         this.fileName = "";
-        this.generatedBy = "";
+        this.generatedBy = null;
         this.height = 0;
         this.lastModified = null;
         this.layerHeight = 0;

package/dist/job/index.d.ts

@@ -11,7 +11,7 @@ export declare class Layer extends ModelObject {
     filamentUsage: number;
     fractionPrinted: number;
     height: number;
-    temperatures: Array<number>;
+    temperatures: Array<number | null>;
 }
 export declare class TimesLeft extends ModelObject {
     filament: number | null;
@@ -21,9 +21,9 @@ export declare class TimesLeft extends ModelObject {
 }
 export declare class Job extends ModelObject {
     constructor();
-    build: Build;
+    build: Build | null;
     duration: number | null;
-    file: GCodeFileInfo | null;
+    readonly file: GCodeFileInfo;
     filePosition: number | bigint | null;
     lastDuration: number | null;
     lastFileName: string | null;

package/dist/job/index.js

@@ -28,9 +28,9 @@ export class TimesLeft extends ModelObject {
 export class Job extends ModelObject {
     constructor() {
         super();
-        this.build = new Build();
+        this.build = null;
         this.duration = null;
-        this.file = null;
+        this.file = new GCodeFileInfo();
         this.filePosition = null;
         this.lastDuration = null;
         this.lastFileName = null;
@@ -46,7 +46,6 @@ export class Job extends ModelObject {
         this.timesLeft = new TimesLeft();
         this.warmUpDuration = null;
         ModelObject.wrapModelProperty(this, "build", Build);
-        ModelObject.wrapModelProperty(this, "file", GCodeFileInfo);
     }
 }
 export default Job;

package/dist/ledStrips/index.js

@@ -18,7 +18,7 @@ export class LedStrip extends ModelObject {
     constructor() {
         super(...arguments);
         this.board = 0;
-        this.colorOrder = LedStripColorOrder.GRB;
+        this.colorOrder = LedStripColorOrder.BGR;
         this.maxLeds = 0;
         this.pin = "";
         this.stopMovement = false;

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

@@ -20,7 +20,7 @@ export declare class MoveSegmentation extends ModelObject {
 }
 export declare abstract class KinematicsBase extends ModelObject {
     readonly name: KinematicsName;
-    readonly segmentation: MoveSegmentation;
+    segmentation: MoveSegmentation | null;
     constructor(name: KinematicsName);
 }
 export default KinematicsBase;

package/dist/move/kinematics/KinematicsBase.js

@@ -25,8 +25,9 @@ export class MoveSegmentation extends ModelObject {
 export class KinematicsBase extends ModelObject {
     constructor(name) {
         super();
-        this.segmentation = new MoveSegmentation();
+        this.segmentation = null;
         this.name = name;
+        ModelObject.wrapModelProperty(this, "segmentation", MoveSegmentation);
     }
 }
 export default KinematicsBase;

package/dist/network/NetworkInterface.d.ts

@@ -11,6 +11,7 @@ export declare enum NetworkProtocol {
 export declare enum NetworkInterfaceState {
     disabled = "disabled",
     enabled = "enabled",
+    initFailed = "initFailed",
     starting1 = "starting1",
     starting2 = "starting2",
     changingMode = "changingMode",
@@ -32,7 +33,6 @@ export declare class NetworkInterface extends ModelObject {
     firmwareVersion: string | null;
     gateway: string | null;
     mac: string | null;
-    numReconnects: number | null;
     rssi: number | null;
     /** @deprecated use rssi instead */
     signal: number | null;

package/dist/network/NetworkInterface.js

@@ -13,6 +13,7 @@ export var NetworkInterfaceState;
 (function (NetworkInterfaceState) {
     NetworkInterfaceState["disabled"] = "disabled";
     NetworkInterfaceState["enabled"] = "enabled";
+    NetworkInterfaceState["initFailed"] = "initFailed";
     NetworkInterfaceState["starting1"] = "starting1";
     NetworkInterfaceState["starting2"] = "starting2";
     NetworkInterfaceState["changingMode"] = "changingMode";
@@ -37,7 +38,6 @@ export class NetworkInterface extends ModelObject {
         this.firmwareVersion = null;
         this.gateway = null;
         this.mac = null;
-        this.numReconnects = null;
         this.rssi = null;
         /** @deprecated use rssi instead */
         this.signal = null;

package/dist/sbc/Memory.d.ts

@@ -1,6 +1,6 @@
 import ModelObject from "../ModelObject";
 export declare class Memory extends ModelObject {
-    available: number | null;
-    total: number | null;
+    available: number | bigint | null;
+    total: number | bigint | null;
 }
 export default Memory;

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

@@ -11,7 +11,7 @@ export declare enum SessionType {
 export declare class UserSession extends ModelObject {
     accessLevel: AccessLevel;
     id: number;
-    origin: string | null;
+    origin: string;
     originId: number;
     sessionType: SessionType;
 }

package/dist/sbc/dsf/UserSession.js

@@ -15,7 +15,7 @@ export class UserSession extends ModelObject {
         super(...arguments);
         this.accessLevel = AccessLevel.readOnly;
         this.id = 0;
-        this.origin = null;
+        this.origin = "";
         this.originId = -1;
         this.sessionType = SessionType.local;
     }

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

@@ -16,3 +16,4 @@ export declare class DSF extends ModelObject {
 export default DSF;
 export * from "./CommunicationMethod";
 export * from "./HttpEndpoint";
+export * from "./UserSession";

package/dist/sbc/dsf/index.js

@@ -19,3 +19,4 @@ export class DSF extends ModelObject {
 export default DSF;
 export * from "./CommunicationMethod";
 export * from "./HttpEndpoint";
+export * from "./UserSession";

package/dist/sensors/AnalogSensor.d.ts

@@ -12,8 +12,13 @@ export declare enum AnalogSensorType {
     bme280 = "bme280",
     bme280pressure = "bmepressure",
     bme280humidity = "bmehumidity",
-    currentLoop = "currentloooppyro",
-    ads131chan0 = "ads131.chan0",
+    bme68x = "bme68x",
+    bme68xpressure = "bme68xpressure",
+    bme68xhumidity = "bme68xhumidity",
+    bme68xgas = "bme68xgas",
+    currentLoop = "currentloop",
+    ads131chan0Unipolar = "ads131.chan0.u",
+    ads131chan0Bipolar = "ads131.chan0.b",
     ads131chan1 = "ads131.chan1",
     mcuTemp = "mcutemp",
     drivers = "drivers",
@@ -39,6 +44,10 @@ export declare enum TemperatureError {
     overOrUnderVoltage = "overOrUnderVoltage",
     badVref = "badVref",
     badVssa = "badVssa",
+    readingTooLow = "readingTooLow",
+    readingTooHigh = "readingTooHigh",
+    ambientReadingTooLow = "ambientReadingTooLow",
+    ambientReadingTooHigh = "ambientReadingTooHigh",
     unknownError = "unknownError"
 }
 export declare class AnalogSensor extends ModelObject {

package/dist/sensors/AnalogSensor.js

@@ -13,8 +13,13 @@ export var AnalogSensorType;
     AnalogSensorType["bme280"] = "bme280";
     AnalogSensorType["bme280pressure"] = "bmepressure";
     AnalogSensorType["bme280humidity"] = "bmehumidity";
-    AnalogSensorType["currentLoop"] = "currentloooppyro";
-    AnalogSensorType["ads131chan0"] = "ads131.chan0";
+    AnalogSensorType["bme68x"] = "bme68x";
+    AnalogSensorType["bme68xpressure"] = "bme68xpressure";
+    AnalogSensorType["bme68xhumidity"] = "bme68xhumidity";
+    AnalogSensorType["bme68xgas"] = "bme68xgas";
+    AnalogSensorType["currentLoop"] = "currentloop";
+    AnalogSensorType["ads131chan0Unipolar"] = "ads131.chan0.u";
+    AnalogSensorType["ads131chan0Bipolar"] = "ads131.chan0.b";
     AnalogSensorType["ads131chan1"] = "ads131.chan1";
     AnalogSensorType["mcuTemp"] = "mcutemp";
     AnalogSensorType["drivers"] = "drivers";
@@ -41,6 +46,10 @@ export var TemperatureError;
     TemperatureError["overOrUnderVoltage"] = "overOrUnderVoltage";
     TemperatureError["badVref"] = "badVref";
     TemperatureError["badVssa"] = "badVssa";
+    TemperatureError["readingTooLow"] = "readingTooLow";
+    TemperatureError["readingTooHigh"] = "readingTooHigh";
+    TemperatureError["ambientReadingTooLow"] = "ambientReadingTooLow";
+    TemperatureError["ambientReadingTooHigh"] = "ambientReadingTooHigh";
     TemperatureError["unknownError"] = "unknownError";
 })(TemperatureError || (TemperatureError = {}));
 export class AnalogSensor extends ModelObject {

package/dist/sensors/Probe.d.ts

@@ -21,8 +21,6 @@ export declare class ProbeTouchMode extends ModelObject {
 }
 export declare class Probe extends ModelObject {
     constructor();
-    calibA: number | null;
-    calibB: number | null;
     calibrationTemperature: number;
     deployedByUser: boolean;
     disablesHeaters: boolean;

package/dist/sensors/Probe.js

@@ -26,8 +26,6 @@ export class ProbeTouchMode extends ModelObject {
 export class Probe extends ModelObject {
     constructor() {
         super();
-        this.calibA = null;
-        this.calibB = null;
         this.calibrationTemperature = 0;
         this.deployedByUser = false;
         this.disablesHeaters = false;

package/dist/tools/index.d.ts

@@ -22,7 +22,7 @@ export declare class Tool extends ModelObject {
     name: string;
     number: number;
     offsets: Array<number>;
-    offsetsProbed: boolean;
+    offsetsProbed: number;
     retraction: ToolRetraction;
     spindle: number;
     spindleRpm: number;

package/dist/tools/index.js

@@ -25,7 +25,7 @@ export class Tool extends ModelObject {
         this.name = "";
         this.number = 0;
         this.offsets = [];
-        this.offsetsProbed = false;
+        this.offsetsProbed = 0;
         this.retraction = new ToolRetraction();
         this.spindle = -1;
         this.spindleRpm = 0;

package/dist/volumes/index.d.ts

@@ -4,7 +4,7 @@ export declare class Volume extends ModelObject {
     freeSpace: number | bigint | null;
     mounted: boolean;
     name: string | null;
-    openFiles: number | null;
+    openFiles: boolean | null;
     partitionSize: number | bigint | null;
     path: string | null;
     speed: number | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-alpha.14",
+  "version": "3.7.0-alpha.15",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",