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

package/dist/index.js

@@ -1,47 +1,30 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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.setArrayItem = setArrayItem;
 // Expose all the sub-exports
-__exportStar(require("./ModelCollection"), exports);
-__exportStar(require("./ModelDictionary"), exports);
-__exportStar(require("./ModelObject"), exports);
-__exportStar(require("./ModelSet"), exports);
-__exportStar(require("./boards"), exports);
-__exportStar(require("./directories"), exports);
-__exportStar(require("./fans"), exports);
-__exportStar(require("./heat"), exports);
-__exportStar(require("./inputs"), exports);
-__exportStar(require("./job"), exports);
-__exportStar(require("./ledStrips"), exports);
-__exportStar(require("./limits"), exports);
-__exportStar(require("./messages"), exports);
-__exportStar(require("./move"), exports);
-__exportStar(require("./network"), exports);
-__exportStar(require("./plugins"), exports);
-__exportStar(require("./sensors"), exports);
-__exportStar(require("./spindles"), exports);
-__exportStar(require("./sbc"), exports);
-__exportStar(require("./state"), exports);
-__exportStar(require("./tools"), exports);
-__exportStar(require("./volumes"), exports);
-__exportStar(require("./ObjectModel"), exports);
+export * from "./ModelCollection";
+export * from "./ModelDictionary";
+export * from "./ModelObject";
+export * from "./ModelSet";
+export * from "./boards";
+export * from "./directories";
+export * from "./fans";
+export * from "./heat";
+export * from "./inputs";
+export * from "./job";
+export * from "./ledStrips";
+export * from "./limits";
+export * from "./messages";
+export * from "./move";
+export * from "./network";
+export * from "./plugins";
+export * from "./sensors";
+export * from "./spindles";
+export * from "./sbc";
+export * from "./state";
+export * from "./tools";
+export * from "./volumes";
+export * from "./ObjectModel";
 // Expose ObjectModel as default export
-const ObjectModel_1 = require("./ObjectModel");
-exports.default = ObjectModel_1.default;
+import ObjectModel from "./ObjectModel";
+export default ObjectModel;
 // Unfortunately we need to define a way to update arrays to remain compatible with Vue 2 (due to IE11).
 // This will become obsolete as soon as DWC is upgraded to Vue 3, but that isn't going to happen anytime soon.
 // Until then a Vue 2 user would have to call something like this on initialization to work around this limitation:
@@ -49,6 +32,6 @@ exports.default = ObjectModel_1.default;
 // or in TypeScript
 // (globalThis as any)._duetModelSetArray = (array: object, index: string | number, value: any) => Vue.set(array, index, value);
 globalThis._duetModelSetArray = (array, index, value) => array[index] = value;
-function setArrayItem(array, index, value) {
+export function setArrayItem(array, index, value) {
     globalThis._duetModelSetArray(array, index, value);
 }

package/dist/inputs/CodeChannel.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodeChannel = void 0;
-var CodeChannel;
+export var CodeChannel;
 (function (CodeChannel) {
     CodeChannel[CodeChannel["http"] = 0] = "http";
     CodeChannel[CodeChannel["telnet"] = 1] = "telnet";
@@ -18,5 +15,5 @@ var CodeChannel;
     CodeChannel[CodeChannel["file2"] = 12] = "file2";
     CodeChannel[CodeChannel["queue2"] = 13] = "queue2";
     CodeChannel[CodeChannel["unknown"] = 14] = "unknown";
-})(CodeChannel || (exports.CodeChannel = CodeChannel = {}));
-exports.default = CodeChannel;
+})(CodeChannel || (CodeChannel = {}));
+export default CodeChannel;

