@duet3d/objectmodel 3.5.0-rc.9 → 3.5.0

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/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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.5.0-rc.9",
+  "version": "3.5.0",
   "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"