@duet3d/objectmodel 3.7.0-alpha.6 → 3.7.0-alpha.8
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.js +10 -15
- 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.js +6 -13
- package/dist/boards/directDisplay/DirectDisplayScreen.js +5 -9
- package/dist/boards/directDisplay/DirectDisplayScreenBase.js +3 -7
- package/dist/boards/directDisplay/DirectDisplayScreenST7567.js +6 -10
- package/dist/boards/directDisplay/index.js +15 -35
- package/dist/boards/index.js +21 -43
- package/dist/directories/index.js +3 -7
- package/dist/enums.json +1 -1
- package/dist/fans/index.js +4 -9
- 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.js +9 -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.js +9 -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.js +15 -35
- package/dist/ledStrips/index.js +5 -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.js +4 -9
- package/dist/move/Extruder.js +9 -15
- 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.js +35 -57
- package/dist/move/kinematics/CoreKinematics.js +5 -9
- package/dist/move/kinematics/DeltaKinematics.js +9 -14
- package/dist/move/kinematics/HangprinterKinematics.js +6 -10
- package/dist/move/kinematics/KinematicsBase.js +8 -15
- package/dist/move/kinematics/PolarKinematics.js +6 -10
- package/dist/move/kinematics/ScaraKinematics.js +5 -9
- package/dist/move/kinematics/index.js +35 -54
- package/dist/network/NetworkInterface.d.ts +1 -1
- package/dist/network/NetworkInterface.js +12 -16
- package/dist/network/index.js +12 -30
- 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.js +11 -17
- package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.js +10 -16
- package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js +11 -17
- 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.js +5 -9
- package/dist/state/RestorePoint.js +3 -7
- package/dist/state/index.js +23 -44
- package/dist/tools/ToolRetraction.js +3 -7
- package/dist/tools/index.js +7 -11
- package/dist/volumes/index.js +3 -7
- package/package.json +14 -4
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const Duet3DFilamentMonitor_1 = require("./Duet3DFilamentMonitor");
|
|
7
|
-
const index_1 = require("./index");
|
|
8
|
-
class LaserFilamentMonitorCalibrated extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../../ModelObject";
|
|
2
|
+
import { FilamentMonitorType } from "./FilamentMonitorBase";
|
|
3
|
+
import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
|
|
4
|
+
import { getFilamentMonitor } from "./index";
|
|
5
|
+
export class LaserFilamentMonitorCalibrated extends ModelObject {
|
|
9
6
|
constructor() {
|
|
10
7
|
super(...arguments);
|
|
11
8
|
this.percentMax = 0;
|
|
@@ -14,8 +11,7 @@ class LaserFilamentMonitorCalibrated extends ModelObject_1.default {
|
|
|
14
11
|
this.totalDistance = 0;
|
|
15
12
|
}
|
|
16
13
|
}
|
|
17
|
-
|
|
18
|
-
class LaserFilamentMonitorConfigured extends ModelObject_1.default {
|
|
14
|
+
export class LaserFilamentMonitorConfigured extends ModelObject {
|
|
19
15
|
constructor() {
|
|
20
16
|
super(...arguments);
|
|
21
17
|
this.allMoves = false;
|
|
@@ -25,23 +21,21 @@ class LaserFilamentMonitorConfigured extends ModelObject_1.default {
|
|
|
25
21
|
this.sampleDistance = 0;
|
|
26
22
|
}
|
|
27
23
|
}
|
|
28
|
-
|
|
29
|
-
class LaserFilamentMonitor extends Duet3DFilamentMonitor_1.Duet3DFilamentMonitor {
|
|
24
|
+
export class LaserFilamentMonitor extends Duet3DFilamentMonitor {
|
|
30
25
|
constructor() {
|
|
31
|
-
super(
|
|
26
|
+
super(FilamentMonitorType.laser);
|
|
32
27
|
this.calibrated = new LaserFilamentMonitorCalibrated();
|
|
33
28
|
this.configured = new LaserFilamentMonitorConfigured();
|
|
34
|
-
|
|
29
|
+
ModelObject.wrapModelProperty(this, "calibrated", LaserFilamentMonitorCalibrated);
|
|
35
30
|
}
|
|
36
31
|
update(jsonElement) {
|
|
37
32
|
if (jsonElement === null) {
|
|
38
33
|
return null;
|
|
39
34
|
}
|
|
40
35
|
if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
|
|
41
|
-
return
|
|
36
|
+
return getFilamentMonitor(jsonElement.type).update(jsonElement);
|
|
42
37
|
}
|
|
43
38
|
return super.update(jsonElement);
|
|
44
39
|
}
|
|
45
40
|
}
|
|
46
|
-
|
|
47
|
-
exports.default = LaserFilamentMonitor;
|
|
41
|
+
export default LaserFilamentMonitor;
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
|
|
6
|
-
const index_1 = require("./index");
|
|
7
|
-
class PulsedFilamentMonitorCalibrated extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../../ModelObject";
|
|
2
|
+
import FilamentMonitorBase, { FilamentMonitorType } from "./FilamentMonitorBase";
|
|
3
|
+
import { getFilamentMonitor } from "./index";
|
|
4
|
+
export class PulsedFilamentMonitorCalibrated extends ModelObject {
|
|
8
5
|
constructor() {
|
|
9
6
|
super(...arguments);
|
|
10
7
|
this.mmPerPulse = 0;
|
|
@@ -13,8 +10,7 @@ class PulsedFilamentMonitorCalibrated extends ModelObject_1.default {
|
|
|
13
10
|
this.totalDistance = 0;
|
|
14
11
|
}
|
|
15
12
|
}
|
|
16
|
-
|
|
17
|
-
class PulsedFilamentMonitorConfigured extends ModelObject_1.default {
|
|
13
|
+
export class PulsedFilamentMonitorConfigured extends ModelObject {
|
|
18
14
|
constructor() {
|
|
19
15
|
super(...arguments);
|
|
20
16
|
this.mmPerPulse = 0;
|
|
@@ -23,24 +19,22 @@ class PulsedFilamentMonitorConfigured extends ModelObject_1.default {
|
|
|
23
19
|
this.sampleDistance = 0;
|
|
24
20
|
}
|
|
25
21
|
}
|
|
26
|
-
|
|
27
|
-
class PulsedFilamentMonitor extends FilamentMonitorBase_1.default {
|
|
22
|
+
export class PulsedFilamentMonitor extends FilamentMonitorBase {
|
|
28
23
|
constructor() {
|
|
29
|
-
super(
|
|
24
|
+
super(FilamentMonitorType.pulsed);
|
|
30
25
|
this.calibrated = new PulsedFilamentMonitorCalibrated();
|
|
31
26
|
this.configured = new PulsedFilamentMonitorConfigured();
|
|
32
27
|
this.position = 0;
|
|
33
|
-
|
|
28
|
+
ModelObject.wrapModelProperty(this, "calibrated", PulsedFilamentMonitorCalibrated);
|
|
34
29
|
}
|
|
35
30
|
update(jsonElement) {
|
|
36
31
|
if (jsonElement === null) {
|
|
37
32
|
return null;
|
|
38
33
|
}
|
|
39
34
|
if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
|
|
40
|
-
return
|
|
35
|
+
return getFilamentMonitor(jsonElement.type).update(jsonElement);
|
|
41
36
|
}
|
|
42
37
|
return super.update(jsonElement);
|
|
43
38
|
}
|
|
44
39
|
}
|
|
45
|
-
|
|
46
|
-
exports.default = PulsedFilamentMonitor;
|
|
40
|
+
export default PulsedFilamentMonitor;
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const Duet3DFilamentMonitor_1 = require("./Duet3DFilamentMonitor");
|
|
7
|
-
const index_1 = require("./index");
|
|
8
|
-
class RotatingMagnetFilamentMonitorCalibrated extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../../ModelObject";
|
|
2
|
+
import { FilamentMonitorType } from "./FilamentMonitorBase";
|
|
3
|
+
import { Duet3DFilamentMonitor } from "./Duet3DFilamentMonitor";
|
|
4
|
+
import { getFilamentMonitor } from "./index";
|
|
5
|
+
export class RotatingMagnetFilamentMonitorCalibrated extends ModelObject {
|
|
9
6
|
constructor() {
|
|
10
7
|
super(...arguments);
|
|
11
8
|
this.mmPerPulse = 0;
|
|
@@ -14,8 +11,7 @@ class RotatingMagnetFilamentMonitorCalibrated extends ModelObject_1.default {
|
|
|
14
11
|
this.totalDistance = 0;
|
|
15
12
|
}
|
|
16
13
|
}
|
|
17
|
-
|
|
18
|
-
class RotatingMagnetFilamentMonitorConfigured extends ModelObject_1.default {
|
|
14
|
+
export class RotatingMagnetFilamentMonitorConfigured extends ModelObject {
|
|
19
15
|
constructor() {
|
|
20
16
|
super(...arguments);
|
|
21
17
|
this.allMoves = false;
|
|
@@ -25,23 +21,21 @@ class RotatingMagnetFilamentMonitorConfigured extends ModelObject_1.default {
|
|
|
25
21
|
this.sampleDistance = 0;
|
|
26
22
|
}
|
|
27
23
|
}
|
|
28
|
-
|
|
29
|
-
class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor_1.Duet3DFilamentMonitor {
|
|
24
|
+
export class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor {
|
|
30
25
|
constructor() {
|
|
31
|
-
super(
|
|
26
|
+
super(FilamentMonitorType.rotatingMagnet);
|
|
32
27
|
this.calibrated = new RotatingMagnetFilamentMonitorCalibrated();
|
|
33
28
|
this.configured = new RotatingMagnetFilamentMonitorConfigured();
|
|
34
|
-
|
|
29
|
+
ModelObject.wrapModelProperty(this, "calibrated", RotatingMagnetFilamentMonitorCalibrated);
|
|
35
30
|
}
|
|
36
31
|
update(jsonElement) {
|
|
37
32
|
if (jsonElement === null) {
|
|
38
33
|
return null;
|
|
39
34
|
}
|
|
40
35
|
if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
|
|
41
|
-
return
|
|
36
|
+
return getFilamentMonitor(jsonElement.type).update(jsonElement);
|
|
42
37
|
}
|
|
43
38
|
return super.update(jsonElement);
|
|
44
39
|
}
|
|
45
40
|
}
|
|
46
|
-
|
|
47
|
-
exports.default = RotatingMagnetFilamentMonitor;
|
|
41
|
+
export default RotatingMagnetFilamentMonitor;
|
|
@@ -1,26 +1,8 @@
|
|
|
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.FilamentMonitor = void 0;
|
|
18
|
-
exports.getFilamentMonitor = getFilamentMonitor;
|
|
19
|
-
const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
|
|
20
|
-
const LaserFilamentMonitor_1 = require("./LaserFilamentMonitor");
|
|
21
|
-
const PulsedFilamentMonitor_1 = require("./PulsedFilamentMonitor");
|
|
22
|
-
const RotatingMagnetFilamentMonitor_1 = require("./RotatingMagnetFilamentMonitor");
|
|
23
|
-
class FilamentMonitor extends FilamentMonitorBase_1.default {
|
|
1
|
+
import FilamentMonitorBase, { FilamentMonitorType } from "./FilamentMonitorBase";
|
|
2
|
+
import LaserFilamentMonitor from "./LaserFilamentMonitor";
|
|
3
|
+
import PulsedFilamentMonitor from "./PulsedFilamentMonitor";
|
|
4
|
+
import RotatingMagnetFilamentMonitor from "./RotatingMagnetFilamentMonitor";
|
|
5
|
+
export class FilamentMonitor extends FilamentMonitorBase {
|
|
24
6
|
update(jsonElement) {
|
|
25
7
|
if (jsonElement === null) {
|
|
26
8
|
return null;
|
|
@@ -31,22 +13,21 @@ class FilamentMonitor extends FilamentMonitorBase_1.default {
|
|
|
31
13
|
return super.update(jsonElement);
|
|
32
14
|
}
|
|
33
15
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
function getFilamentMonitor(type) {
|
|
16
|
+
export default FilamentMonitor;
|
|
17
|
+
export function getFilamentMonitor(type) {
|
|
37
18
|
switch (type) {
|
|
38
|
-
case
|
|
39
|
-
return new
|
|
40
|
-
case
|
|
41
|
-
return new
|
|
42
|
-
case
|
|
43
|
-
return new
|
|
19
|
+
case FilamentMonitorType.laser:
|
|
20
|
+
return new LaserFilamentMonitor();
|
|
21
|
+
case FilamentMonitorType.pulsed:
|
|
22
|
+
return new PulsedFilamentMonitor();
|
|
23
|
+
case FilamentMonitorType.rotatingMagnet:
|
|
24
|
+
return new RotatingMagnetFilamentMonitor();
|
|
44
25
|
default:
|
|
45
26
|
return new FilamentMonitor(type);
|
|
46
27
|
}
|
|
47
28
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
29
|
+
export * from "./FilamentMonitorBase";
|
|
30
|
+
export * from "./Duet3DFilamentMonitor";
|
|
31
|
+
export * from "./LaserFilamentMonitor";
|
|
32
|
+
export * from "./PulsedFilamentMonitor";
|
|
33
|
+
export * from "./RotatingMagnetFilamentMonitor";
|
package/dist/sensors/Probe.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Probe = exports.ProbeTouchMode = exports.ProbeType = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
var ProbeType;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export var ProbeType;
|
|
6
3
|
(function (ProbeType) {
|
|
7
4
|
ProbeType[ProbeType["none"] = 0] = "none";
|
|
8
5
|
ProbeType[ProbeType["analog"] = 1] = "analog";
|
|
@@ -16,8 +13,8 @@ var ProbeType;
|
|
|
16
13
|
ProbeType[ProbeType["blTouch"] = 9] = "blTouch";
|
|
17
14
|
ProbeType[ProbeType["zMotorStall"] = 10] = "zMotorStall";
|
|
18
15
|
ProbeType[ProbeType["scanningAnalog"] = 11] = "scanningAnalog";
|
|
19
|
-
})(ProbeType || (
|
|
20
|
-
class ProbeTouchMode extends
|
|
16
|
+
})(ProbeType || (ProbeType = {}));
|
|
17
|
+
export class ProbeTouchMode extends ModelObject {
|
|
21
18
|
constructor() {
|
|
22
19
|
super(...arguments);
|
|
23
20
|
this.active = false;
|
|
@@ -26,8 +23,7 @@ class ProbeTouchMode extends ModelObject_1.default {
|
|
|
26
23
|
this.threshold = 0;
|
|
27
24
|
}
|
|
28
25
|
}
|
|
29
|
-
|
|
30
|
-
class Probe extends ModelObject_1.default {
|
|
26
|
+
export class Probe extends ModelObject {
|
|
31
27
|
constructor() {
|
|
32
28
|
super();
|
|
33
29
|
this.calibA = null;
|
|
@@ -56,8 +52,7 @@ class Probe extends ModelObject_1.default {
|
|
|
56
52
|
this.triggerHeight = 0.7;
|
|
57
53
|
this.type = ProbeType.none;
|
|
58
54
|
this.value = [];
|
|
59
|
-
|
|
55
|
+
ModelObject.wrapModelProperty(this, "touchMode", ProbeTouchMode);
|
|
60
56
|
}
|
|
61
57
|
}
|
|
62
|
-
|
|
63
|
-
exports.default = Probe;
|
|
58
|
+
export default Probe;
|
package/dist/sensors/index.js
CHANGED
|
@@ -1,46 +1,27 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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.Sensors = exports.GpInputPort = void 0;
|
|
18
|
-
const ModelObject_1 = require("../ModelObject");
|
|
19
|
-
const ModelCollection_1 = require("../ModelCollection");
|
|
20
|
-
const AnalogSensor_1 = require("./AnalogSensor");
|
|
21
|
-
const Endstop_1 = require("./Endstop");
|
|
22
|
-
const FilamentMonitors_1 = require("./FilamentMonitors");
|
|
23
|
-
const Probe_1 = require("./Probe");
|
|
24
|
-
class GpInputPort extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import ModelCollection from "../ModelCollection";
|
|
3
|
+
import AnalogSensor from "./AnalogSensor";
|
|
4
|
+
import Endstop from "./Endstop";
|
|
5
|
+
import FilamentMonitor from "./FilamentMonitors";
|
|
6
|
+
import Probe from "./Probe";
|
|
7
|
+
export class GpInputPort extends ModelObject {
|
|
25
8
|
constructor() {
|
|
26
9
|
super(...arguments);
|
|
27
10
|
this.value = 0;
|
|
28
11
|
}
|
|
29
12
|
}
|
|
30
|
-
|
|
31
|
-
class Sensors extends ModelObject_1.default {
|
|
13
|
+
export class Sensors extends ModelObject {
|
|
32
14
|
constructor() {
|
|
33
15
|
super(...arguments);
|
|
34
|
-
this.analog = new
|
|
35
|
-
this.endstops = new
|
|
36
|
-
this.filamentMonitors = new
|
|
37
|
-
this.gpIn = new
|
|
38
|
-
this.probes = new
|
|
16
|
+
this.analog = new ModelCollection(AnalogSensor);
|
|
17
|
+
this.endstops = new ModelCollection(Endstop);
|
|
18
|
+
this.filamentMonitors = new ModelCollection(FilamentMonitor);
|
|
19
|
+
this.gpIn = new ModelCollection(GpInputPort);
|
|
20
|
+
this.probes = new ModelCollection(Probe);
|
|
39
21
|
}
|
|
40
22
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
__exportStar(require("./Probe"), exports);
|
|
23
|
+
export default Sensors;
|
|
24
|
+
export * from "./FilamentMonitors";
|
|
25
|
+
export * from "./AnalogSensor";
|
|
26
|
+
export * from "./Endstop";
|
|
27
|
+
export * from "./Probe";
|
package/dist/spindles/index.js
CHANGED
|
@@ -1,20 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Spindle = exports.SpindleType = exports.SpindleState = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
var SpindleState;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export var SpindleState;
|
|
6
3
|
(function (SpindleState) {
|
|
7
4
|
SpindleState["unconfigured"] = "unconfigured";
|
|
8
5
|
SpindleState["stopped"] = "stopped";
|
|
9
6
|
SpindleState["forward"] = "forward";
|
|
10
7
|
SpindleState["reverse"] = "reverse";
|
|
11
|
-
})(SpindleState || (
|
|
12
|
-
var SpindleType;
|
|
8
|
+
})(SpindleState || (SpindleState = {}));
|
|
9
|
+
export var SpindleType;
|
|
13
10
|
(function (SpindleType) {
|
|
14
11
|
SpindleType["enaDir"] = "enaDir";
|
|
15
12
|
SpindleType["fwdRev"] = "fwdRev";
|
|
16
|
-
})(SpindleType || (
|
|
17
|
-
class Spindle extends
|
|
13
|
+
})(SpindleType || (SpindleType = {}));
|
|
14
|
+
export class Spindle extends ModelObject {
|
|
18
15
|
constructor() {
|
|
19
16
|
super(...arguments);
|
|
20
17
|
this.active = null;
|
|
@@ -30,5 +27,4 @@ class Spindle extends ModelObject_1.default {
|
|
|
30
27
|
this.type = null;
|
|
31
28
|
}
|
|
32
29
|
}
|
|
33
|
-
|
|
34
|
-
exports.default = Spindle;
|
|
30
|
+
export default Spindle;
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MachineStatus = void 0;
|
|
4
|
-
var MachineStatus;
|
|
1
|
+
export var MachineStatus;
|
|
5
2
|
(function (MachineStatus) {
|
|
6
3
|
MachineStatus["disconnected"] = "disconnected";
|
|
7
4
|
MachineStatus["starting"] = "starting";
|
|
@@ -17,5 +14,5 @@ var MachineStatus;
|
|
|
17
14
|
MachineStatus["busy"] = "busy";
|
|
18
15
|
MachineStatus["changingTool"] = "changingTool";
|
|
19
16
|
MachineStatus["idle"] = "idle";
|
|
20
|
-
})(MachineStatus || (
|
|
21
|
-
|
|
17
|
+
})(MachineStatus || (MachineStatus = {}));
|
|
18
|
+
export default MachineStatus;
|
package/dist/state/MessageBox.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.MessageBox = exports.MessageBoxMode = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
var MessageBoxMode;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export var MessageBoxMode;
|
|
6
3
|
(function (MessageBoxMode) {
|
|
7
4
|
MessageBoxMode[MessageBoxMode["noButtons"] = 0] = "noButtons";
|
|
8
5
|
MessageBoxMode[MessageBoxMode["closeOnly"] = 1] = "closeOnly";
|
|
@@ -12,8 +9,8 @@ var MessageBoxMode;
|
|
|
12
9
|
MessageBoxMode[MessageBoxMode["intInput"] = 5] = "intInput";
|
|
13
10
|
MessageBoxMode[MessageBoxMode["floatInput"] = 6] = "floatInput";
|
|
14
11
|
MessageBoxMode[MessageBoxMode["stringInput"] = 7] = "stringInput";
|
|
15
|
-
})(MessageBoxMode || (
|
|
16
|
-
class MessageBox extends
|
|
12
|
+
})(MessageBoxMode || (MessageBoxMode = {}));
|
|
13
|
+
export class MessageBox extends ModelObject {
|
|
17
14
|
constructor() {
|
|
18
15
|
super(...arguments);
|
|
19
16
|
this.axisControls = null;
|
|
@@ -35,5 +32,4 @@ class MessageBox extends ModelObject_1.default {
|
|
|
35
32
|
return super.update(jsonElement);
|
|
36
33
|
}
|
|
37
34
|
}
|
|
38
|
-
|
|
39
|
-
exports.default = MessageBox;
|
|
35
|
+
export default MessageBox;
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.RestorePoint = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
class RestorePoint extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export class RestorePoint extends ModelObject {
|
|
6
3
|
constructor() {
|
|
7
4
|
super(...arguments);
|
|
8
5
|
this.coords = [];
|
|
@@ -14,5 +11,4 @@ class RestorePoint extends ModelObject_1.default {
|
|
|
14
11
|
this.toolNumber = -1;
|
|
15
12
|
}
|
|
16
13
|
}
|
|
17
|
-
|
|
18
|
-
exports.default = RestorePoint;
|
|
14
|
+
export default RestorePoint;
|
package/dist/state/index.js
CHANGED
|
@@ -1,55 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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.State = exports.StartupError = exports.MachineMode = exports.LogLevel = exports.GpOutputPort = exports.BeepRequest = void 0;
|
|
18
|
-
const ModelObject_1 = require("../ModelObject");
|
|
19
|
-
const ModelCollection_1 = require("../ModelCollection");
|
|
20
|
-
const MessageBox_1 = require("./MessageBox");
|
|
21
|
-
const RestorePoint_1 = require("./RestorePoint");
|
|
22
|
-
const MachineStatus_1 = require("./MachineStatus");
|
|
23
|
-
class BeepRequest extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import ModelCollection from "../ModelCollection";
|
|
3
|
+
import MessageBox from "./MessageBox";
|
|
4
|
+
import RestorePoint from "./RestorePoint";
|
|
5
|
+
import { MachineStatus } from "./MachineStatus";
|
|
6
|
+
export class BeepRequest extends ModelObject {
|
|
24
7
|
constructor() {
|
|
25
8
|
super(...arguments);
|
|
26
9
|
this.duration = 0;
|
|
27
10
|
this.frequency = 0;
|
|
28
11
|
}
|
|
29
12
|
}
|
|
30
|
-
|
|
31
|
-
class GpOutputPort extends ModelObject_1.default {
|
|
13
|
+
export class GpOutputPort extends ModelObject {
|
|
32
14
|
constructor() {
|
|
33
15
|
super(...arguments);
|
|
34
16
|
this.freq = 0;
|
|
35
17
|
this.pwm = 0;
|
|
36
18
|
}
|
|
37
19
|
}
|
|
38
|
-
|
|
39
|
-
var LogLevel;
|
|
20
|
+
export var LogLevel;
|
|
40
21
|
(function (LogLevel) {
|
|
41
22
|
LogLevel["debug"] = "debug";
|
|
42
23
|
LogLevel["info"] = "info";
|
|
43
24
|
LogLevel["warn"] = "warn";
|
|
44
25
|
LogLevel["off"] = "off";
|
|
45
|
-
})(LogLevel || (
|
|
46
|
-
var MachineMode;
|
|
26
|
+
})(LogLevel || (LogLevel = {}));
|
|
27
|
+
export var MachineMode;
|
|
47
28
|
(function (MachineMode) {
|
|
48
29
|
MachineMode["fff"] = "FFF";
|
|
49
30
|
MachineMode["cnc"] = "CNC";
|
|
50
31
|
MachineMode["laser"] = "Laser";
|
|
51
|
-
})(MachineMode || (
|
|
52
|
-
class StartupError extends
|
|
32
|
+
})(MachineMode || (MachineMode = {}));
|
|
33
|
+
export class StartupError extends ModelObject {
|
|
53
34
|
constructor() {
|
|
54
35
|
super(...arguments);
|
|
55
36
|
this.file = "";
|
|
@@ -57,8 +38,7 @@ class StartupError extends ModelObject_1.default {
|
|
|
57
38
|
this.message = "";
|
|
58
39
|
}
|
|
59
40
|
}
|
|
60
|
-
|
|
61
|
-
class State extends ModelObject_1.default {
|
|
41
|
+
export class State extends ModelObject {
|
|
62
42
|
constructor() {
|
|
63
43
|
super();
|
|
64
44
|
this.atxPower = null;
|
|
@@ -67,7 +47,7 @@ class State extends ModelObject_1.default {
|
|
|
67
47
|
this.currentTool = -1;
|
|
68
48
|
this.deferredPowerDown = null;
|
|
69
49
|
this.displayMessage = "";
|
|
70
|
-
this.gpOut = new
|
|
50
|
+
this.gpOut = new ModelCollection(GpOutputPort);
|
|
71
51
|
this.laserPwm = null;
|
|
72
52
|
this.logFile = null;
|
|
73
53
|
this.logLevel = LogLevel.off;
|
|
@@ -88,19 +68,18 @@ class State extends ModelObject_1.default {
|
|
|
88
68
|
/**
|
|
89
69
|
* @deprecated use move.motionSystems[].restorePoints instead
|
|
90
70
|
*/
|
|
91
|
-
this.restorePoints = new
|
|
71
|
+
this.restorePoints = new ModelCollection(RestorePoint);
|
|
92
72
|
this.startupError = null;
|
|
93
|
-
this.status =
|
|
73
|
+
this.status = MachineStatus.starting;
|
|
94
74
|
this.thisInput = null;
|
|
95
75
|
this.time = null;
|
|
96
76
|
this.upTime = 0;
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
77
|
+
ModelObject.wrapModelProperty(this, "beep", BeepRequest);
|
|
78
|
+
ModelObject.wrapModelProperty(this, "startupError", StartupError);
|
|
79
|
+
ModelObject.wrapModelProperty(this, "messageBox", MessageBox);
|
|
100
80
|
}
|
|
101
81
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
__exportStar(require("./RestorePoint"), exports);
|
|
82
|
+
export default State;
|
|
83
|
+
export * from "./MachineStatus";
|
|
84
|
+
export * from "./MessageBox";
|
|
85
|
+
export * from "./RestorePoint";
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.ToolRetraction = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
class ToolRetraction extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export class ToolRetraction extends ModelObject {
|
|
6
3
|
constructor() {
|
|
7
4
|
super(...arguments);
|
|
8
5
|
this.extraRestart = 0;
|
|
@@ -12,5 +9,4 @@ class ToolRetraction extends ModelObject_1.default {
|
|
|
12
9
|
this.zHop = 0;
|
|
13
10
|
}
|
|
14
11
|
}
|
|
15
|
-
|
|
16
|
-
exports.default = ToolRetraction;
|
|
12
|
+
export default ToolRetraction;
|
package/dist/tools/index.js
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
const ToolRetraction_1 = require("./ToolRetraction");
|
|
6
|
-
var ToolState;
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import ToolRetraction from "./ToolRetraction";
|
|
3
|
+
export var ToolState;
|
|
7
4
|
(function (ToolState) {
|
|
8
5
|
ToolState["off"] = "off";
|
|
9
6
|
ToolState["active"] = "active";
|
|
10
7
|
ToolState["standby"] = "standby";
|
|
11
|
-
})(ToolState || (
|
|
12
|
-
class Tool extends
|
|
8
|
+
})(ToolState || (ToolState = {}));
|
|
9
|
+
export class Tool extends ModelObject {
|
|
13
10
|
constructor() {
|
|
14
11
|
super(...arguments);
|
|
15
12
|
this.active = [];
|
|
@@ -29,12 +26,11 @@ class Tool extends ModelObject_1.default {
|
|
|
29
26
|
this.number = 0;
|
|
30
27
|
this.offsets = [];
|
|
31
28
|
this.offsetsProbed = false;
|
|
32
|
-
this.retraction = new
|
|
29
|
+
this.retraction = new ToolRetraction();
|
|
33
30
|
this.spindle = -1;
|
|
34
31
|
this.spindleRpm = 0;
|
|
35
32
|
this.standby = [];
|
|
36
33
|
this.state = ToolState.off;
|
|
37
34
|
}
|
|
38
35
|
}
|
|
39
|
-
|
|
40
|
-
exports.default = Tool;
|
|
36
|
+
export default Tool;
|
package/dist/volumes/index.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Volume = void 0;
|
|
4
|
-
const ModelObject_1 = require("../ModelObject");
|
|
5
|
-
class Volume extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
export class Volume extends ModelObject {
|
|
6
3
|
constructor() {
|
|
7
4
|
super(...arguments);
|
|
8
5
|
this.capacity = null;
|
|
@@ -14,5 +11,4 @@ class Volume extends ModelObject_1.default {
|
|
|
14
11
|
this.speed = null;
|
|
15
12
|
}
|
|
16
13
|
}
|
|
17
|
-
|
|
18
|
-
exports.default = Volume;
|
|
14
|
+
export default Volume;
|