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

package/dist/fans/index.d.ts

@@ -1,6 +1,5 @@
 import ModelObject from "../ModelObject";
 export declare class FanThermostaticControl extends ModelObject {
-    heaters: Array<number>;
     highTemperature: number | null;
     lowTemperature: number | null;
     sensors: Array<number>;

package/dist/fans/index.js

@@ -5,7 +5,6 @@ const ModelObject_1 = require("../ModelObject");
 class FanThermostaticControl extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.heaters = []; // *** deprecated as of v3.5, use sensors instead
         this.highTemperature = null;
         this.lowTemperature = null;
         this.sensors = [];

package/dist/move/Extruder.d.ts

@@ -6,6 +6,11 @@ export declare class ExtruderNonlinear extends ModelObject {
     b: number;
     upperLimit: number;
 }
+export declare class ExtruderPressureAdvance extends ModelObject {
+    d: number;
+    k0: number;
+    k1: number;
+}
 export declare class Extruder extends ModelObject {
     constructor();
     acceleration: number;
@@ -21,6 +26,10 @@ export declare class Extruder extends ModelObject {
     percentStstCurrent: number | null;
     phaseStep: boolean | null;
     position: number;
+    readonly pressAdv: ExtruderPressureAdvance;
+    /**
+     * @deprecated use pressAdv instead
+     */
     pressureAdvance: number;
     printingJerk: number;
     rawPosition: number;

package/dist/move/Extruder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Extruder = exports.ExtruderNonlinear = void 0;
+exports.Extruder = exports.ExtruderPressureAdvance = exports.ExtruderNonlinear = void 0;
 const ModelObject_1 = require("../ModelObject");
 const DriverId_1 = require("./DriverId");
 const Microstepping_1 = require("./Microstepping");
@@ -13,6 +13,15 @@ class ExtruderNonlinear extends ModelObject_1.default {
     }
 }
 exports.ExtruderNonlinear = ExtruderNonlinear;
+class ExtruderPressureAdvance extends ModelObject_1.default {
+    constructor() {
+        super(...arguments);
+        this.d = 0;
+        this.k0 = 0;
+        this.k1 = 0;
+    }
+}
+exports.ExtruderPressureAdvance = ExtruderPressureAdvance;
 class Extruder extends ModelObject_1.default {
     constructor() {
         super();
@@ -29,6 +38,10 @@ class Extruder extends ModelObject_1.default {
         this.percentStstCurrent = null;
         this.phaseStep = null;
         this.position = 0;
+        this.pressAdv = new ExtruderPressureAdvance();
+        /**
+         * @deprecated use pressAdv instead
+         */
         this.pressureAdvance = 0;
         this.printingJerk = 15;
         this.rawPosition = 0;

package/dist/move/MotionSystem.d.ts

@@ -0,0 +1,20 @@
+import ModelObject from "../ModelObject";
+import ModelCollection from "../ModelCollection";
+import RestorePoint from "../state/RestorePoint";
+import { CurrentMove, MoveRotation } from ".";
+export declare class MotionSystem extends ModelObject {
+    readonly currentMove: CurrentMove;
+    currentObject: number | null;
+    currentTool: number;
+    nextTool: number;
+    previousTool: number;
+    printingAcceleration: number;
+    readonly restorePoints: ModelCollection<RestorePoint>;
+    readonly rotation: MoveRotation;
+    speedFactor: number;
+    travelAcceleration: number;
+    userPosition: Array<number>;
+    virtualEPos: number;
+    workplaceNumber: number;
+}
+export default MotionSystem;

package/dist/move/MotionSystem.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MotionSystem = void 0;
+const ModelObject_1 = require("../ModelObject");
+const ModelCollection_1 = require("../ModelCollection");
+const RestorePoint_1 = require("../state/RestorePoint");
+const _1 = require(".");
+class MotionSystem extends ModelObject_1.default {
+    constructor() {
+        super(...arguments);
+        this.currentMove = new _1.CurrentMove();
+        this.currentObject = null;
+        this.currentTool = -1;
+        this.nextTool = -1;
+        this.previousTool = -1;
+        this.printingAcceleration = 10000;
+        this.restorePoints = new ModelCollection_1.default(RestorePoint_1.default);
+        this.rotation = new _1.MoveRotation();
+        this.speedFactor = 1;
+        this.travelAcceleration = 10000;
+        this.userPosition = [];
+        this.virtualEPos = 0;
+        this.workplaceNumber = 0;
+    }
+}
+exports.MotionSystem = MotionSystem;
+exports.default = MotionSystem;

package/dist/move/index.d.ts

@@ -4,6 +4,7 @@ import Axis from "./Axis";
 import Extruder from "./Extruder";
 import InputShaping from "./InputShaping";
 import KeepoutZone from "./KeepoutZone";
+import MotionSystem from "./MotionSystem";
 import MoveCalibration from "./MoveCalibration";
 import MoveCompensation from "./MoveCompensation";
 import Kinematics from "./kinematics";
@@ -40,14 +41,30 @@ export declare class Move extends ModelObject {
     kinematics: Kinematics;
     limitAxes: boolean;
     noMovesBeforeHoming: boolean;
+    readonly motionSystems: ModelCollection<MotionSystem>;
+    /**
+     * @deprecated use motionSystems[].printingAcceleration instead
+     */
     printingAcceleration: number;
     readonly queue: ModelCollection<MoveQueueItem>;
+    /**
+     * @deprecated use motionSystems[].rotation instead
+     */
     readonly rotation: MoveRotation;
     readonly shaping: InputShaping;
     speedFactor: number;
+    /**
+     * @deprecated use motionSystems[].travelAcceleration instead
+     */
     travelAcceleration: number;
-    usingSCurve: boolean | null;
+    usingSCurve: boolean;
+    /**
+     * @deprecated use motionSystems[].virtualEPos instead
+     */
     virtualEPos: number;
+    /**
+     * @deprecated use motionSystems[].workplaceNumber instead
+     */
     workplaceNumber: number;
 }
 export default Move;
@@ -59,4 +76,5 @@ export * from "./InputShaping";
 export * from "./KeepoutZone";
 export * from "./Microstepping";
 export * from "./MoveCalibration";
+export * from "./MotionSystem";
 export * from "./MoveCompensation";

package/dist/move/index.js

@@ -21,6 +21,7 @@ const Axis_1 = require("./Axis");
 const Extruder_1 = require("./Extruder");
 const InputShaping_1 = require("./InputShaping");
 const KeepoutZone_1 = require("./KeepoutZone");
+const MotionSystem_1 = require("./MotionSystem");
 const MoveCalibration_1 = require("./MoveCalibration");
 const MoveCompensation_1 = require("./MoveCompensation");
 const kinematics_1 = require("./kinematics");
@@ -75,14 +76,30 @@ class Move extends ModelObject_1.default {
         this.kinematics = new kinematics_1.CoreKinematics(kinematics_1.KinematicsName.cartesian);
         this.limitAxes = true;
         this.noMovesBeforeHoming = true;
+        this.motionSystems = new ModelCollection_1.default(MotionSystem_1.default);
+        /**
+         * @deprecated use motionSystems[].printingAcceleration instead
+         */
         this.printingAcceleration = 10000;
         this.queue = new ModelCollection_1.default(MoveQueueItem);
+        /**
+         * @deprecated use motionSystems[].rotation instead
+         */
         this.rotation = new MoveRotation();
         this.shaping = new InputShaping_1.default();
         this.speedFactor = 1;
+        /**
+         * @deprecated use motionSystems[].travelAcceleration instead
+         */
         this.travelAcceleration = 10000;
-        this.usingSCurve = null;
+        this.usingSCurve = false;
+        /**
+         * @deprecated use motionSystems[].virtualEPos instead
+         */
         this.virtualEPos = 0;
+        /**
+         * @deprecated use motionSystems[].workplaceNumber instead
+         */
         this.workplaceNumber = 0;
     }
 }
@@ -96,4 +113,5 @@ __exportStar(require("./InputShaping"), exports);
 __exportStar(require("./KeepoutZone"), exports);
 __exportStar(require("./Microstepping"), exports);
 __exportStar(require("./MoveCalibration"), exports);
+__exportStar(require("./MotionSystem"), exports);
 __exportStar(require("./MoveCompensation"), exports);

package/dist/state/index.d.ts

@@ -43,10 +43,19 @@ export declare class State extends ModelObject {
     machineMode: MachineMode;
     macroRestarted: boolean;
     msUpTime: number;
+    /**
+     * @deprecated use move.motionSystems[].nextTool instead
+     */
     nextTool: number;
     pluginsStarted: boolean;
     powerFailScript: string;
+    /**
+     * @deprecated use move.motionSystems[].previousTool instead
+     */
     previousTool: number;
+    /**
+     * @deprecated use move.motionSystems[].restorePoints instead
+     */
     readonly restorePoints: ModelCollection<RestorePoint>;
     startupError: StartupError | null;
     status: MachineStatus;

package/dist/state/index.js

@@ -75,10 +75,19 @@ class State extends ModelObject_1.default {
         this.machineMode = MachineMode.fff;
         this.macroRestarted = false;
         this.msUpTime = 0;
+        /**
+         * @deprecated use move.motionSystems[].nextTool instead
+         */
         this.nextTool = -1;
         this.pluginsStarted = false;
         this.powerFailScript = "";
+        /**
+         * @deprecated use move.motionSystems[].previousTool instead
+         */
         this.previousTool = -1;
+        /**
+         * @deprecated use move.motionSystems[].restorePoints instead
+         */
         this.restorePoints = new ModelCollection_1.default(RestorePoint_1.default);
         this.startupError = null;
         this.status = MachineStatus_1.MachineStatus.starting;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-alpha.3",
+  "version": "3.7.0-alpha.5",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",