@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
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.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,7 @@ class ExtruderNonlinear extends ModelObject_1.default {
|
|
|
12
9
|
this.upperLimit = 0.2;
|
|
13
10
|
}
|
|
14
11
|
}
|
|
15
|
-
|
|
16
|
-
class ExtruderPressureAdvance extends ModelObject_1.default {
|
|
12
|
+
export class ExtruderPressureAdvance extends ModelObject {
|
|
17
13
|
constructor() {
|
|
18
14
|
super(...arguments);
|
|
19
15
|
this.d = null;
|
|
@@ -21,8 +17,7 @@ class ExtruderPressureAdvance extends ModelObject_1.default {
|
|
|
21
17
|
this.k1 = 0;
|
|
22
18
|
}
|
|
23
19
|
}
|
|
24
|
-
|
|
25
|
-
class Extruder extends ModelObject_1.default {
|
|
20
|
+
export class Extruder extends ModelObject {
|
|
26
21
|
constructor() {
|
|
27
22
|
super();
|
|
28
23
|
this.acceleration = 500;
|
|
@@ -32,7 +27,7 @@ class Extruder extends ModelObject_1.default {
|
|
|
32
27
|
this.filamentDiameter = 1.75;
|
|
33
28
|
this.factor = 1;
|
|
34
29
|
this.jerk = 15;
|
|
35
|
-
this.microstepping = new
|
|
30
|
+
this.microstepping = new Microstepping();
|
|
36
31
|
this.nonlinear = new ExtruderNonlinear();
|
|
37
32
|
this.percentCurrent = 100;
|
|
38
33
|
this.percentStstCurrent = null;
|
|
@@ -47,8 +42,7 @@ class Extruder extends ModelObject_1.default {
|
|
|
47
42
|
this.rawPosition = 0;
|
|
48
43
|
this.speed = 100;
|
|
49
44
|
this.stepsPerMm = 420;
|
|
50
|
-
|
|
45
|
+
ModelObject.wrapModelProperty(this, "driver", DriverId);
|
|
51
46
|
}
|
|
52
47
|
}
|
|
53
|
-
|
|
54
|
-
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.js
CHANGED
|
@@ -1,31 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
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.Move = exports.MoveRotation = exports.MoveQueueItem = exports.MotorsIdleControl = exports.CurrentMove = void 0;
|
|
18
|
-
const ModelObject_1 = require("../ModelObject");
|
|
19
|
-
const ModelCollection_1 = require("../ModelCollection");
|
|
20
|
-
const Axis_1 = require("./Axis");
|
|
21
|
-
const Extruder_1 = require("./Extruder");
|
|
22
|
-
const InputShaping_1 = require("./InputShaping");
|
|
23
|
-
const KeepoutZone_1 = require("./KeepoutZone");
|
|
24
|
-
const MotionSystem_1 = require("./MotionSystem");
|
|
25
|
-
const MoveCalibration_1 = require("./MoveCalibration");
|
|
26
|
-
const MoveCompensation_1 = require("./MoveCompensation");
|
|
27
|
-
const kinematics_1 = require("./kinematics");
|
|
28
|
-
class CurrentMove extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../ModelObject";
|
|
2
|
+
import ModelCollection from "../ModelCollection";
|
|
3
|
+
import Axis from "./Axis";
|
|
4
|
+
import Extruder from "./Extruder";
|
|
5
|
+
import InputShaping from "./InputShaping";
|
|
6
|
+
import KeepoutZone from "./KeepoutZone";
|
|
7
|
+
import MotionSystem from "./MotionSystem";
|
|
8
|
+
import MoveCalibration from "./MoveCalibration";
|
|
9
|
+
import MoveCompensation from "./MoveCompensation";
|
|
10
|
+
import { CoreKinematics, KinematicsName } from "./kinematics";
|
|
11
|
+
export class CurrentMove extends ModelObject {
|
|
29
12
|
constructor() {
|
|
30
13
|
super(...arguments);
|
|
31
14
|
this.acceleration = 0;
|
|
@@ -36,57 +19,53 @@ class CurrentMove extends ModelObject_1.default {
|
|
|
36
19
|
this.topSpeed = 0;
|
|
37
20
|
}
|
|
38
21
|
}
|
|
39
|
-
|
|
40
|
-
class MotorsIdleControl extends ModelObject_1.default {
|
|
22
|
+
export class MotorsIdleControl extends ModelObject {
|
|
41
23
|
constructor() {
|
|
42
24
|
super(...arguments);
|
|
43
25
|
this.factor = 0.3;
|
|
44
26
|
this.timeout = 30;
|
|
45
27
|
}
|
|
46
28
|
}
|
|
47
|
-
|
|
48
|
-
class MoveQueueItem extends ModelObject_1.default {
|
|
29
|
+
export class MoveQueueItem extends ModelObject {
|
|
49
30
|
constructor() {
|
|
50
31
|
super(...arguments);
|
|
51
32
|
this.gracePeriod = 0;
|
|
52
33
|
this.length = 0;
|
|
53
34
|
}
|
|
54
35
|
}
|
|
55
|
-
|
|
56
|
-
class MoveRotation extends ModelObject_1.default {
|
|
36
|
+
export class MoveRotation extends ModelObject {
|
|
57
37
|
constructor() {
|
|
58
38
|
super(...arguments);
|
|
59
39
|
this.angle = 0;
|
|
60
40
|
this.centre = [0, 0];
|
|
61
41
|
}
|
|
62
42
|
}
|
|
63
|
-
|
|
64
|
-
class Move extends ModelObject_1.default {
|
|
43
|
+
export class Move extends ModelObject {
|
|
65
44
|
constructor() {
|
|
66
45
|
super(...arguments);
|
|
67
46
|
this.accelerationTime = null;
|
|
68
|
-
this.axes = new
|
|
47
|
+
this.axes = new ModelCollection(Axis);
|
|
69
48
|
this.backlashFactor = 10;
|
|
70
|
-
this.calibration = new
|
|
71
|
-
this.compensation = new
|
|
49
|
+
this.calibration = new MoveCalibration();
|
|
50
|
+
this.compensation = new MoveCompensation();
|
|
72
51
|
this.currentMove = new CurrentMove();
|
|
73
|
-
this.extruders = new
|
|
52
|
+
this.extruders = new ModelCollection(Extruder);
|
|
74
53
|
this.idle = new MotorsIdleControl();
|
|
75
|
-
this.keepout = new
|
|
76
|
-
this.kinematics = new
|
|
54
|
+
this.keepout = new ModelCollection(KeepoutZone);
|
|
55
|
+
this.kinematics = new CoreKinematics(KinematicsName.cartesian);
|
|
77
56
|
this.limitAxes = true;
|
|
78
57
|
this.noMovesBeforeHoming = true;
|
|
79
|
-
this.motionSystems = new
|
|
58
|
+
this.motionSystems = new ModelCollection(MotionSystem);
|
|
80
59
|
/**
|
|
81
60
|
* @deprecated use motionSystems[].printingAcceleration instead
|
|
82
61
|
*/
|
|
83
62
|
this.printingAcceleration = 10000;
|
|
84
|
-
this.queue = new
|
|
63
|
+
this.queue = new ModelCollection(MoveQueueItem);
|
|
85
64
|
/**
|
|
86
65
|
* @deprecated use motionSystems[].rotation instead
|
|
87
66
|
*/
|
|
88
67
|
this.rotation = new MoveRotation();
|
|
89
|
-
this.shaping = new
|
|
68
|
+
this.shaping = new InputShaping();
|
|
90
69
|
this.speedFactor = 1;
|
|
91
70
|
/**
|
|
92
71
|
* @deprecated use motionSystems[].travelAcceleration instead
|
|
@@ -103,15 +82,14 @@ class Move extends ModelObject_1.default {
|
|
|
103
82
|
this.workplaceNumber = 0;
|
|
104
83
|
}
|
|
105
84
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
__exportStar(require("./MoveCompensation"), exports);
|
|
85
|
+
export default Move;
|
|
86
|
+
export * from "./kinematics";
|
|
87
|
+
export * from "./Axis";
|
|
88
|
+
export * from "./DriverId";
|
|
89
|
+
export * from "./Extruder";
|
|
90
|
+
export * from "./InputShaping";
|
|
91
|
+
export * from "./KeepoutZone";
|
|
92
|
+
export * from "./Microstepping";
|
|
93
|
+
export * from "./MoveCalibration";
|
|
94
|
+
export * from "./MotionSystem";
|
|
95
|
+
export * from "./MoveCompensation";
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const KinematicsBase_1 = require("./KinematicsBase");
|
|
5
|
-
const index_1 = require("./index");
|
|
6
|
-
class CoreKinematics extends KinematicsBase_1.ZLeadscrewKinematics {
|
|
1
|
+
import { ZLeadscrewKinematics } from "./KinematicsBase";
|
|
2
|
+
import { getKinematics } from "./index";
|
|
3
|
+
export class CoreKinematics extends ZLeadscrewKinematics {
|
|
7
4
|
constructor(name) {
|
|
8
5
|
super(name);
|
|
9
6
|
this.forwardMatrix = [
|
|
@@ -22,10 +19,9 @@ class CoreKinematics extends KinematicsBase_1.ZLeadscrewKinematics {
|
|
|
22
19
|
throw new Error("Kinematics must not be null");
|
|
23
20
|
}
|
|
24
21
|
if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
|
|
25
|
-
return
|
|
22
|
+
return getKinematics(jsonElement.name).update(jsonElement);
|
|
26
23
|
}
|
|
27
24
|
return super.update(jsonElement);
|
|
28
25
|
}
|
|
29
26
|
}
|
|
30
|
-
|
|
31
|
-
exports.default = CoreKinematics;
|
|
27
|
+
export default CoreKinematics;
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const KinematicsBase_1 = require("./KinematicsBase");
|
|
7
|
-
const index_1 = require("./index");
|
|
8
|
-
class DeltaTower extends ModelObject_1.default {
|
|
1
|
+
import { initCollection } from "../../ModelCollection";
|
|
2
|
+
import ModelObject from "../../ModelObject";
|
|
3
|
+
import KinematicsBase from "./KinematicsBase";
|
|
4
|
+
import { getKinematics } from "./index";
|
|
5
|
+
export class DeltaTower extends ModelObject {
|
|
9
6
|
constructor() {
|
|
10
7
|
super(...arguments);
|
|
11
8
|
this.angleCorrection = 0;
|
|
@@ -15,14 +12,13 @@ class DeltaTower extends ModelObject_1.default {
|
|
|
15
12
|
this.yPos = 0;
|
|
16
13
|
}
|
|
17
14
|
}
|
|
18
|
-
|
|
19
|
-
class DeltaKinematics extends KinematicsBase_1.default {
|
|
15
|
+
export class DeltaKinematics extends KinematicsBase {
|
|
20
16
|
constructor() {
|
|
21
17
|
super(...arguments);
|
|
22
18
|
this.deltaRadius = 0;
|
|
23
19
|
this.homedHeight = 0;
|
|
24
20
|
this.printRadius = 0;
|
|
25
|
-
this.towers =
|
|
21
|
+
this.towers = initCollection(DeltaTower, [{}, {}, {}]);
|
|
26
22
|
this.xTilt = 0;
|
|
27
23
|
this.yTilt = 0;
|
|
28
24
|
}
|
|
@@ -31,10 +27,9 @@ class DeltaKinematics extends KinematicsBase_1.default {
|
|
|
31
27
|
throw new Error("Kinematics must not be null");
|
|
32
28
|
}
|
|
33
29
|
if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
|
|
34
|
-
return
|
|
30
|
+
return getKinematics(jsonElement.name).update(jsonElement);
|
|
35
31
|
}
|
|
36
32
|
return super.update(jsonElement);
|
|
37
33
|
}
|
|
38
34
|
}
|
|
39
|
-
|
|
40
|
-
exports.default = DeltaKinematics;
|
|
35
|
+
export default DeltaKinematics;
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const KinematicsBase_1 = require("./KinematicsBase");
|
|
5
|
-
const index_1 = require("./index");
|
|
6
|
-
class HangprinterKinematics extends KinematicsBase_1.default {
|
|
1
|
+
import KinematicsBase, { KinematicsName } from "./KinematicsBase";
|
|
2
|
+
import { getKinematics } from "./index";
|
|
3
|
+
export class HangprinterKinematics extends KinematicsBase {
|
|
7
4
|
constructor() {
|
|
8
|
-
super(
|
|
5
|
+
super(KinematicsName.hangprinter);
|
|
9
6
|
this.anchors = [
|
|
10
7
|
[0, -2000, -100],
|
|
11
8
|
[2000, 1000, -100],
|
|
@@ -19,10 +16,9 @@ class HangprinterKinematics extends KinematicsBase_1.default {
|
|
|
19
16
|
throw new Error("Kinematics must not be null");
|
|
20
17
|
}
|
|
21
18
|
if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
|
|
22
|
-
return
|
|
19
|
+
return getKinematics(jsonElement.name).update(jsonElement);
|
|
23
20
|
}
|
|
24
21
|
return super.update(jsonElement);
|
|
25
22
|
}
|
|
26
23
|
}
|
|
27
|
-
|
|
28
|
-
exports.default = HangprinterKinematics;
|
|
24
|
+
export default HangprinterKinematics;
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.ZLeadscrewKinematics = exports.TiltCorrection = exports.KinematicsBase = exports.MoveSegmentation = exports.KinematicsName = void 0;
|
|
4
|
-
const ModelObject_1 = require("../../ModelObject");
|
|
5
|
-
var KinematicsName;
|
|
1
|
+
import ModelObject from "../../ModelObject";
|
|
2
|
+
export var KinematicsName;
|
|
6
3
|
(function (KinematicsName) {
|
|
7
4
|
KinematicsName["cartesian"] = "cartesian";
|
|
8
5
|
KinematicsName["coreXY"] = "coreXY";
|
|
@@ -17,25 +14,23 @@ var KinematicsName;
|
|
|
17
14
|
KinematicsName["rotaryDelta"] = "rotaryDelta";
|
|
18
15
|
KinematicsName["scara"] = "scara";
|
|
19
16
|
KinematicsName["unknown"] = "unknown";
|
|
20
|
-
})(KinematicsName || (
|
|
21
|
-
class MoveSegmentation extends
|
|
17
|
+
})(KinematicsName || (KinematicsName = {}));
|
|
18
|
+
export class MoveSegmentation extends ModelObject {
|
|
22
19
|
constructor() {
|
|
23
20
|
super(...arguments);
|
|
24
21
|
this.segmentsPerSec = 0;
|
|
25
22
|
this.minSegmentLength = 0;
|
|
26
23
|
}
|
|
27
24
|
}
|
|
28
|
-
|
|
29
|
-
class KinematicsBase extends ModelObject_1.default {
|
|
25
|
+
export class KinematicsBase extends ModelObject {
|
|
30
26
|
constructor(name) {
|
|
31
27
|
super();
|
|
32
28
|
this.segmentation = new MoveSegmentation();
|
|
33
29
|
this.name = name;
|
|
34
30
|
}
|
|
35
31
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
class TiltCorrection extends ModelObject_1.default {
|
|
32
|
+
export default KinematicsBase;
|
|
33
|
+
export class TiltCorrection extends ModelObject {
|
|
39
34
|
constructor() {
|
|
40
35
|
super(...arguments);
|
|
41
36
|
this.correctionFactor = 0;
|
|
@@ -46,11 +41,9 @@ class TiltCorrection extends ModelObject_1.default {
|
|
|
46
41
|
this.screwY = [];
|
|
47
42
|
}
|
|
48
43
|
}
|
|
49
|
-
|
|
50
|
-
class ZLeadscrewKinematics extends KinematicsBase {
|
|
44
|
+
export class ZLeadscrewKinematics extends KinematicsBase {
|
|
51
45
|
constructor() {
|
|
52
46
|
super(...arguments);
|
|
53
47
|
this.tiltCorrection = new TiltCorrection();
|
|
54
48
|
}
|
|
55
49
|
}
|
|
56
|
-
exports.ZLeadscrewKinematics = ZLeadscrewKinematics;
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const KinematicsBase_1 = require("./KinematicsBase");
|
|
5
|
-
const index_1 = require("./index");
|
|
6
|
-
class PolarKinematics extends KinematicsBase_1.default {
|
|
1
|
+
import KinematicsBase, { KinematicsName } from "./KinematicsBase";
|
|
2
|
+
import { getKinematics } from "./index";
|
|
3
|
+
export class PolarKinematics extends KinematicsBase {
|
|
7
4
|
constructor() {
|
|
8
|
-
super(
|
|
5
|
+
super(KinematicsName.polar);
|
|
9
6
|
this.radiusHomed = 0;
|
|
10
7
|
this.radiusMax = 0;
|
|
11
8
|
this.radiusMin = 0;
|
|
@@ -17,10 +14,9 @@ class PolarKinematics extends KinematicsBase_1.default {
|
|
|
17
14
|
throw new Error("Kinematics must not be null");
|
|
18
15
|
}
|
|
19
16
|
if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
|
|
20
|
-
return
|
|
17
|
+
return getKinematics(jsonElement.name).update(jsonElement);
|
|
21
18
|
}
|
|
22
19
|
return super.update(jsonElement);
|
|
23
20
|
}
|
|
24
21
|
}
|
|
25
|
-
|
|
26
|
-
exports.default = PolarKinematics;
|
|
22
|
+
export default PolarKinematics;
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const KinematicsBase_1 = require("./KinematicsBase");
|
|
5
|
-
const index_1 = require("./index");
|
|
6
|
-
class ScaraKinematics extends KinematicsBase_1.ZLeadscrewKinematics {
|
|
1
|
+
import { ZLeadscrewKinematics } from "./KinematicsBase";
|
|
2
|
+
import { getKinematics } from "./index";
|
|
3
|
+
export class ScaraKinematics extends ZLeadscrewKinematics {
|
|
7
4
|
constructor() {
|
|
8
5
|
super(...arguments);
|
|
9
6
|
this.crosstalk = [0, 0, 0];
|
|
@@ -20,10 +17,9 @@ class ScaraKinematics extends KinematicsBase_1.ZLeadscrewKinematics {
|
|
|
20
17
|
throw new Error("Kinematics must not be null");
|
|
21
18
|
}
|
|
22
19
|
if (typeof jsonElement.name === "string" && this.name !== jsonElement.name) {
|
|
23
|
-
return
|
|
20
|
+
return getKinematics(jsonElement.name).update(jsonElement);
|
|
24
21
|
}
|
|
25
22
|
return super.update(jsonElement);
|
|
26
23
|
}
|
|
27
24
|
}
|
|
28
|
-
|
|
29
|
-
exports.default = ScaraKinematics;
|
|
25
|
+
export default ScaraKinematics;
|