@duet3d/objectmodel 3.7.0-alpha.9 → 3.7.0-beta.2

package/dist/enums.json

@@ -4,6 +4,14 @@
 		"ST7567",
 		"ILI9488"
 	],
+	"boards[].drivers[].config.mode": [
+		"0",
+		"1",
+		"2",
+		"3",
+		"4",
+		"5"
+	],
 	"boards[].state": [
 		"unknown",
 		"flashing",
@@ -12,6 +20,12 @@
 		"running",
 		"timedOut"
 	],
+	"heat.heaters[].monitors[].action": [
+		"0",
+		"1",
+		"2",
+		"3"
+	],
 	"heat.heaters[].monitors[].condition": [
 		"disabled",
 		"tooHigh",
@@ -51,6 +65,14 @@
 		"png",
 		"qoi"
 	],
+	"ledStrips[].colorOrder": [
+		"0",
+		"1",
+		"2",
+		"3",
+		"4",
+		"5"
+	],
 	"ledStrips[].type": [
 		"DotStar",
 		"NeoPixel_RGB",
@@ -123,10 +145,27 @@
 		"ei3",
 		"custom"
 	],
+	"network.interfaces[].state": [
+		"disabled",
+		"enabled",
+		"initFailed",
+		"starting1",
+		"starting2",
+		"changingMode",
+		"establishingLink",
+		"obtainingIP",
+		"connected",
+		"active",
+		"idle"
+	],
 	"network.interfaces[].type": [
 		"ethernet",
 		"wifi"
 	],
