@duet3d/objectmodel 3.6.3 → 3.7.0-alpha.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ModelCollection.d.ts +1 -1
- package/dist/ModelCollection.js +10 -15
- package/dist/ModelDictionary.d.ts +1 -1
- package/dist/ModelDictionary.js +7 -12
- package/dist/ModelObject.js +8 -14
- package/dist/ModelSet.js +2 -6
- package/dist/ObjectModel.js +42 -46
- package/dist/boards/Driver.d.ts +13 -0
- package/dist/boards/Driver.js +24 -13
- package/dist/boards/directDisplay/DirectDisplayScreen.d.ts +1 -1
- package/dist/boards/directDisplay/DirectDisplayScreen.js +5 -9
- package/dist/boards/directDisplay/DirectDisplayScreenBase.js +4 -7
- package/dist/boards/directDisplay/DirectDisplayScreenST7567.d.ts +1 -1
- package/dist/boards/directDisplay/DirectDisplayScreenST7567.js +6 -10
- package/dist/boards/directDisplay/index.js +16 -35
- package/dist/boards/index.js +22 -43
- package/dist/directories/index.js +3 -7
- package/dist/enums.json +17 -1
- package/dist/fans/index.d.ts +0 -1
- package/dist/fans/index.js +4 -10
- package/dist/heat/Heater.js +10 -14
- package/dist/heat/HeaterModel.js +4 -9
- package/dist/heat/HeaterMonitor.js +7 -11
- package/dist/heat/index.d.ts +8 -0
- package/dist/heat/index.js +17 -27
- package/dist/index.js +26 -43
- package/dist/inputs/CodeChannel.js +3 -6
- package/dist/inputs/Compatibility.js +3 -6
- package/dist/inputs/InputChannel.d.ts +2 -1
- package/dist/inputs/InputChannel.js +10 -13
- package/dist/inputs/index.js +3 -19
- package/dist/job/Build.js +6 -11
- package/dist/job/GCodeFileInfo.js +8 -12
- package/dist/job/ThumbnailInfo.js +5 -9
- package/dist/job/index.d.ts +4 -0
- package/dist/job/index.js +19 -35
- package/dist/ledStrips/index.d.ts +10 -0
- package/dist/ledStrips/index.js +16 -9
- package/dist/limits/index.js +3 -7
- package/dist/messages/index.js +5 -9
- package/dist/move/Axis.js +10 -14
- package/dist/move/DriverId.d.ts +2 -1
- package/dist/move/DriverId.js +4 -9
- package/dist/move/Extruder.d.ts +9 -0
- package/dist/move/Extruder.js +20 -13
- package/dist/move/InputShaping.js +5 -9
- package/dist/move/KeepoutZone.js +5 -10
- package/dist/move/Microstepping.js +3 -7
- package/dist/move/MotionSystem.js +9 -13
- package/dist/move/MoveCalibration.js +4 -9
- package/dist/move/MoveCompensation.js +10 -16
- package/dist/move/index.d.ts +19 -1
- package/dist/move/index.js +51 -55
- package/dist/move/kinematics/CoreKinematics.d.ts +1 -1
- package/dist/move/kinematics/CoreKinematics.js +5 -9
- package/dist/move/kinematics/DeltaKinematics.d.ts +2 -1
- package/dist/move/kinematics/DeltaKinematics.js +9 -14
- package/dist/move/kinematics/HangprinterKinematics.d.ts +1 -1
- package/dist/move/kinematics/HangprinterKinematics.js +6 -10
- package/dist/move/kinematics/KinematicsBase.d.ts +6 -6
- package/dist/move/kinematics/KinematicsBase.js +14 -21
- package/dist/move/kinematics/PolarKinematics.d.ts +1 -1
- package/dist/move/kinematics/PolarKinematics.js +6 -10
- package/dist/move/kinematics/ScaraKinematics.d.ts +1 -1
- package/dist/move/kinematics/ScaraKinematics.js +5 -9
- package/dist/move/kinematics/index.d.ts +1 -1
- package/dist/move/kinematics/index.js +35 -54
- package/dist/network/NetworkInterface.js +11 -15
- package/dist/network/index.js +12 -30
- package/dist/plugins/PluginManifest.d.ts +2 -1
- package/dist/plugins/PluginManifest.js +7 -11
- package/dist/plugins/index.js +4 -22
- package/dist/sbc/CPU.js +3 -7
- package/dist/sbc/Memory.js +3 -7
- package/dist/sbc/dsf/HttpEndpoint.js +5 -9
- package/dist/sbc/dsf/UserSession.js +7 -11
- package/dist/sbc/dsf/index.js +9 -27
- package/dist/sbc/index.js +12 -30
- package/dist/sensors/AnalogSensor.js +7 -11
- package/dist/sensors/Endstop.js +5 -9
- package/dist/sensors/FilamentMonitors/Duet3DFilamentMonitor.js +4 -8
- package/dist/sensors/FilamentMonitors/FilamentMonitorBase.js +9 -13
- package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.d.ts +2 -1
- package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js +11 -17
- package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.d.ts +2 -1
- package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.js +10 -16
- package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.d.ts +2 -1
- package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js +11 -17
- package/dist/sensors/FilamentMonitors/index.d.ts +1 -1
- package/dist/sensors/FilamentMonitors/index.js +18 -37
- package/dist/sensors/Probe.js +7 -12
- package/dist/sensors/index.js +18 -37
- package/dist/spindles/index.js +7 -11
- package/dist/state/MachineStatus.js +3 -6
- package/dist/state/MessageBox.d.ts +2 -1
- package/dist/state/MessageBox.js +5 -9
- package/dist/state/RestorePoint.js +3 -7
- package/dist/state/index.d.ts +9 -0
- package/dist/state/index.js +32 -44
- package/dist/tools/ToolRetraction.js +3 -7
- package/dist/tools/index.d.ts +1 -1
- package/dist/tools/index.js +8 -12
- package/dist/volumes/index.js +3 -7
- package/package.json +16 -5
- package/dist/httpEndpoints/index.d.ts +0 -19
- package/dist/httpEndpoints/index.js +0 -27
- package/dist/userSessions/index.d.ts +0 -18
- package/dist/userSessions/index.js +0 -27
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.ThumbnailInfo = exports.ThumbnailFormat = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
var ThumbnailFormat;
|
|
1
|
+
import { ModelObject } from "../ModelObject";
|
|
2
|
+
export var ThumbnailFormat;
|
|
6
3
|
(function (ThumbnailFormat) {
|
|
7
4
|
ThumbnailFormat["jpeg"] = "jpeg";
|
|
8
5
|
ThumbnailFormat["png"] = "png";
|
|
9
6
|
ThumbnailFormat["qoi"] = "qoi";
|
|
10
|
-
})(ThumbnailFormat || (
|
|
11
|
-
class ThumbnailInfo extends
|
|
7
|
+
})(ThumbnailFormat || (ThumbnailFormat = {}));
|
|
8
|
+
export class ThumbnailInfo extends ModelObject {
|
|
12
9
|
constructor() {
|
|
13
10
|
super(...arguments);
|
|
14
11
|
this.data = null;
|
|
@@ -19,5 +16,4 @@ class ThumbnailInfo extends ModelObject_1.ModelObject {
|
|
|
19
16
|
this.width = 0;
|
|
20
17
|
}
|
|
21
18
|
}
|
|
22
|
-
|
|
23
|
-
exports.default = ThumbnailInfo;
|
|
19
|
+
export default ThumbnailInfo;
|
package/dist/job/index.d.ts
CHANGED
|
@@ -4,7 +4,11 @@ import Build from "./Build";
|
|
|
4
4
|
import GCodeFileInfo from "./GCodeFileInfo";
|
|
5
5
|
export declare class Layer extends ModelObject {
|
|
6
6
|
duration: number;
|
|
7
|
+
/**
|
|
8
|
+
* @deprecated use filamentUsage instead
|
|
9
|
+
*/
|
|
7
10
|
filament: Array<number>;
|
|
11
|
+
filamentUsage: number;
|
|
8
12
|
fractionPrinted: number;
|
|
9
13
|
height: number;
|
|
10
14
|
temperatures: Array<number>;
|
package/dist/job/index.js
CHANGED
|
@@ -1,36 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.Job = exports.TimesLeft = exports.Layer = void 0;
|
|
18
|
-
const ModelCollection_1 = require("../ModelCollection");
|
|
19
|
-
const ModelObject_1 = require("../ModelObject");
|
|
20
|
-
const Build_1 = require("./Build");
|
|
21
|
-
const GCodeFileInfo_1 = require("./GCodeFileInfo");
|
|
22
|
-
class Layer extends ModelObject_1.default {
|
|
1
|
+
import ModelCollection from "../ModelCollection";
|
|
2
|
+
import ModelObject from "../ModelObject";
|
|
3
|
+
import Build from "./Build";
|
|
4
|
+
import GCodeFileInfo from "./GCodeFileInfo";
|
|
5
|
+
export class Layer extends ModelObject {
|
|
23
6
|
constructor() {
|
|
24
7
|
super(...arguments);
|
|
25
8
|
this.duration = 0;
|
|
9
|
+
/**
|
|
10
|
+
* @deprecated use filamentUsage instead
|
|
11
|
+
*/
|
|
26
12
|
this.filament = new Array();
|
|
13
|
+
this.filamentUsage = 0;
|
|
27
14
|
this.fractionPrinted = 0;
|
|
28
15
|
this.height = 0;
|
|
29
16
|
this.temperatures = new Array();
|
|
30
17
|
}
|
|
31
18
|
}
|
|
32
|
-
|
|
33
|
-
class TimesLeft extends ModelObject_1.default {
|
|
19
|
+
export class TimesLeft extends ModelObject {
|
|
34
20
|
constructor() {
|
|
35
21
|
super(...arguments);
|
|
36
22
|
this.filament = null;
|
|
@@ -39,11 +25,10 @@ class TimesLeft extends ModelObject_1.default {
|
|
|
39
25
|
this.toPause = null;
|
|
40
26
|
}
|
|
41
27
|
}
|
|
42
|
-
|
|
43
|
-
class Job extends ModelObject_1.default {
|
|
28
|
+
export class Job extends ModelObject {
|
|
44
29
|
constructor() {
|
|
45
30
|
super();
|
|
46
|
-
this.build = new
|
|
31
|
+
this.build = new Build();
|
|
47
32
|
this.duration = null;
|
|
48
33
|
this.file = null;
|
|
49
34
|
this.filePosition = null;
|
|
@@ -54,18 +39,17 @@ class Job extends ModelObject_1.default {
|
|
|
54
39
|
this.lastFileSimulated = false;
|
|
55
40
|
this.lastWarmUpDuration = null;
|
|
56
41
|
this.layer = null;
|
|
57
|
-
this.layers = new
|
|
42
|
+
this.layers = new ModelCollection(Layer);
|
|
58
43
|
this.layerTime = null;
|
|
59
44
|
this.pauseDuration = null;
|
|
60
45
|
this.rawExtrusion = null;
|
|
61
46
|
this.timesLeft = new TimesLeft();
|
|
62
47
|
this.warmUpDuration = null;
|
|
63
|
-
|
|
64
|
-
|
|
48
|
+
ModelObject.wrapModelProperty(this, "build", Build);
|
|
49
|
+
ModelObject.wrapModelProperty(this, "file", GCodeFileInfo);
|
|
65
50
|
}
|
|
66
51
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
__exportStar(require("./ThumbnailInfo"), exports);
|
|
52
|
+
export default Job;
|
|
53
|
+
export * from "./Build";
|
|
54
|
+
export * from "./GCodeFileInfo";
|
|
55
|
+
export * from "./ThumbnailInfo";
|
|
@@ -4,8 +4,18 @@ export declare enum LedStripType {
|
|
|
4
4
|
NeoPixel_RGB = "NeoPixel_RGB",
|
|
5
5
|
NeoPixel_RGBW = "NeoPixel_RGBW"
|
|
6
6
|
}
|
|
7
|
+
export declare enum LedStripColorOrder {
|
|
8
|
+
BGR = 0,
|
|
9
|
+
BRG = 1,
|
|
10
|
+
RGB = 2,
|
|
11
|
+
RBG = 3,
|
|
12
|
+
GBR = 4,
|
|
13
|
+
GRB = 5
|
|
14
|
+
}
|
|
7
15
|
export declare class LedStrip extends ModelObject {
|
|
8
16
|
board: number;
|
|
17
|
+
colorOrder: LedStripColorOrder;
|
|
18
|
+
maxLeds: number;
|
|
9
19
|
pin: string;
|
|
10
20
|
stopMovement: boolean;
|
|
11
21
|
type: LedStripType;
|
package/dist/ledStrips/index.js
CHANGED
|
@@ -1,21 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.LedStrip = exports.LedStripType = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
var LedStripType;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export var LedStripType;
|
|
6
3
|
(function (LedStripType) {
|
|
7
4
|
LedStripType["DotStar"] = "DotStar";
|
|
8
5
|
LedStripType["NeoPixel_RGB"] = "NeoPixel_RGB";
|
|
9
6
|
LedStripType["NeoPixel_RGBW"] = "NeoPixel_RGBW";
|
|
10
|
-
})(LedStripType || (
|
|
11
|
-
|
|
7
|
+
})(LedStripType || (LedStripType = {}));
|
|
8
|
+
export var LedStripColorOrder;
|
|
9
|
+
(function (LedStripColorOrder) {
|
|
10
|
+
LedStripColorOrder[LedStripColorOrder["BGR"] = 0] = "BGR";
|
|
11
|
+
LedStripColorOrder[LedStripColorOrder["BRG"] = 1] = "BRG";
|
|
12
|
+
LedStripColorOrder[LedStripColorOrder["RGB"] = 2] = "RGB";
|
|
13
|
+
LedStripColorOrder[LedStripColorOrder["RBG"] = 3] = "RBG";
|
|
14
|
+
LedStripColorOrder[LedStripColorOrder["GBR"] = 4] = "GBR";
|
|
15
|
+
LedStripColorOrder[LedStripColorOrder["GRB"] = 5] = "GRB";
|
|
16
|
+
})(LedStripColorOrder || (LedStripColorOrder = {}));
|
|
17
|
+
export class LedStrip extends ModelObject {
|
|
12
18
|
constructor() {
|
|
13
19
|
super(...arguments);
|
|
14
20
|
this.board = 0;
|
|
21
|
+
this.colorOrder = LedStripColorOrder.GRB;
|
|
22
|
+
this.maxLeds = 0;
|
|
15
23
|
this.pin = "";
|
|
16
24
|
this.stopMovement = false;
|
|
17
25
|
this.type = LedStripType.DotStar;
|
|
18
26
|
}
|
|
19
27
|
}
|
|
20
|
-
|
|
21
|
-
exports.default = LedStrip;
|
|
28
|
+
export default LedStrip;
|
package/dist/limits/index.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Limits = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
class Limits extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export class Limits extends ModelObject {
|
|
6
3
|
constructor() {
|
|
7
4
|
super(...arguments);
|
|
8
5
|
this.axes = null;
|
|
@@ -35,5 +32,4 @@ class Limits extends ModelObject_1.default {
|
|
|
35
32
|
this.zProbes = null;
|
|
36
33
|
}
|
|
37
34
|
}
|
|
38
|
-
|
|
39
|
-
exports.default = Limits;
|
|
35
|
+
export default Limits;
|
package/dist/messages/index.js
CHANGED
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Message = exports.MessageType = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
var MessageType;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export var MessageType;
|
|
6
3
|
(function (MessageType) {
|
|
7
4
|
MessageType[MessageType["success"] = 0] = "success";
|
|
8
5
|
MessageType[MessageType["warning"] = 1] = "warning";
|
|
9
6
|
MessageType[MessageType["error"] = 2] = "error";
|
|
10
|
-
})(MessageType || (
|
|
11
|
-
class Message extends
|
|
7
|
+
})(MessageType || (MessageType = {}));
|
|
8
|
+
export class Message extends ModelObject {
|
|
12
9
|
constructor() {
|
|
13
10
|
super(...arguments);
|
|
14
11
|
this.content = "";
|
|
@@ -23,5 +20,4 @@ class Message extends ModelObject_1.default {
|
|
|
23
20
|
}
|
|
24
21
|
}
|
|
25
22
|
}
|
|
26
|
-
|
|
27
|
-
exports.default = Message;
|
|
23
|
+
export default Message;
|
package/dist/move/Axis.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const DriverId_1 = require("./DriverId");
|
|
7
|
-
const Microstepping_1 = require("./Microstepping");
|
|
8
|
-
var AxisLetter;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import ModelCollection from "../ModelCollection";
|
|
3
|
+
import DriverId from "./DriverId";
|
|
4
|
+
import Microstepping from "./Microstepping";
|
|
5
|
+
export var AxisLetter;
|
|
9
6
|
(function (AxisLetter) {
|
|
10
7
|
AxisLetter["X"] = "X";
|
|
11
8
|
AxisLetter["Y"] = "Y";
|
|
@@ -44,22 +41,22 @@ var AxisLetter;
|
|
|
44
41
|
AxisLetter["y"] = "y";
|
|
45
42
|
AxisLetter["z"] = "z";
|
|
46
43
|
AxisLetter["none"] = "";
|
|
47
|
-
})(AxisLetter || (
|
|
48
|
-
class Axis extends
|
|
44
|
+
})(AxisLetter || (AxisLetter = {}));
|
|
45
|
+
export class Axis extends ModelObject {
|
|
49
46
|
constructor() {
|
|
50
47
|
super(...arguments);
|
|
51
48
|
this.acceleration = 0;
|
|
52
49
|
this.babystep = 0;
|
|
53
50
|
this.backlash = 0;
|
|
54
51
|
this.current = 0;
|
|
55
|
-
this.drivers = new
|
|
52
|
+
this.drivers = new ModelCollection(DriverId);
|
|
56
53
|
this.homed = false;
|
|
57
54
|
this.jerk = 15;
|
|
58
55
|
this.letter = AxisLetter.none;
|
|
59
56
|
this.machinePosition = null;
|
|
60
57
|
this.max = 200;
|
|
61
58
|
this.maxProbed = false;
|
|
62
|
-
this.microstepping = new
|
|
59
|
+
this.microstepping = new Microstepping();
|
|
63
60
|
this.min = 0;
|
|
64
61
|
this.minProbed = false;
|
|
65
62
|
this.percentCurrent = 100;
|
|
@@ -75,5 +72,4 @@ class Axis extends ModelObject_1.default {
|
|
|
75
72
|
this.workplaceOffsets = new Array();
|
|
76
73
|
}
|
|
77
74
|
}
|
|
78
|
-
|
|
79
|
-
exports.default = Axis;
|
|
75
|
+
export default Axis;
|
package/dist/move/DriverId.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import ModelObject
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import type { IModelObject } from "../ModelObject";
|
|
2
3
|
export declare function isDriverId(value: any): value is DriverId;
|
|
3
4
|
export declare class DriverId extends ModelObject {
|
|
4
5
|
board: number | null;
|
package/dist/move/DriverId.js
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.DriverId = void 0;
|
|
4
|
-
exports.isDriverId = isDriverId;
|
|
5
|
-
const ModelObject_1 = require("../ModelObject");
|
|
6
|
-
function isDriverId(value) {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export function isDriverId(value) {
|
|
7
3
|
return (value instanceof Object) && value.board !== undefined && value.driver !== undefined;
|
|
8
4
|
}
|
|
9
|
-
class DriverId extends
|
|
5
|
+
export class DriverId extends ModelObject {
|
|
10
6
|
constructor() {
|
|
11
7
|
super(...arguments);
|
|
12
8
|
this.board = null;
|
|
@@ -45,5 +41,4 @@ class DriverId extends ModelObject_1.default {
|
|
|
45
41
|
return (this.board === null) ? this.driver.toString() : `${this.board}.${this.driver}`;
|
|
46
42
|
}
|
|
47
43
|
}
|
|
48
|
-
|
|
49
|
-
exports.default = DriverId;
|
|
44
|
+
export default DriverId;
|
package/dist/move/Extruder.d.ts
CHANGED
|
@@ -6,6 +6,11 @@ export declare class ExtruderNonlinear extends ModelObject {
|
|
|
6
6
|
b: number;
|
|
7
7
|
upperLimit: number;
|
|
8
8
|
}
|
|
9
|
+
export declare class ExtruderPressureAdvance extends ModelObject {
|
|
10
|
+
d: number | null;
|
|
11
|
+
k0: number;
|
|
12
|
+
k1: number;
|
|
13
|
+
}
|
|
9
14
|
export declare class Extruder extends ModelObject {
|
|
10
15
|
constructor();
|
|
11
16
|
acceleration: number;
|
|
@@ -21,6 +26,10 @@ export declare class Extruder extends ModelObject {
|
|
|
21
26
|
percentStstCurrent: number | null;
|
|
22
27
|
phaseStep: boolean | null;
|
|
23
28
|
position: number;
|
|
29
|
+
readonly pressAdv: ExtruderPressureAdvance;
|
|
30
|
+
/**
|
|
31
|
+
* @deprecated use pressAdv instead
|
|
32
|
+
*/
|
|
24
33
|
pressureAdvance: number;
|
|
25
34
|
printingJerk: number;
|
|
26
35
|
rawPosition: number;
|
package/dist/move/Extruder.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const DriverId_1 = require("./DriverId");
|
|
6
|
-
const Microstepping_1 = require("./Microstepping");
|
|
7
|
-
class ExtruderNonlinear extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import DriverId from "./DriverId";
|
|
3
|
+
import Microstepping from "./Microstepping";
|
|
4
|
+
export class ExtruderNonlinear extends ModelObject {
|
|
8
5
|
constructor() {
|
|
9
6
|
super(...arguments);
|
|
10
7
|
this.a = 0;
|
|
@@ -12,8 +9,15 @@ class ExtruderNonlinear extends ModelObject_1.default {
|
|
|
12
9
|
this.upperLimit = 0.2;
|
|
13
10
|
}
|
|
14
11
|
}
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
export class ExtruderPressureAdvance extends ModelObject {
|
|
13
|
+
constructor() {
|
|
14
|
+
super(...arguments);
|
|
15
|
+
this.d = null;
|
|
16
|
+
this.k0 = 0;
|
|
17
|
+
this.k1 = 0;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
export class Extruder extends ModelObject {
|
|
17
21
|
constructor() {
|
|
18
22
|
super();
|
|
19
23
|
this.acceleration = 500;
|
|
@@ -23,19 +27,22 @@ class Extruder extends ModelObject_1.default {
|
|
|
23
27
|
this.filamentDiameter = 1.75;
|
|
24
28
|
this.factor = 1;
|
|
25
29
|
this.jerk = 15;
|
|
26
|
-
this.microstepping = new
|
|
30
|
+
this.microstepping = new Microstepping();
|
|
27
31
|
this.nonlinear = new ExtruderNonlinear();
|
|
28
32
|
this.percentCurrent = 100;
|
|
29
33
|
this.percentStstCurrent = null;
|
|
30
34
|
this.phaseStep = null;
|
|
31
35
|
this.position = 0;
|
|
36
|
+
this.pressAdv = new ExtruderPressureAdvance();
|
|
37
|
+
/**
|
|
38
|
+
* @deprecated use pressAdv instead
|
|
39
|
+
*/
|
|
32
40
|
this.pressureAdvance = 0;
|
|
33
41
|
this.printingJerk = 15;
|
|
34
42
|
this.rawPosition = 0;
|
|
35
43
|
this.speed = 100;
|
|
36
44
|
this.stepsPerMm = 420;
|
|
37
|
-
|
|
45
|
+
ModelObject.wrapModelProperty(this, "driver", DriverId);
|
|
38
46
|
}
|
|
39
47
|
}
|
|
40
|
-
|
|
41
|
-
exports.default = Extruder;
|
|
48
|
+
export default Extruder;
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.InputShaping = exports.InputShapingType = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
var InputShapingType;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export var InputShapingType;
|
|
6
3
|
(function (InputShapingType) {
|
|
7
4
|
InputShapingType["none"] = "none";
|
|
8
5
|
InputShapingType["mzv"] = "mzv";
|
|
@@ -12,8 +9,8 @@ var InputShapingType;
|
|
|
12
9
|
InputShapingType["ei2"] = "ei2";
|
|
13
10
|
InputShapingType["ei3"] = "ei3";
|
|
14
11
|
InputShapingType["custom"] = "custom";
|
|
15
|
-
})(InputShapingType || (
|
|
16
|
-
class InputShaping extends
|
|
12
|
+
})(InputShapingType || (InputShapingType = {}));
|
|
13
|
+
export class InputShaping extends ModelObject {
|
|
17
14
|
constructor() {
|
|
18
15
|
super(...arguments);
|
|
19
16
|
this.amplitudes = [];
|
|
@@ -23,5 +20,4 @@ class InputShaping extends ModelObject_1.default {
|
|
|
23
20
|
this.type = InputShapingType.none;
|
|
24
21
|
}
|
|
25
22
|
}
|
|
26
|
-
|
|
27
|
-
exports.default = InputShaping;
|
|
23
|
+
export default InputShaping;
|
package/dist/move/KeepoutZone.js
CHANGED
|
@@ -1,21 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const ModelCollection_1 = require("../ModelCollection");
|
|
5
|
-
const ModelObject_1 = require("../ModelObject");
|
|
6
|
-
class KeepoutZoneCoordinates extends ModelObject_1.ModelObject {
|
|
1
|
+
import { ModelCollection } from "../ModelCollection";
|
|
2
|
+
import { ModelObject } from "../ModelObject";
|
|
3
|
+
export class KeepoutZoneCoordinates extends ModelObject {
|
|
7
4
|
constructor() {
|
|
8
5
|
super(...arguments);
|
|
9
6
|
this.max = 0;
|
|
10
7
|
this.min = 0;
|
|
11
8
|
}
|
|
12
9
|
}
|
|
13
|
-
|
|
14
|
-
class KeepoutZone extends ModelObject_1.ModelObject {
|
|
10
|
+
export default class KeepoutZone extends ModelObject {
|
|
15
11
|
constructor() {
|
|
16
12
|
super(...arguments);
|
|
17
13
|
this.active = true;
|
|
18
|
-
this.coords = new
|
|
14
|
+
this.coords = new ModelCollection(KeepoutZoneCoordinates);
|
|
19
15
|
}
|
|
20
16
|
}
|
|
21
|
-
exports.default = KeepoutZone;
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Microstepping = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
class Microstepping extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export class Microstepping extends ModelObject {
|
|
6
3
|
constructor() {
|
|
7
4
|
super(...arguments);
|
|
8
5
|
this.interpolated = false;
|
|
9
6
|
this.value = 16;
|
|
10
7
|
}
|
|
11
8
|
}
|
|
12
|
-
|
|
13
|
-
exports.default = Microstepping;
|
|
9
|
+
export default Microstepping;
|
|
@@ -1,21 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const RestorePoint_1 = require("../state/RestorePoint");
|
|
7
|
-
const _1 = require(".");
|
|
8
|
-
class MotionSystem extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import ModelCollection from "../ModelCollection";
|
|
3
|
+
import RestorePoint from "../state/RestorePoint";
|
|
4
|
+
import { CurrentMove, MoveRotation } from ".";
|
|
5
|
+
export class MotionSystem extends ModelObject {
|
|
9
6
|
constructor() {
|
|
10
7
|
super(...arguments);
|
|
11
|
-
this.currentMove = new
|
|
8
|
+
this.currentMove = new CurrentMove();
|
|
12
9
|
this.currentObject = null;
|
|
13
10
|
this.currentTool = -1;
|
|
14
11
|
this.nextTool = -1;
|
|
15
12
|
this.previousTool = -1;
|
|
16
13
|
this.printingAcceleration = 10000;
|
|
17
|
-
this.restorePoints = new
|
|
18
|
-
this.rotation = new
|
|
14
|
+
this.restorePoints = new ModelCollection(RestorePoint);
|
|
15
|
+
this.rotation = new MoveRotation();
|
|
19
16
|
this.speedFactor = 1;
|
|
20
17
|
this.travelAcceleration = 10000;
|
|
21
18
|
this.userPosition = [];
|
|
@@ -23,5 +20,4 @@ class MotionSystem extends ModelObject_1.default {
|
|
|
23
20
|
this.workplaceNumber = 0;
|
|
24
21
|
}
|
|
25
22
|
}
|
|
26
|
-
|
|
27
|
-
exports.default = MotionSystem;
|
|
23
|
+
export default MotionSystem;
|
|
@@ -1,16 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.MoveCalibration = exports.MoveDeviations = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
class MoveDeviations extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export class MoveDeviations extends ModelObject {
|
|
6
3
|
constructor() {
|
|
7
4
|
super(...arguments);
|
|
8
5
|
this.deviation = 0;
|
|
9
6
|
this.mean = 0;
|
|
10
7
|
}
|
|
11
8
|
}
|
|
12
|
-
|
|
13
|
-
class MoveCalibration extends ModelObject_1.default {
|
|
9
|
+
export class MoveCalibration extends ModelObject {
|
|
14
10
|
constructor() {
|
|
15
11
|
super(...arguments);
|
|
16
12
|
this.final = new MoveDeviations();
|
|
@@ -18,5 +14,4 @@ class MoveCalibration extends ModelObject_1.default {
|
|
|
18
14
|
this.numFactors = 0;
|
|
19
15
|
}
|
|
20
16
|
}
|
|
21
|
-
|
|
22
|
-
exports.default = MoveCalibration;
|
|
17
|
+
export default MoveCalibration;
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
const MoveCalibration_1 = require("./MoveCalibration");
|
|
6
|
-
class ProbeGrid extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import { MoveDeviations } from "./MoveCalibration";
|
|
3
|
+
export class ProbeGrid extends ModelObject {
|
|
7
4
|
constructor() {
|
|
8
5
|
super(...arguments);
|
|
9
6
|
this.axes = ['X', 'Y'];
|
|
@@ -13,8 +10,7 @@ class ProbeGrid extends ModelObject_1.default {
|
|
|
13
10
|
this.spacings = [0, 0];
|
|
14
11
|
}
|
|
15
12
|
}
|
|
16
|
-
|
|
17
|
-
class Skew extends ModelObject_1.default {
|
|
13
|
+
export class Skew extends ModelObject {
|
|
18
14
|
constructor() {
|
|
19
15
|
super(...arguments);
|
|
20
16
|
this.compensateXY = true;
|
|
@@ -23,13 +19,12 @@ class Skew extends ModelObject_1.default {
|
|
|
23
19
|
this.tanYZ = 0;
|
|
24
20
|
}
|
|
25
21
|
}
|
|
26
|
-
|
|
27
|
-
var MoveCompensationType;
|
|
22
|
+
export var MoveCompensationType;
|
|
28
23
|
(function (MoveCompensationType) {
|
|
29
24
|
MoveCompensationType["none"] = "none";
|
|
30
25
|
MoveCompensationType["mesh"] = "mesh";
|
|
31
|
-
})(MoveCompensationType || (
|
|
32
|
-
class MoveCompensation extends
|
|
26
|
+
})(MoveCompensationType || (MoveCompensationType = {}));
|
|
27
|
+
export class MoveCompensation extends ModelObject {
|
|
33
28
|
constructor() {
|
|
34
29
|
super();
|
|
35
30
|
this.fadeHeight = null;
|
|
@@ -39,9 +34,8 @@ class MoveCompensation extends ModelObject_1.default {
|
|
|
39
34
|
this.probeGrid = new ProbeGrid();
|
|
40
35
|
this.skew = new Skew();
|
|
41
36
|
this.type = MoveCompensationType.none;
|
|
42
|
-
|
|
43
|
-
|
|
37
|
+
ModelObject.wrapModelProperty(this, "liveGrid", ProbeGrid);
|
|
38
|
+
ModelObject.wrapModelProperty(this, "meshDeviation", MoveDeviations);
|
|
44
39
|
}
|
|
45
40
|
}
|
|
46
|
-
|
|
47
|
-
exports.default = MoveCompensation;
|
|
41
|
+
export default MoveCompensation;
|
package/dist/move/index.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import Axis from "./Axis";
|
|
|
4
4
|
import Extruder from "./Extruder";
|
|
5
5
|
import InputShaping from "./InputShaping";
|
|
6
6
|
import KeepoutZone from "./KeepoutZone";
|
|
7
|
+
import MotionSystem from "./MotionSystem";
|
|
7
8
|
import MoveCalibration from "./MoveCalibration";
|
|
8
9
|
import MoveCompensation from "./MoveCompensation";
|
|
9
10
|
import Kinematics from "./kinematics";
|
|
@@ -40,14 +41,30 @@ export declare class Move extends ModelObject {
|
|
|
40
41
|
kinematics: Kinematics;
|
|
41
42
|
limitAxes: boolean;
|
|
42
43
|
noMovesBeforeHoming: boolean;
|
|
44
|
+
readonly motionSystems: ModelCollection<MotionSystem>;
|
|
45
|
+
/**
|
|
46
|
+
* @deprecated use motionSystems[].printingAcceleration instead
|
|
47
|
+
*/
|
|
43
48
|
printingAcceleration: number;
|
|
44
49
|
readonly queue: ModelCollection<MoveQueueItem>;
|
|
50
|
+
/**
|
|
51
|
+
* @deprecated use motionSystems[].rotation instead
|
|
52
|
+
*/
|
|
45
53
|
readonly rotation: MoveRotation;
|
|
46
54
|
readonly shaping: InputShaping;
|
|
47
55
|
speedFactor: number;
|
|
56
|
+
/**
|
|
57
|
+
* @deprecated use motionSystems[].travelAcceleration instead
|
|
58
|
+
*/
|
|
48
59
|
travelAcceleration: number;
|
|
49
|
-
usingSCurve: boolean
|
|
60
|
+
usingSCurve: boolean;
|
|
61
|
+
/**
|
|
62
|
+
* @deprecated use motionSystems[].virtualEPos instead
|
|
63
|
+
*/
|
|
50
64
|
virtualEPos: number;
|
|
65
|
+
/**
|
|
66
|
+
* @deprecated use motionSystems[].workplaceNumber instead
|
|
67
|
+
*/
|
|
51
68
|
workplaceNumber: number;
|
|
52
69
|
}
|
|
53
70
|
export default Move;
|
|
@@ -59,4 +76,5 @@ export * from "./InputShaping";
|
|
|
59
76
|
export * from "./KeepoutZone";
|
|
60
77
|
export * from "./Microstepping";
|
|
61
78
|
export * from "./MoveCalibration";
|
|
79
|
+
export * from "./MotionSystem";
|
|
62
80
|
export * from "./MoveCompensation";
|