@duet3d/objectmodel 3.7.0-alpha.7 → 3.7.0-alpha.9
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 -49
- package/dist/boards/Driver.js +6 -13
- package/dist/boards/directDisplay/DirectDisplayScreen.d.ts +1 -1
- package/dist/boards/directDisplay/DirectDisplayScreen.js +5 -12
- package/dist/boards/directDisplay/DirectDisplayScreenBase.js +4 -10
- package/dist/boards/directDisplay/DirectDisplayScreenST7567.d.ts +1 -1
- package/dist/boards/directDisplay/DirectDisplayScreenST7567.js +6 -13
- package/dist/boards/directDisplay/index.js +16 -38
- package/dist/boards/index.js +22 -46
- package/dist/directories/index.js +3 -10
- package/dist/fans/index.js +4 -12
- package/dist/heat/Heater.js +10 -17
- package/dist/heat/HeaterModel.js +4 -12
- package/dist/heat/HeaterMonitor.js +7 -14
- package/dist/heat/index.js +9 -30
- package/dist/index.js +26 -46
- package/dist/inputs/CodeChannel.js +3 -6
- package/dist/inputs/Compatibility.js +3 -6
- package/dist/inputs/InputChannel.js +9 -16
- package/dist/inputs/index.js +3 -19
- package/dist/job/Build.js +6 -14
- package/dist/job/GCodeFileInfo.js +8 -15
- package/dist/job/ThumbnailInfo.js +5 -9
- package/dist/job/index.js +15 -38
- package/dist/ledStrips/index.js +5 -12
- package/dist/limits/index.js +3 -10
- package/dist/messages/index.js +5 -12
- package/dist/move/Axis.js +10 -17
- package/dist/move/DriverId.d.ts +2 -1
- package/dist/move/DriverId.js +4 -12
- package/dist/move/Extruder.js +9 -18
- package/dist/move/InputShaping.js +5 -12
- package/dist/move/KeepoutZone.js +5 -10
- package/dist/move/Microstepping.js +3 -10
- package/dist/move/MotionSystem.js +9 -16
- package/dist/move/MoveCalibration.js +4 -12
- package/dist/move/MoveCompensation.js +10 -19
- package/dist/move/index.js +35 -60
- 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 -17
- package/dist/move/kinematics/HangprinterKinematics.d.ts +1 -1
- package/dist/move/kinematics/HangprinterKinematics.js +6 -43
- package/dist/move/kinematics/KinematicsBase.js +8 -18
- package/dist/move/kinematics/PolarKinematics.d.ts +1 -1
- package/dist/move/kinematics/PolarKinematics.js +6 -43
- 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 -79
- package/dist/network/NetworkInterface.js +11 -18
- package/dist/network/index.js +12 -33
- package/dist/plugins/PluginManifest.d.ts +2 -1
- package/dist/plugins/PluginManifest.js +7 -14
- package/dist/plugins/index.js +4 -25
- package/dist/sbc/CPU.js +3 -10
- package/dist/sbc/Memory.js +3 -10
- package/dist/sbc/dsf/HttpEndpoint.js +5 -12
- package/dist/sbc/dsf/UserSession.js +7 -14
- package/dist/sbc/dsf/index.js +9 -30
- package/dist/sbc/index.js +12 -33
- package/dist/sensors/AnalogSensor.js +7 -14
- package/dist/sensors/Endstop.js +5 -12
- package/dist/sensors/FilamentMonitors/Duet3DFilamentMonitor.js +4 -8
- package/dist/sensors/FilamentMonitors/FilamentMonitorBase.js +9 -16
- package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.d.ts +2 -1
- package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js +11 -20
- package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.d.ts +2 -1
- package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.js +10 -52
- package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.d.ts +2 -1
- package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js +11 -20
- package/dist/sensors/FilamentMonitors/index.d.ts +1 -1
- package/dist/sensors/FilamentMonitors/index.js +18 -62
- package/dist/sensors/Probe.js +7 -15
- package/dist/sensors/index.js +18 -40
- package/dist/spindles/index.js +7 -14
- package/dist/state/MachineStatus.js +3 -6
- package/dist/state/MessageBox.d.ts +2 -1
- package/dist/state/MessageBox.js +5 -12
- package/dist/state/RestorePoint.js +3 -10
- package/dist/state/index.js +23 -47
- package/dist/tools/ToolRetraction.js +3 -10
- package/dist/tools/index.js +7 -14
- package/dist/volumes/index.js +3 -10
- package/package.json +12 -3
- package/dist/httpEndpoints/index.d.ts +0 -19
- package/dist/httpEndpoints/index.js +0 -27
- package/dist/src/ModelCollection.d.ts +0 -36
- package/dist/src/ModelCollection.js +0 -108
- package/dist/src/ModelDictionary.d.ts +0 -44
- package/dist/src/ModelDictionary.js +0 -109
- package/dist/src/ModelObject.d.ts +0 -55
- package/dist/src/ModelObject.js +0 -237
- package/dist/src/ModelSet.d.ts +0 -11
- package/dist/src/ModelSet.js +0 -15
- package/dist/src/ObjectModel.d.ts +0 -47
- package/dist/src/ObjectModel.js +0 -57
- package/dist/src/boards/Driver.d.ts +0 -18
- package/dist/src/boards/Driver.js +0 -37
- package/dist/src/boards/directDisplay/DirectDisplayScreen.d.ts +0 -6
- package/dist/src/boards/directDisplay/DirectDisplayScreen.js +0 -21
- package/dist/src/boards/directDisplay/DirectDisplayScreenBase.d.ts +0 -11
- package/dist/src/boards/directDisplay/DirectDisplayScreenBase.js +0 -19
- package/dist/src/boards/directDisplay/DirectDisplayScreenST7567.d.ts +0 -9
- package/dist/src/boards/directDisplay/DirectDisplayScreenST7567.js +0 -26
- package/dist/src/boards/directDisplay/index.d.ts +0 -20
- package/dist/src/boards/directDisplay/index.js +0 -59
- package/dist/src/boards/index.d.ts +0 -59
- package/dist/src/boards/index.js +0 -103
- package/dist/src/directories/index.d.ts +0 -11
- package/dist/src/directories/index.js +0 -21
- package/dist/src/fans/index.d.ts +0 -19
- package/dist/src/fans/index.js +0 -33
- package/dist/src/heat/Heater.d.ts +0 -30
- package/dist/src/heat/Heater.js +0 -41
- package/dist/src/heat/HeaterModel.d.ts +0 -21
- package/dist/src/heat/HeaterModel.js +0 -35
- package/dist/src/heat/HeaterMonitor.d.ts +0 -19
- package/dist/src/heat/HeaterMonitor.js +0 -31
- package/dist/src/heat/index.d.ts +0 -22
- package/dist/src/heat/index.js +0 -46
- package/dist/src/index.d.ts +0 -26
- package/dist/src/index.js +0 -57
- package/dist/src/inputs/CodeChannel.d.ts +0 -18
- package/dist/src/inputs/CodeChannel.js +0 -22
- package/dist/src/inputs/Compatibility.d.ts +0 -10
- package/dist/src/inputs/Compatibility.js +0 -14
- package/dist/src/inputs/InputChannel.d.ts +0 -32
- package/dist/src/inputs/InputChannel.js +0 -44
- package/dist/src/inputs/index.d.ts +0 -3
- package/dist/src/inputs/index.js +0 -19
- package/dist/src/job/Build.d.ts +0 -15
- package/dist/src/job/Build.js +0 -29
- package/dist/src/job/GCodeFileInfo.d.ts +0 -19
- package/dist/src/job/GCodeFileInfo.js +0 -29
- package/dist/src/job/ThumbnailInfo.d.ts +0 -15
- package/dist/src/job/ThumbnailInfo.js +0 -23
- package/dist/src/job/index.d.ts +0 -45
- package/dist/src/job/index.js +0 -78
- package/dist/src/ledStrips/index.d.ts +0 -13
- package/dist/src/ledStrips/index.js +0 -24
- package/dist/src/limits/index.d.ts +0 -32
- package/dist/src/limits/index.js +0 -42
- package/dist/src/messages/index.d.ts +0 -13
- package/dist/src/messages/index.js +0 -30
- package/dist/src/move/Axis.d.ts +0 -71
- package/dist/src/move/Axis.js +0 -82
- package/dist/src/move/DriverId.d.ts +0 -10
- package/dist/src/move/DriverId.js +0 -52
- package/dist/src/move/Extruder.d.ts +0 -39
- package/dist/src/move/Extruder.js +0 -57
- package/dist/src/move/InputShaping.d.ts +0 -19
- package/dist/src/move/InputShaping.js +0 -30
- package/dist/src/move/KeepoutZone.d.ts +0 -10
- package/dist/src/move/KeepoutZone.js +0 -21
- package/dist/src/move/Microstepping.d.ts +0 -6
- package/dist/src/move/Microstepping.js +0 -16
- package/dist/src/move/MotionSystem.d.ts +0 -20
- package/dist/src/move/MotionSystem.js +0 -30
- package/dist/src/move/MoveCalibration.d.ts +0 -11
- package/dist/src/move/MoveCalibration.js +0 -25
- package/dist/src/move/MoveCompensation.d.ts +0 -30
- package/dist/src/move/MoveCompensation.js +0 -50
- package/dist/src/move/index.d.ts +0 -80
- package/dist/src/move/index.js +0 -120
- package/dist/src/move/kinematics/CoreKinematics.d.ts +0 -9
- package/dist/src/move/kinematics/CoreKinematics.js +0 -31
- package/dist/src/move/kinematics/DeltaKinematics.d.ts +0 -20
- package/dist/src/move/kinematics/DeltaKinematics.js +0 -43
- package/dist/src/move/kinematics/HangprinterKinematics.d.ts +0 -9
- package/dist/src/move/kinematics/HangprinterKinematics.js +0 -61
- package/dist/src/move/kinematics/KinematicsBase.d.ts +0 -37
- package/dist/src/move/kinematics/KinematicsBase.js +0 -59
- package/dist/src/move/kinematics/PolarKinematics.d.ts +0 -12
- package/dist/src/move/kinematics/PolarKinematics.js +0 -59
- package/dist/src/move/kinematics/ScaraKinematics.d.ts +0 -14
- package/dist/src/move/kinematics/ScaraKinematics.js +0 -29
- package/dist/src/move/kinematics/index.d.ts +0 -14
- package/dist/src/move/kinematics/index.js +0 -98
- package/dist/src/network/NetworkInterface.d.ts +0 -46
- package/dist/src/network/NetworkInterface.js +0 -59
- package/dist/src/network/index.d.ts +0 -14
- package/dist/src/network/index.js +0 -38
- package/dist/src/plugins/PluginManifest.d.ts +0 -67
- package/dist/src/plugins/PluginManifest.js +0 -128
- package/dist/src/plugins/index.d.ts +0 -9
- package/dist/src/plugins/index.js +0 -33
- package/dist/src/sbc/CPU.d.ts +0 -8
- package/dist/src/sbc/CPU.js +0 -18
- package/dist/src/sbc/Memory.d.ts +0 -6
- package/dist/src/sbc/Memory.js +0 -16
- package/dist/src/sbc/dsf/HttpEndpoint.d.ts +0 -19
- package/dist/src/sbc/dsf/HttpEndpoint.js +0 -30
- package/dist/src/sbc/dsf/UserSession.d.ts +0 -18
- package/dist/src/sbc/dsf/UserSession.js +0 -30
- package/dist/src/sbc/dsf/index.d.ts +0 -15
- package/dist/src/sbc/dsf/index.js +0 -39
- package/dist/src/sbc/index.d.ts +0 -19
- package/dist/src/sbc/index.js +0 -43
- package/dist/src/sensors/AnalogSensor.d.ts +0 -59
- package/dist/src/sensors/AnalogSensor.js +0 -71
- package/dist/src/sensors/Endstop.d.ts +0 -15
- package/dist/src/sensors/Endstop.js +0 -26
- package/dist/src/sensors/FilamentMonitors/Duet3DFilamentMonitor.d.ts +0 -11
- package/dist/src/sensors/FilamentMonitors/Duet3DFilamentMonitor.js +0 -17
- package/dist/src/sensors/FilamentMonitors/FilamentMonitorBase.d.ts +0 -33
- package/dist/src/sensors/FilamentMonitors/FilamentMonitorBase.js +0 -45
- package/dist/src/sensors/FilamentMonitors/LaserFilamentMonitor.d.ts +0 -22
- package/dist/src/sensors/FilamentMonitors/LaserFilamentMonitor.js +0 -50
- package/dist/src/sensors/FilamentMonitors/PulsedFilamentMonitor.d.ts +0 -22
- package/dist/src/sensors/FilamentMonitors/PulsedFilamentMonitor.js +0 -82
- package/dist/src/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.d.ts +0 -22
- package/dist/src/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js +0 -50
- package/dist/src/sensors/FilamentMonitors/index.d.ts +0 -12
- package/dist/src/sensors/FilamentMonitors/index.js +0 -77
- package/dist/src/sensors/Probe.d.ts +0 -51
- package/dist/src/sensors/Probe.js +0 -66
- package/dist/src/sensors/index.d.ts +0 -21
- package/dist/src/sensors/index.js +0 -49
- package/dist/src/spindles/index.d.ts +0 -25
- package/dist/src/spindles/index.js +0 -37
- package/dist/src/state/MachineStatus.d.ts +0 -17
- package/dist/src/state/MachineStatus.js +0 -21
- package/dist/src/state/MessageBox.d.ts +0 -26
- package/dist/src/state/MessageBox.js +0 -42
- package/dist/src/state/RestorePoint.d.ts +0 -11
- package/dist/src/state/RestorePoint.js +0 -21
- package/dist/src/state/index.d.ts +0 -69
- package/dist/src/state/index.js +0 -109
- package/dist/src/tools/ToolRetraction.d.ts +0 -9
- package/dist/src/tools/ToolRetraction.js +0 -19
- package/dist/src/tools/index.d.ts +0 -32
- package/dist/src/tools/index.js +0 -43
- package/dist/src/volumes/index.d.ts +0 -11
- package/dist/src/volumes/index.js +0 -21
- package/dist/userSessions/index.d.ts +0 -18
- package/dist/userSessions/index.js +0 -27
package/dist/ModelCollection.js
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.ModelCollection = void 0;
|
|
4
|
-
exports.initCollection = initCollection;
|
|
5
|
-
const ModelObject_1 = require("./ModelObject");
|
|
6
|
-
const index_1 = require("./index");
|
|
1
|
+
import { isModelObject } from "./ModelObject";
|
|
2
|
+
import { setArrayItem } from "./index";
|
|
7
3
|
/**
|
|
8
4
|
* Class for storing model object items in an array
|
|
9
5
|
*/
|
|
10
|
-
class ModelCollection extends Array {
|
|
6
|
+
export class ModelCollection extends Array {
|
|
11
7
|
/**
|
|
12
8
|
* Constructor of this class
|
|
13
9
|
* @param itemConstructor Item constructor type that items must derive from
|
|
@@ -56,23 +52,23 @@ class ModelCollection extends Array {
|
|
|
56
52
|
if (currentItem === null) {
|
|
57
53
|
const newItem = jsonElement[i];
|
|
58
54
|
if (newItem instanceof that.$itemConstructor) {
|
|
59
|
-
|
|
55
|
+
setArrayItem(this, i, jsonElement[i]);
|
|
60
56
|
}
|
|
61
57
|
else {
|
|
62
58
|
const refItem = new that.$itemConstructor();
|
|
63
|
-
|
|
59
|
+
setArrayItem(this, i, refItem.update(newItem));
|
|
64
60
|
}
|
|
65
61
|
}
|
|
66
|
-
else if (
|
|
62
|
+
else if (isModelObject(currentItem)) {
|
|
67
63
|
const newItem = currentItem.update(jsonElement[i]);
|
|
68
64
|
if (currentItem !== newItem) {
|
|
69
|
-
|
|
65
|
+
setArrayItem(this, i, newItem);
|
|
70
66
|
}
|
|
71
67
|
}
|
|
72
68
|
else {
|
|
73
69
|
const newItem = jsonElement[i];
|
|
74
70
|
if (currentItem !== newItem) {
|
|
75
|
-
|
|
71
|
+
setArrayItem(this, i, newItem);
|
|
76
72
|
}
|
|
77
73
|
}
|
|
78
74
|
}
|
|
@@ -90,15 +86,14 @@ class ModelCollection extends Array {
|
|
|
90
86
|
return this;
|
|
91
87
|
}
|
|
92
88
|
}
|
|
93
|
-
|
|
94
|
-
exports.default = ModelCollection;
|
|
89
|
+
export default ModelCollection;
|
|
95
90
|
/**
|
|
96
91
|
* Initialize a model collection from the given data
|
|
97
92
|
* @param itemType Item type to create
|
|
98
93
|
* @param data Data to assign
|
|
99
94
|
* @returns Initialized model collection
|
|
100
95
|
*/
|
|
101
|
-
function initCollection(itemType, data) {
|
|
96
|
+
export function initCollection(itemType, data) {
|
|
102
97
|
const result = new ModelCollection(itemType);
|
|
103
98
|
for (let presetItem of data) {
|
|
104
99
|
const item = new itemType();
|
package/dist/ModelDictionary.js
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ModelDictionary = void 0;
|
|
4
|
-
exports.initDictionary = initDictionary;
|
|
5
|
-
const ModelObject_1 = require("./ModelObject");
|
|
1
|
+
import { isModelObject } from "./ModelObject";
|
|
6
2
|
/**
|
|
7
3
|
* Dictionary class to map object model data
|
|
8
4
|
*/
|
|
9
|
-
class ModelDictionary extends Map {
|
|
5
|
+
export class ModelDictionary extends Map {
|
|
10
6
|
/**
|
|
11
7
|
* Constructor of this class
|
|
12
8
|
* @param nullDeletesKeys Whether setting null to items effectively deletes them
|
|
@@ -36,13 +32,13 @@ class ModelDictionary extends Map {
|
|
|
36
32
|
if (currentItem == null) {
|
|
37
33
|
if (that.$itemConstructor !== null && !(value instanceof that.$itemConstructor)) {
|
|
38
34
|
const newItem = new that.$itemConstructor();
|
|
39
|
-
if (
|
|
35
|
+
if (isModelObject(newItem)) {
|
|
40
36
|
const updatedItem = newItem.update(value);
|
|
41
37
|
return super.set(key, updatedItem);
|
|
42
38
|
}
|
|
43
39
|
}
|
|
44
40
|
}
|
|
45
|
-
else if (
|
|
41
|
+
else if (isModelObject(currentItem)) {
|
|
46
42
|
const newItem = currentItem.update(value);
|
|
47
43
|
if (currentItem !== newItem) {
|
|
48
44
|
return super.set(key, value);
|
|
@@ -84,8 +80,7 @@ class ModelDictionary extends Map {
|
|
|
84
80
|
return json;
|
|
85
81
|
}
|
|
86
82
|
}
|
|
87
|
-
|
|
88
|
-
exports.default = ModelDictionary;
|
|
83
|
+
export default ModelDictionary;
|
|
89
84
|
/**
|
|
90
85
|
* Initialize a model dictionary from the given data
|
|
91
86
|
* @param nullDeletesKeys Defines whether setting values to null deletes the corresponding key
|
|
@@ -93,11 +88,11 @@ exports.default = ModelDictionary;
|
|
|
93
88
|
* @param data Data to assign
|
|
94
89
|
* @returns Initialized model dictionary
|
|
95
90
|
*/
|
|
96
|
-
function initDictionary(nullDeletesKeys, itemConstructor, data) {
|
|
91
|
+
export function initDictionary(nullDeletesKeys, itemConstructor, data) {
|
|
97
92
|
const result = new ModelDictionary(nullDeletesKeys, itemConstructor);
|
|
98
93
|
for (let key in data) {
|
|
99
94
|
const item = new itemConstructor();
|
|
100
|
-
if (
|
|
95
|
+
if (isModelObject(item)) {
|
|
101
96
|
item.update(data[key]);
|
|
102
97
|
result.set(key, item);
|
|
103
98
|
}
|
package/dist/ModelObject.js
CHANGED
|
@@ -1,20 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ModelObject = void 0;
|
|
4
|
-
exports.isModelObject = isModelObject;
|
|
5
|
-
exports.initObject = initObject;
|
|
6
|
-
const index_1 = require("./index");
|
|
1
|
+
import { ModelCollection, setArrayItem } from "./index";
|
|
7
2
|
/**
|
|
8
3
|
* Check whether a given value provides model update functionality
|
|
9
4
|
* @param value Value to check
|
|
10
5
|
*/
|
|
11
|
-
function isModelObject(value) {
|
|
6
|
+
export function isModelObject(value) {
|
|
12
7
|
return (value instanceof Object) && value.update !== undefined;
|
|
13
8
|
}
|
|
14
9
|
/**
|
|
15
10
|
* Base class for object model classes
|
|
16
11
|
*/
|
|
17
|
-
class ModelObject {
|
|
12
|
+
export class ModelObject {
|
|
18
13
|
/**
|
|
19
14
|
* Update this instance from the given data
|
|
20
15
|
* @param jsonElement JSON data to upgrade this instance from
|
|
@@ -54,12 +49,12 @@ class ModelObject {
|
|
|
54
49
|
for (let i = 0; i < Math.min(prop.length, value.length); i++) {
|
|
55
50
|
const propItem = prop[i];
|
|
56
51
|
if (propItem === null) {
|
|
57
|
-
|
|
52
|
+
setArrayItem(prop, i, value[i]);
|
|
58
53
|
}
|
|
59
54
|
else {
|
|
60
55
|
const newItem = value[i];
|
|
61
56
|
if (propItem !== newItem) {
|
|
62
|
-
|
|
57
|
+
setArrayItem(prop, i, newItem);
|
|
63
58
|
}
|
|
64
59
|
}
|
|
65
60
|
}
|
|
@@ -187,7 +182,7 @@ class ModelObject {
|
|
|
187
182
|
}
|
|
188
183
|
}
|
|
189
184
|
else {
|
|
190
|
-
const newModel = new
|
|
185
|
+
const newModel = new ModelCollection(itemConstructor);
|
|
191
186
|
propertyValue = newModel.update(newValue);
|
|
192
187
|
}
|
|
193
188
|
},
|
|
@@ -224,14 +219,13 @@ class ModelObject {
|
|
|
224
219
|
});
|
|
225
220
|
}
|
|
226
221
|
}
|
|
227
|
-
|
|
228
|
-
exports.default = ModelObject;
|
|
222
|
+
export default ModelObject;
|
|
229
223
|
/**
|
|
230
224
|
* Initialize a model object from the given data
|
|
231
225
|
* @param itemType Model type to create
|
|
232
226
|
* @param data Data to assign
|
|
233
227
|
* @returns Initialized model instance
|
|
234
228
|
*/
|
|
235
|
-
function initObject(itemType, data) {
|
|
229
|
+
export function initObject(itemType, data) {
|
|
236
230
|
return new itemType().update(data);
|
|
237
231
|
}
|
package/dist/ModelSet.js
CHANGED
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ModelSet = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* Wrapper around a standard set to make sure it serializes to an array
|
|
6
3
|
*/
|
|
7
|
-
class ModelSet extends Set {
|
|
4
|
+
export class ModelSet extends Set {
|
|
8
5
|
/**
|
|
9
6
|
* Convert this object to JSON
|
|
10
7
|
* @returns JSON object
|
|
11
8
|
*/
|
|
12
9
|
toJSON() { return Array.from(this); }
|
|
13
10
|
}
|
|
14
|
-
|
|
15
|
-
exports.default = ModelSet;
|
|
11
|
+
export default ModelSet;
|
package/dist/ObjectModel.js
CHANGED
|
@@ -1,57 +1,50 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const sensors_1 = __importDefault(require("./sensors"));
|
|
23
|
-
const spindles_1 = __importDefault(require("./spindles"));
|
|
24
|
-
const state_1 = __importDefault(require("./state"));
|
|
25
|
-
const tools_1 = __importDefault(require("./tools"));
|
|
26
|
-
const volumes_1 = __importDefault(require("./volumes"));
|
|
27
|
-
const ledStrips_1 = __importDefault(require("./ledStrips"));
|
|
1
|
+
import ModelCollection from "./ModelCollection";
|
|
2
|
+
import ModelDictionary from "./ModelDictionary";
|
|
3
|
+
import ModelObject from "./ModelObject";
|
|
4
|
+
import Board from "./boards";
|
|
5
|
+
import Directories from "./directories";
|
|
6
|
+
import Fan from "./fans";
|
|
7
|
+
import Heat from "./heat";
|
|
8
|
+
import InputChannel from "./inputs/InputChannel";
|
|
9
|
+
import Job from "./job";
|
|
10
|
+
import Limits from "./limits";
|
|
11
|
+
import Message from "./messages";
|
|
12
|
+
import Move from "./move";
|
|
13
|
+
import Network from "./network";
|
|
14
|
+
import Plugin from "./plugins";
|
|
15
|
+
import SBC from "./sbc";
|
|
16
|
+
import Sensors from "./sensors";
|
|
17
|
+
import Spindle from "./spindles";
|
|
18
|
+
import State from "./state";
|
|
19
|
+
import Tool from "./tools";
|
|
20
|
+
import Volume from "./volumes";
|
|
21
|
+
import LedStrip from "./ledStrips";
|
|
28
22
|
/**
|
|
29
23
|
* Refer to the DSF/RRF documentation for descriptions of the object model fields
|
|
30
24
|
*/
|
|
31
|
-
class ObjectModel extends
|
|
25
|
+
export class ObjectModel extends ModelObject {
|
|
32
26
|
constructor() {
|
|
33
27
|
super();
|
|
34
|
-
this.boards = new
|
|
35
|
-
this.directories = new
|
|
36
|
-
this.fans = new
|
|
37
|
-
this.global = new
|
|
38
|
-
this.heat = new
|
|
39
|
-
this.inputs = new
|
|
40
|
-
this.job = new
|
|
41
|
-
this.ledStrips = new
|
|
42
|
-
this.limits = new
|
|
43
|
-
this.messages = new
|
|
44
|
-
this.move = new
|
|
45
|
-
this.network = new
|
|
46
|
-
this.plugins = new
|
|
28
|
+
this.boards = new ModelCollection(Board);
|
|
29
|
+
this.directories = new Directories();
|
|
30
|
+
this.fans = new ModelCollection(Fan);
|
|
31
|
+
this.global = new ModelDictionary(false);
|
|
32
|
+
this.heat = new Heat();
|
|
33
|
+
this.inputs = new ModelCollection(InputChannel);
|
|
34
|
+
this.job = new Job();
|
|
35
|
+
this.ledStrips = new ModelCollection(LedStrip);
|
|
36
|
+
this.limits = new Limits();
|
|
37
|
+
this.messages = new ModelCollection(Message); // must be manually cleared after updates
|
|
38
|
+
this.move = new Move();
|
|
39
|
+
this.network = new Network();
|
|
40
|
+
this.plugins = new ModelDictionary(true, Plugin);
|
|
47
41
|
this.sbc = null;
|
|
48
|
-
this.sensors = new
|
|
49
|
-
this.spindles = new
|
|
50
|
-
this.state = new
|
|
51
|
-
this.tools = new
|
|
52
|
-
this.volumes = new
|
|
53
|
-
|
|
42
|
+
this.sensors = new Sensors();
|
|
43
|
+
this.spindles = new ModelCollection(Spindle);
|
|
44
|
+
this.state = new State();
|
|
45
|
+
this.tools = new ModelCollection(Tool);
|
|
46
|
+
this.volumes = new ModelCollection(Volume);
|
|
47
|
+
ModelObject.wrapModelProperty(this, "sbc", SBC);
|
|
54
48
|
}
|
|
55
49
|
}
|
|
56
|
-
|
|
57
|
-
exports.default = ObjectModel;
|
|
50
|
+
export default ObjectModel;
|
package/dist/boards/Driver.js
CHANGED
|
@@ -1,37 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.DriverClosedLoop = exports.BoardClosedLoopPositionError = exports.BoardClosedLoopCurrentFraction = void 0;
|
|
4
|
-
const __1 = require("..");
|
|
5
|
-
class BoardClosedLoopCurrentFraction extends __1.ModelObject {
|
|
1
|
+
import { ModelObject } from "..";
|
|
2
|
+
export class BoardClosedLoopCurrentFraction extends ModelObject {
|
|
6
3
|
constructor() {
|
|
7
4
|
super(...arguments);
|
|
8
5
|
this.avg = 0;
|
|
9
6
|
this.max = 0;
|
|
10
7
|
}
|
|
11
8
|
}
|
|
12
|
-
|
|
13
|
-
class BoardClosedLoopPositionError extends __1.ModelObject {
|
|
9
|
+
export class BoardClosedLoopPositionError extends ModelObject {
|
|
14
10
|
constructor() {
|
|
15
11
|
super(...arguments);
|
|
16
12
|
this.max = 0;
|
|
17
13
|
this.rms = 0;
|
|
18
14
|
}
|
|
19
15
|
}
|
|
20
|
-
|
|
21
|
-
class DriverClosedLoop extends __1.ModelObject {
|
|
16
|
+
export class DriverClosedLoop extends ModelObject {
|
|
22
17
|
constructor() {
|
|
23
18
|
super(...arguments);
|
|
24
19
|
this.currentFraction = new BoardClosedLoopCurrentFraction();
|
|
25
20
|
this.positionError = new BoardClosedLoopPositionError();
|
|
26
21
|
}
|
|
27
22
|
}
|
|
28
|
-
|
|
29
|
-
class Driver extends __1.ModelObject {
|
|
23
|
+
export default class Driver extends ModelObject {
|
|
30
24
|
constructor() {
|
|
31
25
|
super();
|
|
32
26
|
this.closedLoop = null;
|
|
33
27
|
this.status = 0;
|
|
34
|
-
|
|
28
|
+
ModelObject.wrapModelProperty(this, "closedLoop", DriverClosedLoop);
|
|
35
29
|
}
|
|
36
30
|
}
|
|
37
|
-
exports.default = Driver;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IModelObject } from "../../ModelObject";
|
|
1
|
+
import type { IModelObject } from "../../ModelObject";
|
|
2
2
|
import DirectDisplayScreenBase from "./DirectDisplayScreenBase";
|
|
3
3
|
export declare class DirectDisplayScreen extends DirectDisplayScreenBase {
|
|
4
4
|
update(jsonElement: any): IModelObject | null;
|
|
@@ -1,21 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DirectDisplayScreen = void 0;
|
|
7
|
-
const _1 = require(".");
|
|
8
|
-
const DirectDisplayScreenBase_1 = __importDefault(require("./DirectDisplayScreenBase"));
|
|
9
|
-
class DirectDisplayScreen extends DirectDisplayScreenBase_1.default {
|
|
1
|
+
import { getDirectDisplayScreen } from ".";
|
|
2
|
+
import DirectDisplayScreenBase from "./DirectDisplayScreenBase";
|
|
3
|
+
export class DirectDisplayScreen extends DirectDisplayScreenBase {
|
|
10
4
|
update(jsonElement) {
|
|
11
5
|
if (jsonElement === null) {
|
|
12
6
|
return null;
|
|
13
7
|
}
|
|
14
8
|
if (typeof jsonElement.controller === "string" && jsonElement.controller !== this.controller) {
|
|
15
|
-
return
|
|
9
|
+
return getDirectDisplayScreen(jsonElement.controller).update(jsonElement);
|
|
16
10
|
}
|
|
17
11
|
return super.update(jsonElement);
|
|
18
12
|
}
|
|
19
13
|
}
|
|
20
|
-
|
|
21
|
-
exports.default = DirectDisplayScreen;
|
|
14
|
+
export default DirectDisplayScreen;
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DirectDisplayScreenBase = void 0;
|
|
7
|
-
const ModelObject_1 = __importDefault(require("../../ModelObject"));
|
|
8
|
-
class DirectDisplayScreenBase extends ModelObject_1.default {
|
|
1
|
+
import ModelObject from "../../ModelObject";
|
|
2
|
+
import { DirectDisplayController } from ".";
|
|
3
|
+
export class DirectDisplayScreenBase extends ModelObject {
|
|
9
4
|
constructor(type) {
|
|
10
5
|
super();
|
|
11
6
|
this.colourBits = 1;
|
|
@@ -15,5 +10,4 @@ class DirectDisplayScreenBase extends ModelObject_1.default {
|
|
|
15
10
|
this.controller = type;
|
|
16
11
|
}
|
|
17
12
|
}
|
|
18
|
-
|
|
19
|
-
exports.default = DirectDisplayScreenBase;
|
|
13
|
+
export default DirectDisplayScreenBase;
|
|
@@ -1,14 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DirectDisplayScreenST7567 = void 0;
|
|
7
|
-
const DirectDisplayScreen_1 = __importDefault(require("./DirectDisplayScreen"));
|
|
8
|
-
const _1 = require(".");
|
|
9
|
-
class DirectDisplayScreenST7567 extends DirectDisplayScreen_1.default {
|
|
1
|
+
import DirectDisplayScreenBase from "./DirectDisplayScreen";
|
|
2
|
+
import { DirectDisplayController, getDirectDisplayScreen } from ".";
|
|
3
|
+
export class DirectDisplayScreenST7567 extends DirectDisplayScreenBase {
|
|
10
4
|
constructor() {
|
|
11
|
-
super(
|
|
5
|
+
super(DirectDisplayController.ST7567);
|
|
12
6
|
this.contrast = 30;
|
|
13
7
|
this.resistorRatio = 6;
|
|
14
8
|
}
|
|
@@ -17,10 +11,9 @@ class DirectDisplayScreenST7567 extends DirectDisplayScreen_1.default {
|
|
|
17
11
|
return null;
|
|
18
12
|
}
|
|
19
13
|
if (typeof jsonElement.controller === "string" && jsonElement.controller !== this.controller) {
|
|
20
|
-
return
|
|
14
|
+
return getDirectDisplayScreen(jsonElement.type).update(jsonElement);
|
|
21
15
|
}
|
|
22
16
|
return super.update(jsonElement);
|
|
23
17
|
}
|
|
24
18
|
}
|
|
25
|
-
|
|
26
|
-
exports.default = DirectDisplayScreenST7567;
|
|
19
|
+
export default DirectDisplayScreenST7567;
|
|
@@ -1,59 +1,37 @@
|
|
|
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
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
17
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
|
-
};
|
|
19
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.DirectDisplay = exports.DirectDisplayEncoder = exports.DirectDisplayController = void 0;
|
|
21
|
-
exports.getDirectDisplayScreen = getDirectDisplayScreen;
|
|
22
|
-
const ModelObject_1 = __importDefault(require("../../ModelObject"));
|
|
23
|
-
const DirectDisplayScreen_1 = __importDefault(require("./DirectDisplayScreen"));
|
|
24
|
-
const DirectDisplayScreenST7567_1 = require("./DirectDisplayScreenST7567");
|
|
25
|
-
var DirectDisplayController;
|
|
1
|
+
import ModelObject from "../../ModelObject";
|
|
2
|
+
import DirectDisplayScreenBase from "./DirectDisplayScreenBase";
|
|
3
|
+
import DirectDisplayScreen from "./DirectDisplayScreen";
|
|
4
|
+
import { DirectDisplayScreenST7567 } from "./DirectDisplayScreenST7567";
|
|
5
|
+
export var DirectDisplayController;
|
|
26
6
|
(function (DirectDisplayController) {
|
|
27
7
|
DirectDisplayController["ST7920"] = "ST7920";
|
|
28
8
|
DirectDisplayController["ST7567"] = "ST7567";
|
|
29
9
|
DirectDisplayController["ILI9488"] = "ILI9488";
|
|
30
|
-
})(DirectDisplayController || (
|
|
31
|
-
class DirectDisplayEncoder extends
|
|
10
|
+
})(DirectDisplayController || (DirectDisplayController = {}));
|
|
11
|
+
export class DirectDisplayEncoder extends ModelObject {
|
|
32
12
|
constructor() {
|
|
33
13
|
super(...arguments);
|
|
34
14
|
this.pulsesPerClick = 1;
|
|
35
15
|
}
|
|
36
16
|
}
|
|
37
|
-
|
|
38
|
-
class DirectDisplay extends ModelObject_1.default {
|
|
17
|
+
export class DirectDisplay extends ModelObject {
|
|
39
18
|
constructor() {
|
|
40
19
|
super();
|
|
41
20
|
this.encoder = new DirectDisplayEncoder();
|
|
42
|
-
this.screen = new
|
|
43
|
-
|
|
21
|
+
this.screen = new DirectDisplayScreen(DirectDisplayController.ST7920);
|
|
22
|
+
ModelObject.wrapModelProperty(this, "encoder", DirectDisplayEncoder);
|
|
44
23
|
}
|
|
45
24
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
function getDirectDisplayScreen(controller) {
|
|
25
|
+
export default DirectDisplay;
|
|
26
|
+
export function getDirectDisplayScreen(controller) {
|
|
49
27
|
switch (controller) {
|
|
50
28
|
case DirectDisplayController.ST7920:
|
|
51
29
|
case DirectDisplayController.ILI9488:
|
|
52
30
|
default:
|
|
53
|
-
return new
|
|
31
|
+
return new DirectDisplayScreen(controller);
|
|
54
32
|
case DirectDisplayController.ST7567:
|
|
55
|
-
return new
|
|
33
|
+
return new DirectDisplayScreenST7567();
|
|
56
34
|
}
|
|
57
35
|
}
|
|
58
|
-
|
|
59
|
-
|
|
36
|
+
export * from "./DirectDisplayScreen";
|
|
37
|
+
export * from "./DirectDisplayScreenST7567";
|
package/dist/boards/index.js
CHANGED
|
@@ -1,27 +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
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
17
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
|
-
};
|
|
19
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.Board = exports.MinMaxCurrent = exports.InductiveSensor = exports.BoardState = exports.BoardClosedLoop = exports.Accelerometer = void 0;
|
|
21
|
-
const ModelObject_1 = __importDefault(require("../ModelObject"));
|
|
22
|
-
const directDisplay_1 = __importDefault(require("./directDisplay"));
|
|
23
|
-
const Driver_1 = __importDefault(require("./Driver"));
|
|
24
|
-
class Accelerometer extends ModelObject_1.default {
|
|
1
|
+
import ModelCollection from "../ModelCollection";
|
|
2
|
+
import ModelObject from "../ModelObject";
|
|
3
|
+
import DirectDisplay from "./directDisplay";
|
|
4
|
+
import Driver from "./Driver";
|
|
5
|
+
export class Accelerometer extends ModelObject {
|
|
25
6
|
constructor() {
|
|
26
7
|
super(...arguments);
|
|
27
8
|
this.orientation = 20;
|
|
@@ -29,16 +10,14 @@ class Accelerometer extends ModelObject_1.default {
|
|
|
29
10
|
this.runs = 0;
|
|
30
11
|
}
|
|
31
12
|
}
|
|
32
|
-
|
|
33
|
-
class BoardClosedLoop extends ModelObject_1.default {
|
|
13
|
+
export class BoardClosedLoop extends ModelObject {
|
|
34
14
|
constructor() {
|
|
35
15
|
super(...arguments);
|
|
36
16
|
this.points = 0;
|
|
37
17
|
this.runs = 0;
|
|
38
18
|
}
|
|
39
19
|
}
|
|
40
|
-
|
|
41
|
-
var BoardState;
|
|
20
|
+
export var BoardState;
|
|
42
21
|
(function (BoardState) {
|
|
43
22
|
BoardState["unknown"] = "unknown";
|
|
44
23
|
BoardState["flashing"] = "flashing";
|
|
@@ -46,11 +25,10 @@ var BoardState;
|
|
|
46
25
|
BoardState["resetting"] = "resetting";
|
|
47
26
|
BoardState["running"] = "running";
|
|
48
27
|
BoardState["timedOut"] = "timedOut";
|
|
49
|
-
})(BoardState || (
|
|
50
|
-
class InductiveSensor extends
|
|
28
|
+
})(BoardState || (BoardState = {}));
|
|
29
|
+
export class InductiveSensor extends ModelObject {
|
|
51
30
|
}
|
|
52
|
-
|
|
53
|
-
class MinMaxCurrent extends ModelObject_1.default {
|
|
31
|
+
export class MinMaxCurrent extends ModelObject {
|
|
54
32
|
constructor() {
|
|
55
33
|
super(...arguments);
|
|
56
34
|
this.current = 0;
|
|
@@ -58,8 +36,7 @@ class MinMaxCurrent extends ModelObject_1.default {
|
|
|
58
36
|
this.max = 0;
|
|
59
37
|
}
|
|
60
38
|
}
|
|
61
|
-
|
|
62
|
-
class Board extends ModelObject_1.default {
|
|
39
|
+
export class Board extends ModelObject {
|
|
63
40
|
constructor() {
|
|
64
41
|
super();
|
|
65
42
|
this.accelerometer = null;
|
|
@@ -87,17 +64,16 @@ class Board extends ModelObject_1.default {
|
|
|
87
64
|
this.v12 = null;
|
|
88
65
|
this.vIn = null;
|
|
89
66
|
this.wifiFirmwareFileName = null;
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
67
|
+
ModelObject.wrapModelProperty(this, "accelerometer", Accelerometer);
|
|
68
|
+
ModelObject.wrapModelProperty(this, "closedLoop", BoardClosedLoop);
|
|
69
|
+
ModelObject.wrapModelProperty(this, "directDisplay", DirectDisplay);
|
|
70
|
+
ModelObject.wrapModelCollectionProperty(this, "drivers", Driver);
|
|
71
|
+
ModelObject.wrapModelProperty(this, "inductiveSensor", InductiveSensor);
|
|
72
|
+
ModelObject.wrapModelProperty(this, "mcuTemp", MinMaxCurrent);
|
|
73
|
+
ModelObject.wrapModelProperty(this, "v12", MinMaxCurrent);
|
|
74
|
+
ModelObject.wrapModelProperty(this, "vIn", MinMaxCurrent);
|
|
98
75
|
}
|
|
99
76
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
__exportStar(require("./Driver"), exports);
|
|
77
|
+
export default Board;
|
|
78
|
+
export * from "./directDisplay";
|
|
79
|
+
export * from "./Driver";
|