@duet3d/objectmodel 3.6.0-alpha.8 → 3.6.0-beta.2
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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import ModelObject from "../ModelObject";
|
|
1
|
+
import ModelObject, { IModelObject } from "../ModelObject";
|
|
2
2
|
import ModelSet from "../ModelSet";
|
|
3
3
|
export declare enum SbcPermission {
|
|
4
4
|
none = "none",
|
|
@@ -62,5 +62,6 @@ export declare class PluginManifest extends ModelObject {
|
|
|
62
62
|
rrfVersion: string | null;
|
|
63
63
|
data: Map<string, any>;
|
|
64
64
|
static checkVersion(actual: string, required: string): boolean;
|
|
65
|
+
update(jsonElement: any): IModelObject | null;
|
|
65
66
|
}
|
|
66
67
|
export default PluginManifest;
|
|
@@ -111,6 +111,15 @@ class PluginManifest extends ModelObject_1.default {
|
|
|
111
111
|
}
|
|
112
112
|
return true;
|
|
113
113
|
}
|
|
114
|
+
update(jsonElement) {
|
|
115
|
+
if (typeof jsonElement.data === "object") {
|
|
116
|
+
for (const key in jsonElement.data) {
|
|
117
|
+
this.data.set(key, jsonElement.data[key]);
|
|
118
|
+
}
|
|
119
|
+
delete jsonElement.data;
|
|
120
|
+
}
|
|
121
|
+
return super.update(jsonElement);
|
|
122
|
+
}
|
|
114
123
|
}
|
|
115
124
|
exports.PluginManifest = PluginManifest;
|
|
116
125
|
exports.default = PluginManifest;
|
|
@@ -10,8 +10,8 @@ export declare enum AnalogSensorType {
|
|
|
10
10
|
dht22 = "dht22",
|
|
11
11
|
dhtHumidity = "dhthumidity",
|
|
12
12
|
bme280 = "bme280",
|
|
13
|
-
bme280pressure = "
|
|
14
|
-
bme280humidity = "
|
|
13
|
+
bme280pressure = "bmepressure",
|
|
14
|
+
bme280humidity = "bmehumidity",
|
|
15
15
|
currentLoop = "currentloooppyro",
|
|
16
16
|
mcuTemp = "mcutemp",
|
|
17
17
|
drivers = "drivers",
|
|
@@ -42,7 +42,9 @@ export declare enum TemperatureError {
|
|
|
42
42
|
export declare class AnalogSensor extends ModelObject {
|
|
43
43
|
beta: number | null;
|
|
44
44
|
c: number | null;
|
|
45
|
+
highReading: number | null;
|
|
45
46
|
lastReading: number | null;
|
|
47
|
+
lowReading: number | null;
|
|
46
48
|
name: string | null;
|
|
47
49
|
offsetAdj: number;
|
|
48
50
|
port: string | null;
|
|
@@ -14,8 +14,8 @@ var AnalogSensorType;
|
|
|
14
14
|
AnalogSensorType["dht22"] = "dht22";
|
|
15
15
|
AnalogSensorType["dhtHumidity"] = "dhthumidity";
|
|
16
16
|
AnalogSensorType["bme280"] = "bme280";
|
|
17
|
-
AnalogSensorType["bme280pressure"] = "
|
|
18
|
-
AnalogSensorType["bme280humidity"] = "
|
|
17
|
+
AnalogSensorType["bme280pressure"] = "bmepressure";
|
|
18
|
+
AnalogSensorType["bme280humidity"] = "bmehumidity";
|
|
19
19
|
AnalogSensorType["currentLoop"] = "currentloooppyro";
|
|
20
20
|
AnalogSensorType["mcuTemp"] = "mcutemp";
|
|
21
21
|
AnalogSensorType["drivers"] = "drivers";
|
|
@@ -49,7 +49,9 @@ class AnalogSensor extends ModelObject_1.default {
|
|
|
49
49
|
super(...arguments);
|
|
50
50
|
this.beta = null;
|
|
51
51
|
this.c = null;
|
|
52
|
+
this.highReading = null;
|
|
52
53
|
this.lastReading = null;
|
|
54
|
+
this.lowReading = null;
|
|
53
55
|
this.name = null;
|
|
54
56
|
this.offsetAdj = 0;
|
|
55
57
|
this.port = null;
|