package/dist/inputs/Compatibility.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Compatibility = void 0;
-var Compatibility;
+export var Compatibility;
 (function (Compatibility) {
     Compatibility["Default"] = "Default";
     Compatibility["RepRapFirmware"] = "RepRapFirmware";
@@ -10,5 +7,5 @@ var Compatibility;
     Compatibility["Sprinter"] = "Sprinter";
     Compatibility["Repetier"] = "Repetier";
     Compatibility["NanoDLP"] = "NanoDLP";
-})(Compatibility || (exports.Compatibility = Compatibility = {}));
-exports.default = Compatibility;
+})(Compatibility || (Compatibility = {}));
+export default Compatibility;

package/dist/inputs/InputChannel.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InputChannel = exports.InputChannelState = exports.DistanceUnit = void 0;
-const ModelObject_1 = require("../ModelObject");
-const Compatibility_1 = require("./Compatibility");
-var DistanceUnit;
+import ModelObject from "../ModelObject";
+import Compatibility from "./Compatibility";
+export var DistanceUnit;
 (function (DistanceUnit) {
     DistanceUnit["mm"] = "mm";
     DistanceUnit["inch"] = "in";
-})(DistanceUnit || (exports.DistanceUnit = DistanceUnit = {}));
-var InputChannelState;
+})(DistanceUnit || (DistanceUnit = {}));
+export var InputChannelState;
 (function (InputChannelState) {
     InputChannelState["awaitingAcknowledgement"] = "awaitingAcknowledgement";
     InputChannelState["idle"] = "idle";
@@ -16,13 +13,13 @@ var InputChannelState;
     InputChannelState["waiting"] = "waiting";
     InputChannelState["reading"] = "reading";
     InputChannelState["unused"] = "unused";
-})(InputChannelState || (exports.InputChannelState = InputChannelState = {}));
-class InputChannel extends ModelObject_1.default {
+})(InputChannelState || (InputChannelState = {}));
+export class InputChannel extends ModelObject {
     constructor() {
         super(...arguments);
         this.active = true;
         this.axesRelative = false;
-        this.compatibility = Compatibility_1.default.RepRapFirmware;
+        this.compatibility = Compatibility.RepRapFirmware;
         this.distanceUnit = DistanceUnit.mm;
         this.drivesRelative = true;
         this.feedRate = 50;
@@ -37,5 +34,4 @@ class InputChannel extends ModelObject_1.default {
         this.volumetric = false;
     }
 }
-exports.InputChannel = InputChannel;
-exports.default = InputChannel;
+export default InputChannel;

package/dist/inputs/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 });
-__exportStar(require("./CodeChannel"), exports);
-__exportStar(require("./Compatibility"), exports);
-__exportStar(require("./InputChannel"), exports);
+export * from "./CodeChannel";
+export * from "./Compatibility";
+export * from "./InputChannel";