+	"sbc.dsf.communicationMethod": [
+		"spi",
+		"usb"
+	],
 	"sbc.dsf.httpEndpoints[].endpointType": [
 		"GET",
 		"POST",
@@ -165,6 +204,10 @@
 		"overOrUnderVoltage",
 		"badVref",
 		"badVssa",
+		"readingTooLow",
+		"readingTooHigh",
+		"ambientReadingTooLow",
+		"ambientReadingTooHigh",
 		"unknownError"
 	],
 	"sensors.analog[].type": [
@@ -180,8 +223,13 @@
 		"bme280",
 		"bmepressure",
 		"bmehumidity",
-		"currentloooppyro",
-		"ads131.chan0",
+		"bme68x",
+		"bme68xpressure",
+		"bme68xhumidity",
+		"bme68xgas",
+		"currentloop",
+		"ads131.chan0.u",
+		"ads131.chan0.b",
 		"ads131.chan1",
 		"mcutemp",
 		"drivers",
@@ -236,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/inputs/InputChannel.d.ts

@@ -16,10 +16,12 @@ export declare class InputChannel extends ModelObject {
     active: boolean;
     axesRelative: boolean;
     compatibility: Compatibility;
+    currentFile: string | null;
     distanceUnit: DistanceUnit;
     drivesRelative: boolean;
     feedRate: number;
     inMacro: boolean;
+    inverseTimeMode: boolean;
     macroRestartable: boolean;
     motionSystem: number;
     name: string;

package/dist/inputs/InputChannel.js

@@ -20,10 +20,12 @@ export class InputChannel extends ModelObject {
         this.active = true;
         this.axesRelative = false;
         this.compatibility = Compatibility.RepRapFirmware;
+        this.currentFile = null;
         this.distanceUnit = DistanceUnit.mm;
         this.drivesRelative = true;
         this.feedRate = 50;
         this.inMacro = false;
+        this.inverseTimeMode = false;
         this.macroRestartable = false;
         this.motionSystem = 0;
         this.name = "";

package/dist/job/Build.d.ts

@@ -8,8 +8,8 @@ export declare class BuildObject extends ModelObject {
 }
 export declare class Build extends ModelObject {
     currentObject: number;
-    m486names: boolean;
-    m486numbers: boolean;
+    m486Names: boolean;
+    m486Numbers: boolean;
     readonly objects: ModelCollection<BuildObject>;
 }
 export default Build;

package/dist/job/Build.js

@@ -13,8 +13,8 @@ export class Build extends ModelObject {
     constructor() {
         super(...arguments);
         this.currentObject = -1;
-        this.m486names = false;
-        this.m486numbers = false;
+        this.m486Names = false;
+        this.m486Numbers = false;
         this.objects = new ModelCollection(BuildObject);
     }
 }

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.d.ts

@@ -4,8 +4,18 @@ export declare enum LedStripType {
     NeoPixel_RGB = "NeoPixel_RGB",
     NeoPixel_RGBW = "NeoPixel_RGBW"
 }
+export declare enum LedStripColorOrder {
+    BGR = 0,
+    BRG = 1,
+    RGB = 2,
+    RBG = 3,
+    GBR = 4,
+    GRB = 5
+}
 export declare class LedStrip extends ModelObject {
     board: number;
+    colorOrder: LedStripColorOrder;
+    maxLeds: number;
     pin: string;
     stopMovement: boolean;
     type: LedStripType;

package/dist/ledStrips/index.js

@@ -5,10 +5,21 @@ export var LedStripType;
     LedStripType["NeoPixel_RGB"] = "NeoPixel_RGB";
     LedStripType["NeoPixel_RGBW"] = "NeoPixel_RGBW";
 })(LedStripType || (LedStripType = {}));
+export var LedStripColorOrder;
+(function (LedStripColorOrder) {
+    LedStripColorOrder[LedStripColorOrder["BGR"] = 0] = "BGR";
+    LedStripColorOrder[LedStripColorOrder["BRG"] = 1] = "BRG";
+    LedStripColorOrder[LedStripColorOrder["RGB"] = 2] = "RGB";
+    LedStripColorOrder[LedStripColorOrder["RBG"] = 3] = "RBG";
+    LedStripColorOrder[LedStripColorOrder["GBR"] = 4] = "GBR";
+    LedStripColorOrder[LedStripColorOrder["GRB"] = 5] = "GRB";
+})(LedStripColorOrder || (LedStripColorOrder = {}));
 export class LedStrip extends ModelObject {
     constructor() {
         super(...arguments);
         this.board = 0;
+        this.colorOrder = LedStripColorOrder.BGR;
+        this.maxLeds = 0;
         this.pin = "";
         this.stopMovement = false;
         this.type = LedStripType.DotStar;

package/dist/move/Extruder.d.ts

@@ -28,7 +28,7 @@ export declare class Extruder extends ModelObject {
     position: number;
     readonly pressAdv: ExtruderPressureAdvance;
     /**
-     * @deprecated use pressAdv instead
+     * @deprecated use pressAdv.k0 instead
      */
     pressureAdvance: number;
     printingJerk: number;

package/dist/move/Extruder.js

@@ -35,7 +35,7 @@ export class Extruder extends ModelObject {
         this.position = 0;
         this.pressAdv = new ExtruderPressureAdvance();
         /**
-         * @deprecated use pressAdv instead
+         * @deprecated use pressAdv.k0 instead
          */
         this.pressureAdvance = 0;
         this.printingJerk = 15;

package/dist/move/index.d.ts

@@ -11,6 +11,8 @@ import Kinematics from "./kinematics";
 export declare class CurrentMove extends ModelObject {
     acceleration: number;
     deceleration: number;
+    distance: number;
+    duration: number;
     extrusionRate: number;
     laserPwm: number | null;
     requestedSpeed: number;

package/dist/move/index.js

@@ -13,6 +13,8 @@ export class CurrentMove extends ModelObject {
         super(...arguments);
         this.acceleration = 0;
         this.deceleration = 0;
+        this.distance = 0;
+        this.duration = 0;
         this.extrusionRate = 0;
         this.laserPwm = null;
         this.requestedSpeed = 0;

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

@@ -16,11 +16,11 @@ export declare enum KinematicsName {
 }
 export declare class MoveSegmentation extends ModelObject {
     segmentsPerSec: number;
-    minSegmentLength: number;
+    minSegLength: number;
 }
 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

@@ -19,14 +19,15 @@ export class MoveSegmentation extends ModelObject {
     constructor() {
         super(...arguments);
         this.segmentsPerSec = 0;
-        this.minSegmentLength = 0;
+        this.minSegLength = 0;
     }
 }
 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/plugins/PluginManifest.d.ts

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

package/dist/plugins/PluginManifest.js

@@ -55,6 +55,7 @@ export class PluginManifest extends ModelObject {
         this.sbcExecutableArguments = null;
         this.sbcExtraExecutables = [];
         this.sbcAutoRestart = false;
+        this.sbcNotifyStarted = false;
         this.sbcOutputRedirected = true;
         this.sbcPermissions = new ModelSet();
         this.sbcConfigFiles = [];

package/dist/plugins/index.d.ts

@@ -4,6 +4,7 @@ export declare class Plugin extends PluginManifest {
     dwcFiles: Array<string>;
     sdFiles: Array<string>;
     pid: number;
+    started: boolean;
 }
 export default Plugin;
 export * from "./PluginManifest";

package/dist/plugins/index.js

@@ -6,6 +6,7 @@ export class Plugin extends PluginManifest {
         this.dwcFiles = [];
         this.sdFiles = [];
         this.pid = -1;
+        this.started = false;
     }
 }
 export default Plugin;

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

@@ -0,0 +1,5 @@
+export declare enum CommunicationMethod {
+    spi = "spi",
+    usb = "usb"
+}
+export default CommunicationMethod;

package/dist/sbc/dsf/CommunicationMethod.js

@@ -0,0 +1,6 @@
+export var CommunicationMethod;
+(function (CommunicationMethod) {
+    CommunicationMethod["spi"] = "spi";
+    CommunicationMethod["usb"] = "usb";
+})(CommunicationMethod || (CommunicationMethod = {}));
+export default CommunicationMethod;

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

@@ -1,9 +1,11 @@
 import ModelCollection from "../../ModelCollection";
 import ModelObject from "../../ModelObject";
+import CommunicationMethod from "./CommunicationMethod";
 import HttpEndpoint from "./HttpEndpoint";
 import UserSession from "./UserSession";
 export declare class DSF extends ModelObject {
     buildDateTime: string;
+    communicationMethod: CommunicationMethod;
     readonly httpEndpoints: ModelCollection<HttpEndpoint>;
     is64Bit: boolean;
     pluginSupport: boolean;
@@ -12,4 +14,6 @@ export declare class DSF extends ModelObject {
     version: string;
 }
 export default DSF;
+export * from "./CommunicationMethod";
 export * from "./HttpEndpoint";
+export * from "./UserSession";

package/dist/sbc/dsf/index.js

@@ -1,11 +1,13 @@
 import ModelCollection from "../../ModelCollection";
 import ModelObject from "../../ModelObject";
+import CommunicationMethod from "./CommunicationMethod";
 import HttpEndpoint from "./HttpEndpoint";
 import UserSession from "./UserSession";
 export class DSF extends ModelObject {
     constructor() {
         super(...arguments);
         this.buildDateTime = "";
+        this.communicationMethod = CommunicationMethod.spi;
         this.httpEndpoints = new ModelCollection(HttpEndpoint);
         this.is64Bit = false;
         this.pluginSupport = false;
@@ -15,4 +17,6 @@ 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/FilamentMonitors/LaserFilamentMonitor.d.ts

@@ -4,7 +4,7 @@ import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
 export declare class LaserFilamentMonitorCalibrated extends ModelObject {
     percentMax: number;
     percentMin: number;
-    sensivity: number;
+    sensitivity: number;
     totalDistance: number;
 }
 export declare class LaserFilamentMonitorConfigured extends ModelObject {

package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js

@@ -7,7 +7,7 @@ export class LaserFilamentMonitorCalibrated extends ModelObject {
         super(...arguments);
         this.percentMax = 0;
         this.percentMin = 0;
-        this.sensivity = 0;
+        this.sensitivity = 0;
         this.totalDistance = 0;
     }
 }

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

@@ -2,7 +2,7 @@ import ModelObject from "../../ModelObject";
 import type { IModelObject } from "../../ModelObject";
 import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
 export declare class RotatingMagnetFilamentMonitorCalibrated extends ModelObject {
-    mmPerPulse: number;
+    mmPerRev: number;
     percentMax: number;
     percentMin: number;
     totalDistance: number;

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js

@@ -5,7 +5,7 @@ import { getFilamentMonitor } from "./index";
 export class RotatingMagnetFilamentMonitorCalibrated extends ModelObject {
     constructor() {
         super(...arguments);
-        this.mmPerPulse = 0;
+        this.mmPerRev = 0;
         this.percentMax = 0;
         this.percentMin = 0;
         this.totalDistance = 0;

package/dist/sensors/Probe.d.ts

@@ -15,14 +15,12 @@ export declare enum ProbeType {
 }
 export declare class ProbeTouchMode extends ModelObject {
     active: boolean;
-    sensitivity: number;
+    speed: number;
     triggerHeight: number;
     threshold: number;
 }
 export declare class Probe extends ModelObject {
     constructor();
-    calibA: number | null;
-    calibB: number | null;
     calibrationTemperature: number;
     deployedByUser: boolean;
     disablesHeaters: boolean;