package/dist/job/Build.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Build = exports.BuildObject = void 0;
-const ModelCollection_1 = require("../ModelCollection");
-const ModelObject_1 = require("../ModelObject");
-class BuildObject extends ModelObject_1.default {
+import ModelCollection from "../ModelCollection";
+import ModelObject from "../ModelObject";
+export class BuildObject extends ModelObject {
     constructor() {
         super(...arguments);
         this.cancelled = false;
@@ -12,15 +9,13 @@ class BuildObject extends ModelObject_1.default {
         this.y = new Array();
     }
 }
-exports.BuildObject = BuildObject;
-class Build extends ModelObject_1.default {
+export class Build extends ModelObject {
     constructor() {
         super(...arguments);
         this.currentObject = -1;
         this.m486names = false;
         this.m486numbers = false;
-        this.objects = new ModelCollection_1.default(BuildObject);
+        this.objects = new ModelCollection(BuildObject);
     }
 }
-exports.Build = Build;
-exports.default = Build;
+export default Build;

package/dist/job/GCodeFileInfo.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GCodeFileInfo = void 0;
-const ModelCollection_1 = require("../ModelCollection");
-const ModelDictionary_1 = require("../ModelDictionary");
-const ModelObject_1 = require("../ModelObject");
-const ThumbnailInfo_1 = require("./ThumbnailInfo");
-class GCodeFileInfo extends ModelObject_1.default {
+import ModelCollection from "../ModelCollection";
+import ModelDictionary from "../ModelDictionary";
+import ModelObject from "../ModelObject";
+import ThumbnailInfo from "./ThumbnailInfo";
+export class GCodeFileInfo extends ModelObject {
     constructor() {
         super(...arguments);
-        this.customInfo = new ModelDictionary_1.default(false);
+        this.customInfo = new ModelDictionary(false);
         this.filament = new Array();
         this.fileName = "";
         this.generatedBy = "";
@@ -19,8 +16,7 @@ class GCodeFileInfo extends ModelObject_1.default {
         this.printTime = null;
         this.simulatedTime = null;
         this.size = 0;
-        this.thumbnails = new ModelCollection_1.default(ThumbnailInfo_1.default);
+        this.thumbnails = new ModelCollection(ThumbnailInfo);
     }
 }
-exports.GCodeFileInfo = GCodeFileInfo;
-exports.default = GCodeFileInfo;
+export default GCodeFileInfo;

package/dist/job/ThumbnailInfo.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThumbnailInfo = exports.ThumbnailFormat = void 0;
-const ModelObject_1 = require("../ModelObject");
-var ThumbnailFormat;
+import { ModelObject } from "../ModelObject";
+export var ThumbnailFormat;
 (function (ThumbnailFormat) {
     ThumbnailFormat["jpeg"] = "jpeg";
     ThumbnailFormat["png"] = "png";
     ThumbnailFormat["qoi"] = "qoi";
-})(ThumbnailFormat || (exports.ThumbnailFormat = ThumbnailFormat = {}));
-class ThumbnailInfo extends ModelObject_1.ModelObject {
+})(ThumbnailFormat || (ThumbnailFormat = {}));
+export class ThumbnailInfo extends ModelObject {
     constructor() {
         super(...arguments);
         this.data = null;
@@ -19,5 +16,4 @@ class ThumbnailInfo extends ModelObject_1.ModelObject {
         this.width = 0;
     }
 }
-exports.ThumbnailInfo = ThumbnailInfo;
-exports.default = ThumbnailInfo;
+export default ThumbnailInfo;

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

@@ -1,36 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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.Job = exports.TimesLeft = exports.Layer = void 0;
-const ModelCollection_1 = require("../ModelCollection");
-const ModelObject_1 = require("../ModelObject");
-const Build_1 = require("./Build");
-const GCodeFileInfo_1 = require("./GCodeFileInfo");
-class Layer extends ModelObject_1.default {
+import ModelCollection from "../ModelCollection";
+import ModelObject from "../ModelObject";
+import Build from "./Build";
+import GCodeFileInfo from "./GCodeFileInfo";
+export class Layer extends ModelObject {
     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();
     }
 }
-exports.Layer = Layer;
-class TimesLeft extends ModelObject_1.default {
+export class TimesLeft extends ModelObject {
     constructor() {
         super(...arguments);
         this.filament = null;
@@ -39,11 +25,10 @@ class TimesLeft extends ModelObject_1.default {
         this.toPause = null;
     }
 }
-exports.TimesLeft = TimesLeft;
-class Job extends ModelObject_1.default {
+export class Job extends ModelObject {
     constructor() {
         super();
-        this.build = new Build_1.default();
+        this.build = new Build();
         this.duration = null;
         this.file = null;
         this.filePosition = null;
@@ -54,18 +39,17 @@ class Job extends ModelObject_1.default {
         this.lastFileSimulated = false;
         this.lastWarmUpDuration = null;
         this.layer = null;
-        this.layers = new ModelCollection_1.default(Layer);
+        this.layers = new ModelCollection(Layer);
         this.layerTime = null;
         this.pauseDuration = null;
         this.rawExtrusion = null;
         this.timesLeft = new TimesLeft();
         this.warmUpDuration = null;
-        ModelObject_1.default.wrapModelProperty(this, "build", Build_1.default);
-        ModelObject_1.default.wrapModelProperty(this, "file", GCodeFileInfo_1.default);
+        ModelObject.wrapModelProperty(this, "build", Build);
+        ModelObject.wrapModelProperty(this, "file", GCodeFileInfo);
     }
 }
-exports.Job = Job;
-exports.default = Job;
-__exportStar(require("./Build"), exports);
-__exportStar(require("./GCodeFileInfo"), exports);
-__exportStar(require("./ThumbnailInfo"), exports);
+export default Job;
+export * from "./Build";
+export * from "./GCodeFileInfo";
+export * from "./ThumbnailInfo";

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

@@ -1,21 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LedStrip = exports.LedStripType = void 0;
-const ModelObject_1 = require("../ModelObject");
-var LedStripType;
+import ModelObject from "../ModelObject";
+export var LedStripType;
 (function (LedStripType) {
     LedStripType["DotStar"] = "DotStar";
     LedStripType["NeoPixel_RGB"] = "NeoPixel_RGB";
     LedStripType["NeoPixel_RGBW"] = "NeoPixel_RGBW";
-})(LedStripType || (exports.LedStripType = LedStripType = {}));
-class LedStrip extends ModelObject_1.default {
+})(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.GRB;
+        this.maxLeds = 0;
         this.pin = "";
         this.stopMovement = false;
         this.type = LedStripType.DotStar;
     }
 }
-exports.LedStrip = LedStrip;
-exports.default = LedStrip;
+export default LedStrip;

package/dist/limits/index.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Limits = void 0;
-const ModelObject_1 = require("../ModelObject");
-class Limits extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+export class Limits extends ModelObject {
     constructor() {
         super(...arguments);
         this.axes = null;
@@ -35,5 +32,4 @@ class Limits extends ModelObject_1.default {
         this.zProbes = null;
     }
 }
-exports.Limits = Limits;
-exports.default = Limits;
+export default Limits;

package/dist/messages/index.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Message = exports.MessageType = void 0;
-const ModelObject_1 = require("../ModelObject");
-var MessageType;
+import ModelObject from "../ModelObject";
+export var MessageType;
 (function (MessageType) {
     MessageType[MessageType["success"] = 0] = "success";
     MessageType[MessageType["warning"] = 1] = "warning";
     MessageType[MessageType["error"] = 2] = "error";
-})(MessageType || (exports.MessageType = MessageType = {}));
-class Message extends ModelObject_1.default {
+})(MessageType || (MessageType = {}));
+export class Message extends ModelObject {
     constructor() {
         super(...arguments);
         this.content = "";
@@ -23,5 +20,4 @@ class Message extends ModelObject_1.default {
         }
     }
 }
-exports.Message = Message;
-exports.default = Message;
+export default Message;

package/dist/move/Axis.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Axis = exports.AxisLetter = void 0;
-const ModelObject_1 = require("../ModelObject");
-const ModelCollection_1 = require("../ModelCollection");
-const DriverId_1 = require("./DriverId");
-const Microstepping_1 = require("./Microstepping");
-var AxisLetter;
+import ModelObject from "../ModelObject";
+import ModelCollection from "../ModelCollection";
+import DriverId from "./DriverId";
+import Microstepping from "./Microstepping";
+export var AxisLetter;
 (function (AxisLetter) {
     AxisLetter["X"] = "X";
     AxisLetter["Y"] = "Y";
@@ -44,22 +41,22 @@ var AxisLetter;
     AxisLetter["y"] = "y";
     AxisLetter["z"] = "z";
     AxisLetter["none"] = "";
-})(AxisLetter || (exports.AxisLetter = AxisLetter = {}));
-class Axis extends ModelObject_1.default {
+})(AxisLetter || (AxisLetter = {}));
+export class Axis extends ModelObject {
     constructor() {
         super(...arguments);
         this.acceleration = 0;
         this.babystep = 0;
         this.backlash = 0;
         this.current = 0;
-        this.drivers = new ModelCollection_1.default(DriverId_1.default);
+        this.drivers = new ModelCollection(DriverId);
         this.homed = false;
         this.jerk = 15;
         this.letter = AxisLetter.none;
         this.machinePosition = null;
         this.max = 200;
         this.maxProbed = false;
-        this.microstepping = new Microstepping_1.default();
+        this.microstepping = new Microstepping();
         this.min = 0;
         this.minProbed = false;
         this.percentCurrent = 100;
@@ -75,5 +72,4 @@ class Axis extends ModelObject_1.default {
         this.workplaceOffsets = new Array();
     }
 }
-exports.Axis = Axis;
-exports.default = Axis;
+export default Axis;

package/dist/move/DriverId.d.ts

@@ -1,4 +1,5 @@
-import ModelObject, { IModelObject } from "../ModelObject";
+import ModelObject from "../ModelObject";
+import type { IModelObject } from "../ModelObject";
 export declare function isDriverId(value: any): value is DriverId;
 export declare class DriverId extends ModelObject {
     board: number | null;

package/dist/move/DriverId.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DriverId = void 0;
-exports.isDriverId = isDriverId;
-const ModelObject_1 = require("../ModelObject");
-function isDriverId(value) {
+import ModelObject from "../ModelObject";
+export function isDriverId(value) {
     return (value instanceof Object) && value.board !== undefined && value.driver !== undefined;
 }
-class DriverId extends ModelObject_1.default {
+export class DriverId extends ModelObject {
     constructor() {
         super(...arguments);
         this.board = null;
@@ -45,5 +41,4 @@ class DriverId extends ModelObject_1.default {
         return (this.board === null) ? this.driver.toString() : `${this.board}.${this.driver}`;
     }
 }
-exports.DriverId = DriverId;
-exports.default = DriverId;
+export default DriverId;

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 | null;
+    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,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Extruder = exports.ExtruderNonlinear = void 0;
-const ModelObject_1 = require("../ModelObject");
-const DriverId_1 = require("./DriverId");
-const Microstepping_1 = require("./Microstepping");
-class ExtruderNonlinear extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+import DriverId from "./DriverId";
+import Microstepping from "./Microstepping";
+export class ExtruderNonlinear extends ModelObject {
     constructor() {
         super(...arguments);
         this.a = 0;
@@ -12,8 +9,15 @@ class ExtruderNonlinear extends ModelObject_1.default {
         this.upperLimit = 0.2;
     }
 }
-exports.ExtruderNonlinear = ExtruderNonlinear;
-class Extruder extends ModelObject_1.default {
+export class ExtruderPressureAdvance extends ModelObject {
+    constructor() {
+        super(...arguments);
+        this.d = null;
+        this.k0 = 0;
+        this.k1 = 0;
+    }
+}
+export class Extruder extends ModelObject {
     constructor() {
         super();
         this.acceleration = 500;
@@ -23,19 +27,22 @@ class Extruder extends ModelObject_1.default {
         this.filamentDiameter = 1.75;
         this.factor = 1;
         this.jerk = 15;
-        this.microstepping = new Microstepping_1.default();
+        this.microstepping = new Microstepping();
         this.nonlinear = new ExtruderNonlinear();
         this.percentCurrent = 100;
         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;
         this.speed = 100;
         this.stepsPerMm = 420;
-        ModelObject_1.default.wrapModelProperty(this, "driver", DriverId_1.default);
+        ModelObject.wrapModelProperty(this, "driver", DriverId);
     }
 }
-exports.Extruder = Extruder;
-exports.default = Extruder;
+export default Extruder;