iobroker.tibberlink 3.4.1 → 3.4.3
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/README.md +16 -0
- package/build/lib/tibberHelper.js +50 -35
- package/build/lib/tibberHelper.js.map +1 -1
- package/build/lib/tibberLocal.js +99 -36
- package/build/lib/tibberLocal.js.map +1 -1
- package/io-package.json +27 -27
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -107,6 +107,22 @@ If you enjoyed this project — or just feeling generous, consider buying me a b
|
|
|
107
107
|
|
|
108
108
|
! Note that missing version entries are typically dependency updates for improved security.
|
|
109
109
|
|
|
110
|
+
### 3.4.3 (2024-07-14)
|
|
111
|
+
|
|
112
|
+
- (HombachC) added unit to Pulse temperature and round to 0,1°C
|
|
113
|
+
- (HombachC) added unit to Pulse battery voltage and round to 100mV
|
|
114
|
+
- (HombachC) added unit to Pulse uptime
|
|
115
|
+
- (HombachC) added state with Pulse uptime as human readable string
|
|
116
|
+
- (HombachC) reinitialize some TibberLocal states upon adapter startup
|
|
117
|
+
- (HombachC) code optimisation
|
|
118
|
+
- (HombachC) bump dependencies
|
|
119
|
+
|
|
120
|
+
### 3.4.2 (2024-07-13)
|
|
121
|
+
|
|
122
|
+
- (HombachC) fix typos in units
|
|
123
|
+
- (HombachC) fix type mismatch for state objects (#455)
|
|
124
|
+
- (HombachC) code optimisation
|
|
125
|
+
|
|
110
126
|
### 3.4.1 (2024-07-13)
|
|
111
127
|
|
|
112
128
|
- (HombachC) fix logging error
|
|
@@ -136,23 +136,34 @@ class TibberHelper {
|
|
|
136
136
|
* @param description - Optional description for the state (default is "-").
|
|
137
137
|
* @param writeable - Optional boolean indicating if the state should be writeable (default is false).
|
|
138
138
|
* @param dontUpdate - Optional boolean indicating if the state should not be updated if it already exists (default is false).
|
|
139
|
+
* @param forceMode - Optional boolean indicating if the state should be reinitiated if it already exists (default is false).
|
|
139
140
|
* @returns A Promise that resolves when the state is checked, created (if necessary), and updated.
|
|
140
141
|
*/
|
|
141
|
-
async checkAndSetValue(stateName, value, description = "-", writeable = false, dontUpdate = false) {
|
|
142
|
+
async checkAndSetValue(stateName, value, description = "-", writeable = false, dontUpdate = false, forceMode = false) {
|
|
142
143
|
if (value != undefined) {
|
|
143
144
|
if (value.trim().length > 0) {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
145
|
+
const commonObj = {
|
|
146
|
+
name: stateName.key,
|
|
147
|
+
type: "string",
|
|
148
|
+
role: "text",
|
|
149
|
+
desc: description,
|
|
150
|
+
read: true,
|
|
151
|
+
write: writeable,
|
|
152
|
+
};
|
|
153
|
+
if (!forceMode) {
|
|
154
|
+
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
155
|
+
type: "state",
|
|
156
|
+
common: commonObj,
|
|
157
|
+
native: {},
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
await this.adapter.setObjectAsync(stateName.value, {
|
|
162
|
+
type: "state",
|
|
163
|
+
common: commonObj,
|
|
164
|
+
native: {},
|
|
165
|
+
});
|
|
166
|
+
}
|
|
156
167
|
if (!dontUpdate || (await this.adapter.getStateAsync(stateName.value)) === null) {
|
|
157
168
|
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
158
169
|
}
|
|
@@ -168,9 +179,10 @@ class TibberHelper {
|
|
|
168
179
|
* @param unit - Optional unit string to set for the state (default is undefined).
|
|
169
180
|
* @param writeable - Optional boolean indicating if the state should be writeable (default is false).
|
|
170
181
|
* @param dontUpdate - Optional boolean indicating if the state should not be updated if it already exists (default is false).
|
|
182
|
+
* @param forceMode - Optional boolean indicating if the state should be reinitiated if it already exists (default is false).
|
|
171
183
|
* @returns A Promise that resolves when the state is checked, created (if necessary), and updated.
|
|
172
184
|
*/
|
|
173
|
-
async checkAndSetValueNumber(stateName, value, description = "-", unit, writeable = false, dontUpdate = false) {
|
|
185
|
+
async checkAndSetValueNumber(stateName, value, description = "-", unit, writeable = false, dontUpdate = false, forceMode = false) {
|
|
174
186
|
if (value || value === 0) {
|
|
175
187
|
const commonObj = {
|
|
176
188
|
name: stateName.key,
|
|
@@ -184,11 +196,20 @@ class TibberHelper {
|
|
|
184
196
|
if (unit !== null && unit !== undefined) {
|
|
185
197
|
commonObj.unit = unit;
|
|
186
198
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
199
|
+
if (!forceMode) {
|
|
200
|
+
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
201
|
+
type: "state",
|
|
202
|
+
common: commonObj,
|
|
203
|
+
native: {},
|
|
204
|
+
});
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
await this.adapter.setObjectAsync(stateName.value, {
|
|
208
|
+
type: "state",
|
|
209
|
+
common: commonObj,
|
|
210
|
+
native: {},
|
|
211
|
+
});
|
|
212
|
+
}
|
|
192
213
|
if (!dontUpdate || (await this.adapter.getStateAsync(stateName.value)) === null) {
|
|
193
214
|
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
194
215
|
}
|
|
@@ -206,31 +227,25 @@ class TibberHelper {
|
|
|
206
227
|
*/
|
|
207
228
|
async checkAndSetValueBoolean(stateName, value, description = "-", writeable = false, dontUpdate = false) {
|
|
208
229
|
if (value !== undefined && value !== null) {
|
|
230
|
+
const commonObj = {
|
|
231
|
+
name: stateName.key,
|
|
232
|
+
type: "boolean",
|
|
233
|
+
role: "indicator",
|
|
234
|
+
desc: description,
|
|
235
|
+
read: true,
|
|
236
|
+
write: writeable,
|
|
237
|
+
};
|
|
209
238
|
if (stateName.value.split(".").pop() === stateName.key) {
|
|
210
239
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
211
240
|
type: "state",
|
|
212
|
-
common:
|
|
213
|
-
name: stateName.key,
|
|
214
|
-
type: "boolean",
|
|
215
|
-
role: "indicator",
|
|
216
|
-
desc: description,
|
|
217
|
-
read: true,
|
|
218
|
-
write: writeable,
|
|
219
|
-
},
|
|
241
|
+
common: commonObj,
|
|
220
242
|
native: {},
|
|
221
243
|
});
|
|
222
244
|
}
|
|
223
245
|
else {
|
|
224
246
|
await this.adapter.setObjectAsync(stateName.value, {
|
|
225
247
|
type: "state",
|
|
226
|
-
common:
|
|
227
|
-
name: stateName.key,
|
|
228
|
-
type: "boolean",
|
|
229
|
-
role: "indicator",
|
|
230
|
-
desc: description,
|
|
231
|
-
read: true,
|
|
232
|
-
write: writeable,
|
|
233
|
-
},
|
|
248
|
+
common: commonObj,
|
|
234
249
|
native: {},
|
|
235
250
|
});
|
|
236
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tibberLocal.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TibberLocal = void 0;
|
|
7
7
|
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const date_fns_1 = require("date-fns");
|
|
8
9
|
const tibberHelper_1 = require("./tibberHelper");
|
|
9
10
|
class TibberLocal extends tibberHelper_1.TibberHelper {
|
|
10
11
|
constructor(adapter) {
|
|
@@ -49,6 +50,16 @@ class TibberLocal extends tibberHelper_1.TibberHelper {
|
|
|
49
50
|
this.adapter.config.PulseList[pulse].puName = `Pulse Local`;
|
|
50
51
|
}
|
|
51
52
|
if (!this.TestMode) {
|
|
53
|
+
// run first time
|
|
54
|
+
this.getPulseData(pulse)
|
|
55
|
+
.then((response) => {
|
|
56
|
+
this.adapter.log.debug(`Got Bridge metrics data for the first time: ${JSON.stringify(response)}`);
|
|
57
|
+
this.fetchPulseInfo(pulse, response, "", true);
|
|
58
|
+
})
|
|
59
|
+
.catch((e) => {
|
|
60
|
+
this.adapter.log.error(`Error polling and parsing Tibber Bridge metrics data for the first time: ${e}`);
|
|
61
|
+
});
|
|
62
|
+
// setup metrics job
|
|
52
63
|
const jobBridgeMetrics = setInterval(() => {
|
|
53
64
|
this.getPulseData(pulse)
|
|
54
65
|
.then((response) => {
|
|
@@ -61,6 +72,8 @@ class TibberLocal extends tibberHelper_1.TibberHelper {
|
|
|
61
72
|
}, this.MetricsDataInterval);
|
|
62
73
|
if (jobBridgeMetrics)
|
|
63
74
|
this.intervalList.push(jobBridgeMetrics);
|
|
75
|
+
//
|
|
76
|
+
// setup data job
|
|
64
77
|
const jobPulseLocal = setInterval(() => {
|
|
65
78
|
// poll data and log as HEX string
|
|
66
79
|
this.getDataAsHexString(pulse)
|
|
@@ -75,6 +88,7 @@ class TibberLocal extends tibberHelper_1.TibberHelper {
|
|
|
75
88
|
}, this.RawDataInterval);
|
|
76
89
|
if (jobPulseLocal)
|
|
77
90
|
this.intervalList.push(jobPulseLocal);
|
|
91
|
+
//
|
|
78
92
|
}
|
|
79
93
|
else {
|
|
80
94
|
const parsedMessages = this.extractAndParseSMLMessages(99, this.TestData);
|
|
@@ -155,23 +169,79 @@ class TibberLocal extends tibberHelper_1.TibberHelper {
|
|
|
155
169
|
}
|
|
156
170
|
*/
|
|
157
171
|
}
|
|
158
|
-
fetchPulseInfo(pulse, obj, prefix = "") {
|
|
172
|
+
fetchPulseInfo(pulse, obj, prefix = "", firstTime = false) {
|
|
159
173
|
if (!obj || typeof obj !== "object") {
|
|
160
174
|
this.adapter.log.warn(`Got bad Pulse info data to fetch!: ${obj}`); //
|
|
161
175
|
return;
|
|
162
176
|
}
|
|
163
177
|
for (const key in obj) {
|
|
164
178
|
if (typeof obj[key] === "object") {
|
|
165
|
-
this.fetchPulseInfo(pulse, obj[key], `${prefix}${key}
|
|
179
|
+
this.fetchPulseInfo(pulse, obj[key], `${prefix}${key}.`, firstTime);
|
|
166
180
|
}
|
|
167
181
|
else {
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
182
|
+
switch (key) {
|
|
183
|
+
case "timestamp":
|
|
184
|
+
const TimeValue = this.isValidUnixTimestampAndConvert(obj[key]);
|
|
185
|
+
if (TimeValue) {
|
|
186
|
+
obj[key] = TimeValue;
|
|
187
|
+
this.checkAndSetValue(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], this.adapter.config.PulseList[pulse].puName, false, false, firstTime);
|
|
188
|
+
}
|
|
189
|
+
break;
|
|
190
|
+
case "node_temperature":
|
|
191
|
+
if (typeof obj[key] === "number") {
|
|
192
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), Math.round(obj[key] * 10) / 10, `Temperature of this Tibber Pulse unit`, "°C", false, false, firstTime);
|
|
193
|
+
}
|
|
194
|
+
break;
|
|
195
|
+
case "meter_mode":
|
|
196
|
+
if (typeof obj[key] === "number") {
|
|
197
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), Math.round(obj[key] * 10) / 10, `Mode of your Pulse to grid-meter communication`, "", false, false, firstTime);
|
|
198
|
+
if (obj[key] !== 3)
|
|
199
|
+
this.adapter.log.warn(`Potential problems with Pulse meter mode ${obj[key]}`);
|
|
200
|
+
}
|
|
201
|
+
break;
|
|
202
|
+
case "node_battery_voltage":
|
|
203
|
+
if (typeof obj[key] === "number") {
|
|
204
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), Math.round(obj[key] * 100) / 100, `Temperature of this Tibber Pulse unit`, "V", false, false, firstTime);
|
|
205
|
+
}
|
|
206
|
+
break;
|
|
207
|
+
case "node_uptime_ms":
|
|
208
|
+
if (typeof obj[key] === "number") {
|
|
209
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], `Uptime of your Tibber Pulse in ms`, "ms", false, false, firstTime);
|
|
210
|
+
function formatMilliseconds(ms) {
|
|
211
|
+
const duration = (0, date_fns_1.intervalToDuration)({ start: 0, end: ms });
|
|
212
|
+
const formattedDuration = (0, date_fns_1.formatDuration)(duration, { format: ["months", "days", "hours", "minutes", "seconds"] });
|
|
213
|
+
// Output: "229 days 3 hours 17 minutes 2 seconds"
|
|
214
|
+
// view only first 3 blocks
|
|
215
|
+
const parts = formattedDuration.split(" ");
|
|
216
|
+
return parts.slice(0, 6).join(" "); // slice(0, 4) um die ersten zwei Blöcke (jeweils Einheit und Wert) zu erhalten
|
|
217
|
+
// Output: "229 days 3 hours 17 minutes"
|
|
218
|
+
}
|
|
219
|
+
this.checkAndSetValue(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}node_uptime`), formatMilliseconds(obj[key]), `Uptime of your Tibber Pulse`, false, false, firstTime);
|
|
220
|
+
}
|
|
221
|
+
break;
|
|
222
|
+
case "time_in_em0_ms":
|
|
223
|
+
if (typeof obj[key] === "number") {
|
|
224
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], this.adapter.config.PulseList[pulse].puName, "ms", false, false, firstTime);
|
|
225
|
+
}
|
|
226
|
+
break;
|
|
227
|
+
case "time_in_em1_ms":
|
|
228
|
+
if (typeof obj[key] === "number") {
|
|
229
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], this.adapter.config.PulseList[pulse].puName, "ms", false, false, firstTime);
|
|
230
|
+
}
|
|
231
|
+
break;
|
|
232
|
+
case "time_in_em2_ms":
|
|
233
|
+
if (typeof obj[key] === "number") {
|
|
234
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], this.adapter.config.PulseList[pulse].puName, "ms", false, false, firstTime);
|
|
235
|
+
}
|
|
236
|
+
break;
|
|
237
|
+
default:
|
|
238
|
+
if (typeof obj[key] === "string") {
|
|
239
|
+
this.checkAndSetValue(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], this.adapter.config.PulseList[pulse].puName, false, false, firstTime);
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], this.adapter.config.PulseList[pulse].puName, "", false, false, firstTime);
|
|
243
|
+
}
|
|
173
244
|
}
|
|
174
|
-
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, `PulseInfo.${prefix}${key}`), obj[key], this.adapter.config.PulseList[pulse].puName);
|
|
175
245
|
}
|
|
176
246
|
}
|
|
177
247
|
}
|
|
@@ -197,7 +267,6 @@ class TibberLocal extends tibberHelper_1.TibberHelper {
|
|
|
197
267
|
}
|
|
198
268
|
}
|
|
199
269
|
async extractAndParseSMLMessages(pulse, transfer) {
|
|
200
|
-
//const messages = transfer.matchAll(/7707(0100[0-9a-fA-F].{5}?ff)(?:.{6}|.{14}|.{20}|.{26})([0-9a-fA-F]{2})52([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{4,16})01(?=(7)|(0101)|(\n))/g);
|
|
201
270
|
const messages = transfer.matchAll(/7707(0100[0-9a-fA-F].{5}?ff).{4,28}62([0-9a-fA-F]{2})52([0-9a-fA-F]{2})([0-9a-fA-F]{2})((?:[0-9a-fA-F]{2}|[0-9a-fA-F]{4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8}|[0-9a-fA-F]{10}|[0-9a-fA-F]{8}|[0-9a-fA-F]{16}))01(?=(77)|(0101)|(\n))/g);
|
|
202
271
|
const output = [];
|
|
203
272
|
for (const match of messages) {
|
|
@@ -241,10 +310,10 @@ class TibberLocal extends tibberHelper_1.TibberHelper {
|
|
|
241
310
|
this.checkAndSetValueNumber(this.getStatePrefixLocal(pulse, result.name), result.value, this.adapter.config.PulseList[pulse].puName, result.unit);
|
|
242
311
|
this.adapter.log.debug(JSON.stringify(result));
|
|
243
312
|
const formattedMatch = match[0].replace(/(..)/g, "$1 ").trim();
|
|
244
|
-
output.push(getCurrentTimeFormatted()
|
|
313
|
+
output.push(`${getCurrentTimeFormatted()}: ${formattedMatch}\n`);
|
|
245
314
|
}
|
|
246
315
|
if (output.length > 0)
|
|
247
|
-
this.adapter.log.debug(`Format for https://tasmota-sml-parser.dicp.net:\n ${output.join("")}`);
|
|
316
|
+
this.adapter.log.debug(`Format for https://tasmota-sml-parser.dicp.net :\n ${output.join("")}`);
|
|
248
317
|
}
|
|
249
318
|
isValidUnixTimestampAndConvert(n) {
|
|
250
319
|
// Typüberprüfung und Bereichsüberprüfung (optional)
|
|
@@ -295,26 +364,20 @@ function parseSignedHex(hexStr) {
|
|
|
295
364
|
}
|
|
296
365
|
function getCurrentTimeFormatted() {
|
|
297
366
|
const now = new Date();
|
|
298
|
-
return (
|
|
299
|
-
":" +
|
|
300
|
-
now.getMinutes().toString().padStart(2, "0") +
|
|
301
|
-
":" +
|
|
302
|
-
now.getSeconds().toString().padStart(2, "0") +
|
|
303
|
-
"." +
|
|
304
|
-
now.getMilliseconds().toString().padStart(3, "0"));
|
|
367
|
+
return (0, date_fns_1.format)(now, "HH:mm:ss.SSS");
|
|
305
368
|
}
|
|
306
369
|
function findDlmsUnitByCode(decimalCode) {
|
|
307
370
|
/* Static lookup table */
|
|
308
371
|
const dlmsUnits = [
|
|
309
|
-
{ code: 0x1, unit: "a", quantity: "time", unitName: "year", siDefinition: "
|
|
310
|
-
{ code: 0x2, unit: "mo", quantity: "time", unitName: "month", siDefinition: "
|
|
372
|
+
{ code: 0x1, unit: "a", quantity: "time", unitName: "year", siDefinition: "365.25*24*60*60 s" },
|
|
373
|
+
{ code: 0x2, unit: "mo", quantity: "time", unitName: "month", siDefinition: "30.44*24*60*60 s" },
|
|
311
374
|
{ code: 0x3, unit: "wk", quantity: "time", unitName: "week", siDefinition: "7*24*60*60 s" },
|
|
312
375
|
{ code: 0x4, unit: "d", quantity: "time", unitName: "day", siDefinition: "24*60*60 s" },
|
|
313
376
|
{ code: 0x5, unit: "h", quantity: "time", unitName: "hour", siDefinition: "60*60 s" },
|
|
314
|
-
{ code: 0x6, unit: "min
|
|
377
|
+
{ code: 0x6, unit: "min", quantity: "time", unitName: "minute", siDefinition: "60 s" },
|
|
315
378
|
{ code: 0x7, unit: "s", quantity: "time", unitName: "second", siDefinition: "s" },
|
|
316
|
-
{ code: 0x8, unit: "
|
|
317
|
-
{ code: 0x9, unit: "
|
|
379
|
+
{ code: 0x8, unit: "°", quantity: "phase angle", unitName: "degree", siDefinition: "rad*180/π" },
|
|
380
|
+
{ code: 0x9, unit: "°C", quantity: "temperature", unitName: "degree celsius", siDefinition: "K-273.15" },
|
|
318
381
|
{ code: 0xa, unit: "currency", quantity: "local currency", unitName: "", siDefinition: "" },
|
|
319
382
|
{ code: 0xb, unit: "m", quantity: "length", unitName: "metre", siDefinition: "m" },
|
|
320
383
|
{ code: 0xc, unit: "m/s", quantity: "speed", unitName: "metre per second", siDefinition: "m/s" },
|
|
@@ -324,12 +387,12 @@ function findDlmsUnitByCode(decimalCode) {
|
|
|
324
387
|
{ code: 0x10, unit: "m³/h", quantity: "corrected volume flux", unitName: "cubic metre per hour", siDefinition: "m³/(60*60s)" },
|
|
325
388
|
{ code: 0x11, unit: "m³/d", quantity: "volume flux", unitName: "cubic metre per day", siDefinition: "m³/(24*60*60s)" },
|
|
326
389
|
{ code: 0x12, unit: "m³/d", quantity: "corrected volume flux", unitName: "cubic metre per day", siDefinition: "m³/(24*60*60s)" },
|
|
327
|
-
{ code: 0x13, unit: "l", quantity: "volume", unitName: "
|
|
328
|
-
{ code: 0x14, unit: "kg", quantity: "mass", unitName: "kilogram", siDefinition: "" },
|
|
329
|
-
{ code: 0x15, unit: "N", quantity: "force", unitName: "newton", siDefinition: "" },
|
|
390
|
+
{ code: 0x13, unit: "l", quantity: "volume", unitName: "liter", siDefinition: "10^-3 m³" },
|
|
391
|
+
{ code: 0x14, unit: "kg", quantity: "mass", unitName: "kilogram", siDefinition: "kg" },
|
|
392
|
+
{ code: 0x15, unit: "N", quantity: "force", unitName: "newton", siDefinition: "N" },
|
|
330
393
|
{ code: 0x16, unit: "Nm", quantity: "energy", unitName: "newtonmeter", siDefinition: "J = Nm = Ws" },
|
|
331
394
|
{ code: 0x17, unit: "Pa", quantity: "pressure", unitName: "pascal", siDefinition: "N/m²" },
|
|
332
|
-
{ code: 0x18, unit: "bar", quantity: "pressure", unitName: "bar", siDefinition: "10
|
|
395
|
+
{ code: 0x18, unit: "bar", quantity: "pressure", unitName: "bar", siDefinition: "10^5 N/m²" },
|
|
333
396
|
{ code: 0x19, unit: "J", quantity: "energy", unitName: "joule", siDefinition: "J = Nm = Ws" },
|
|
334
397
|
{ code: 0x1a, unit: "J/h", quantity: "thermal power", unitName: "joule per hour", siDefinition: "J/(60*60s)" },
|
|
335
398
|
{ code: 0x1b, unit: "W", quantity: "active power", unitName: "watt", siDefinition: "W = J/s" },
|
|
@@ -343,30 +406,30 @@ function findDlmsUnitByCode(decimalCode) {
|
|
|
343
406
|
{ code: 0x23, unit: "V", quantity: "voltage", unitName: "volt", siDefinition: "V" },
|
|
344
407
|
{ code: 0x24, unit: "V/m", quantity: "electric field strength", unitName: "volt per metre", siDefinition: "" },
|
|
345
408
|
{ code: 0x25, unit: "F", quantity: "capacitance", unitName: "farad", siDefinition: "C/V = As/V" },
|
|
346
|
-
{ code: 0x26, unit: "
|
|
347
|
-
{ code: 0x27, unit: "
|
|
409
|
+
{ code: 0x26, unit: "Ω", quantity: "resistance", unitName: "ohm", siDefinition: "Ω = V/A" },
|
|
410
|
+
{ code: 0x27, unit: "Ωm²/m", quantity: "resistivity", unitName: "Ωm", siDefinition: "" },
|
|
348
411
|
{ code: 0x28, unit: "Wb", quantity: "magnetic flux", unitName: "weber", siDefinition: "Wb = Vs" },
|
|
349
|
-
{ code: 0x29, unit: "T", quantity: "magnetic flux density", unitName: "tesla", siDefinition: "Wb/
|
|
412
|
+
{ code: 0x29, unit: "T", quantity: "magnetic flux density", unitName: "tesla", siDefinition: "Wb/m²" },
|
|
350
413
|
{ code: 0x2a, unit: "A/m", quantity: "magnetic field strength", unitName: "ampere per metre", siDefinition: "A/m" },
|
|
351
414
|
{ code: 0x2b, unit: "H", quantity: "inductance", unitName: "henry", siDefinition: "H = Wb/A" },
|
|
352
415
|
{ code: 0x2c, unit: "Hz", quantity: "frequency", unitName: "hertz", siDefinition: "1/s" },
|
|
353
416
|
{ code: 0x2d, unit: "1/(Wh)", quantity: "R_W", unitName: "Active energy meter constant or pulse value", siDefinition: "" },
|
|
354
417
|
{ code: 0x2e, unit: "1/(varh)", quantity: "R_B", unitName: "reactive energy meter constant or pulse value", siDefinition: "" },
|
|
355
418
|
{ code: 0x2f, unit: "1/(VAh)", quantity: "R_S", unitName: "apparent energy meter constant or pulse value", siDefinition: "" },
|
|
356
|
-
{ code: 0x30, unit: "V²h", quantity: "volt-squared hour", unitName: "volt-
|
|
357
|
-
{ code: 0x31, unit: "A²h", quantity: "ampere-squared hour", unitName: "ampere-
|
|
419
|
+
{ code: 0x30, unit: "V²h", quantity: "volt-squared hour", unitName: "volt-squared hour", siDefinition: "V²*(60*60s)" },
|
|
420
|
+
{ code: 0x31, unit: "A²h", quantity: "ampere-squared hour", unitName: "ampere-squared hour", siDefinition: "A²*(60*60s)" },
|
|
358
421
|
{ code: 0x32, unit: "kg/s", quantity: "mass flux", unitName: "kilogram per second", siDefinition: "kg/s" },
|
|
359
|
-
{ code: 0x33, unit: "S, mho", quantity: "conductance siemens", unitName: "siemens", siDefinition: "1
|
|
360
|
-
{ code: 0x34, unit: "K", quantity: "temperature", unitName: "kelvin", siDefinition: "" },
|
|
422
|
+
{ code: 0x33, unit: "S, mho", quantity: "conductance siemens", unitName: "siemens", siDefinition: "1/Ω" },
|
|
423
|
+
{ code: 0x34, unit: "K", quantity: "temperature", unitName: "kelvin", siDefinition: "K" },
|
|
361
424
|
{ code: 0x35, unit: "1/(V²h)", quantity: "", unitName: "Volt-squared hour meter constant or pulse value", siDefinition: "" },
|
|
362
425
|
{ code: 0x36, unit: "1/(A²h)", quantity: "", unitName: "Ampere-squared hour meter constant or pulse value", siDefinition: "" },
|
|
363
426
|
{ code: 0x37, unit: "1/m³", quantity: "R_V", unitName: "meter constant or pulse value (volume)", siDefinition: "" },
|
|
364
427
|
{ code: 0x38, unit: "%", quantity: "percentage", unitName: "%", siDefinition: "" },
|
|
365
428
|
{ code: 0x39, unit: "Ah", quantity: "ampere-hours", unitName: "ampere-hour", siDefinition: "" },
|
|
366
|
-
{ code: 0x3c, unit: "Wh/m³", quantity: "energy per volume", unitName: "", siDefinition: "3
|
|
429
|
+
{ code: 0x3c, unit: "Wh/m³", quantity: "energy per volume", unitName: "", siDefinition: "3.6*10^3 J/m³" },
|
|
367
430
|
{ code: 0x3d, unit: "J/m³", quantity: "calorific value, wobbe", unitName: "", siDefinition: "" },
|
|
368
431
|
{ code: 0x3e, unit: "Mol %", quantity: "molar fraction of", unitName: "mole percent", siDefinition: "Basic gas composition unit" },
|
|
369
|
-
{ code: 0x3f, unit: "Wh/m³", quantity: "energy per volume", unitName: "", siDefinition: "3
|
|
432
|
+
{ code: 0x3f, unit: "Wh/m³", quantity: "energy per volume", unitName: "", siDefinition: "3.6*10^3 J/m³" },
|
|
370
433
|
{ code: 0x40, unit: "(reserved)", quantity: "", unitName: "", siDefinition: "" },
|
|
371
434
|
{ code: 0x41, unit: "(other)", quantity: "", unitName: "", siDefinition: "" },
|
|
372
435
|
{ code: 0x42, unit: "(unitless)", quantity: "no unit, unitless, count", unitName: "", siDefinition: "" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberLocal.js","sourceRoot":"","sources":["../../src/lib/tibberLocal.ts"],"names":[],"mappings":";;;;;;AACA,kDAAiE;AACjE,iDAA8C;AAE9C,MAAa,WAAY,SAAQ,2BAAY;IAmC5C,YAAY,OAA8B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;QAlChB,aAAQ,GAAW,EAAE,CAAC;QACtB,aAAQ,GAAY,KAAK,CAAC;QAC1B,wBAAmB,GAAW,KAAK,CAAC;QACpC,oBAAe,GAAW,IAAI,CAAC;QAC/B,mDAAmD;QACnD,uBAAkB,GAAG;YACpB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE;YACvC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE;YACxD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;YAC9C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,sBAAsB,EAAE;YACtD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,sBAAsB,EAAE;YACtD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;YAC9C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,sBAAsB,EAAE;YACtD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,sBAAsB,EAAE;YACtD,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,oBAAoB,EAAE;YACzD,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,oBAAoB,EAAE;YACzD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE;YAC1C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE;YAC1C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE;YAC1C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;YAC9C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;YAC9C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;YAC9C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE;YAC5C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE;YAC5C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE;YAC5C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,EAAE;YAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,iCAAiC,EAAE;YACjE,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,iCAAiC,EAAE;YACjE,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,sCAAsC,EAAE;YACtE,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,sCAAsC,EAAE;YACtE,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,sCAAsC,EAAE;SACtE,CAAC;QAID,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAAa;QACrC,IAAI;YACH,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,aAAa,CAAC;aAC5D;YACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnB,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;oBACzC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;yBACtB,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;wBAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;wBAC/E,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;oBACtC,CAAC,CAAC;yBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;wBACZ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,yDAAyD,CAAC,EAAE,CAAC,CAAC;oBACtF,CAAC,CAAC,CAAC;gBACL,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBAC7B,IAAI,gBAAgB;oBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAE/D,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;oBACtC,kCAAkC;oBAClC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;yBAC5B,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;wBACnB,IAAI,CAAC,0BAA0B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;wBAClD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC,CAAC,yBAAyB;wBAChG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;oBAC9H,CAAC,CAAC;yBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;wBACZ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,iDAAiD,CAAC,EAAE,CAAC,CAAC;oBAC7E,CAAC,CAAC,CAAC;gBACL,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;gBACzB,IAAI,aAAa;oBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACzD;iBAAM;gBACN,MAAM,cAAc,GAAG,IAAI,CAAC,0BAA0B,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC1E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;aAC1E;SACD;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAoC,CAAC,CAAC,CAAC;SAC9F;IACF,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,IAAI;YACH,4DAA4D;YAC5D,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE;gBAC5C,aAAa,CAAC,WAAW,CAAC,CAAC;aAC3B;SACD;QAAC,OAAO,CAAC,EAAE;YACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC;SAC5C;IACF,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,KAAa;QACvC,MAAM,IAAI,GAAG,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7H,MAAM,OAAO,GAAG;YACf,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,eAAe;YAC9D,IAAI,EAAE,yBAAyB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,sBAAsB,EAAE;YAC5F,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,aAAa,EAAE,IAAI;gBACnB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,eAAe;gBAC1D,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,eAAe;aAC7B;SACD,CAAC;QACF,IAAI;YACH,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC;gBACpC,GAAG,EAAE,OAAO,CAAC,IAAI;gBACjB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,UAAU,OAAO,CAAC,QAAQ,EAAE;gBACrC,OAAO,EAAE,OAAO,CAAC,OAAO;aACxB,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,IAAI,EAAE;gBAClB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;aACrF;YACD,OAAO,QAAQ,CAAC,IAAI,CAAC;SACrB;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC/E,MAAM,KAAK,CAAC;SACZ;QACD;;;;;;;;;;;;;;;;;;;;;;;;;;;UA2BE;IACH,CAAC;IAEO,cAAc,CAAC,KAAa,EAAE,GAAQ,EAAE,SAAiB,EAAE;QAClE,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACpC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,sCAAsC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE;YACtE,OAAO;SACP;QACD,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACtB,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;gBACjC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC;aACzD;iBAAM;gBACN,qCAAqC;gBACrC,IAAI,GAAG,KAAK,WAAW,EAAE;oBACxB,MAAM,SAAS,GAAG,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;oBAChE,IAAI,SAAS;wBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;iBACpC;gBACD,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,aAAa,MAAM,GAAG,GAAG,EAAE,CAAC,EAC5D,GAAG,CAAC,GAAG,CAAC,EACR,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAC3C,CAAC;aACF;SACD;IACF,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,KAAa;QAC7C,MAAM,IAAI,GAAG,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7H,MAAM,OAAO,GAAuB;YACnC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,UAAU,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,eAAe,sBAAsB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,sBAAsB,EAAE;YACtJ,OAAO,EAAE;gBACR,aAAa,EAAE,IAAI;aACnB;YACD,YAAY,EAAE,aAAa,EAAE,wCAAwC;SACrE,CAAC;QAEF,IAAI;YACH,MAAM,QAAQ,GAA+B,MAAM,IAAA,eAAK,EAAC,OAAO,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzC,OAAO,SAAS,CAAC;SACjB;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC;YAChG,MAAM,KAAK,CAAC;SACZ;IACF,CAAC;IACO,KAAK,CAAC,0BAA0B,CAAC,KAAa,EAAE,QAAgB;QAMvE,0LAA0L;QAC1L,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CACjC,gOAAgO,CAChO,CAAC;QACF,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;YAC7B,MAAM,MAAM,GAAc,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1D,8FAA8F;YAC9F,+FAA+F;YAC/F,+FAA+F;YAC/F,+FAA+F;YAC/F,+FAA+F;YAE/F,MAAM,CAAC,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAClE,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE9C,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE;gBACnC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;aACjC;iBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE;gBAC1C,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC;aAClC;YACD;;;;;;;;;;;;cAYW;YACX,IAAI,MAAM,CAAC,KAAK,GAAG,UAAU,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,UAAU,EAAE;gBAC5D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBACpE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC1D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,QAAQ,EAAE,CAAC,CAAC;gBAC3C,SAAS;aACT;YACD,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAClJ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/C,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,KAAK,GAAG,cAAc,GAAG,IAAI,CAAC,CAAC;SACvE;QACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,qDAAqD,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACvH,CAAC;IAEO,8BAA8B,CAAC,CAAS;QAC/C,oDAAoD;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAClD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;YAC9E,OAAO,KAAK,CAAC;SACb;QACD,sCAAsC;QACtC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;CACD;AAtQD,kCAsQC;AAED,SAAS,cAAc,CAAC,MAAc;IACrC,IAAI,GAAG,GAAG,MAAM,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACpC,IAAI,SAAS,IAAI,CAAC,EAAE;QACnB,4BAA4B;QAC5B,IAAI,GAAG,GAAG,GAAG;YAAE,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;KAChC;SAAM,IAAI,SAAS,IAAI,CAAC,EAAE;QAC1B,4BAA4B;QAC5B,IAAI,GAAG,GAAG,IAAI;YAAE,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;KACnC;SAAM,IAAI,SAAS,IAAI,EAAE,EAAE;QAC3B,6BAA6B;QAC7B,IAAI,GAAG,GAAG,MAAM;YAAE,GAAG,GAAG,GAAG,GAAG,QAAQ,CAAC;KACvC;SAAM,IAAI,SAAS,IAAI,EAAE,EAAE;QAC3B,6BAA6B;QAC7B,IAAI,GAAG,GAAG,QAAQ;YAAE,GAAG,GAAG,GAAG,GAAG,UAAU,CAAC;KAC3C;SAAM,IAAI,SAAS,IAAI,EAAE,EAAE;QAC3B,6BAA6B;QAC7B,IAAI,GAAG,GAAG,UAAU;YAAE,GAAG,GAAG,GAAG,GAAG,YAAY,CAAC;KAC/C;SAAM;QACN,6BAA6B;QAC7B,IAAI,GAAG,GAAG,mBAAmB;YAAE,GAAG,GAAG,GAAG,GAAG,oBAAoB,CAAC;KAChE;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,uBAAuB;IAC/B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO,CACN,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAC1C,GAAG;QACH,GAAG,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5C,GAAG;QACH,GAAG,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5C,GAAG;QACH,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CACjD,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB;IAC9C,yBAAyB;IACzB,MAAM,SAAS,GAAG;QACjB,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE;QAC7F,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE;QAC7F,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE;QAC3F,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE;QACvF,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE;QACrF,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE;QACpF,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE;QACjF,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE;QAClG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE;QACzG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QAC3F,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE;QAClF,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,KAAK,EAAE;QAChG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,IAAI,EAAE;QAC1F,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,IAAI,EAAE;QACpG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,sBAAsB,EAAE,YAAY,EAAE,aAAa,EAAE;QACnH,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,YAAY,EAAE,aAAa,EAAE;QAC9H,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,qBAAqB,EAAE,YAAY,EAAE,gBAAgB,EAAE;QACtH,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,QAAQ,EAAE,qBAAqB,EAAE,YAAY,EAAE,gBAAgB,EAAE;QAChI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE;QACzF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE;QACpF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;QAClF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE;QACpG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE;QAC1F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE;QAC9F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE;QAC7F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAE;QAC9G,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE;QAC9F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;QACjG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;QAC1F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE;QACxG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,aAAa,EAAE;QACnH,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE;QAC7G,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE;QACrF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE;QACrG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE;QACnF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,YAAY,EAAE,EAAE,EAAE;QAC9G,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE;QACjG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE;QAC7F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;QAC3F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE;QACjG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,uBAAuB,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;QACtG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,KAAK,EAAE;QACnH,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE;QAC9F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;QACzF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,6CAA6C,EAAE,YAAY,EAAE,EAAE,EAAE;QAC1H,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,+CAA+C,EAAE,YAAY,EAAE,EAAE,EAAE;QAC9H,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,+CAA+C,EAAE,YAAY,EAAE,EAAE,EAAE;QAC7H,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,YAAY,EAAE,YAAY,EAAE;QACrH,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAE;QACzH,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,EAAE;QAC1G,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE;QAC1G,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;QACxF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,iDAAiD,EAAE,YAAY,EAAE,EAAE,EAAE;QAC5H,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,mDAAmD,EAAE,YAAY,EAAE,EAAE,EAAE;QAC9H,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,wCAAwC,EAAE,YAAY,EAAE,EAAE,EAAE;QACnH,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE;QAClF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;QAC/F,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE;QACxG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,wBAAwB,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QAChG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,4BAA4B,EAAE;QAClI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE;QACxG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QAChF,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QAC7E,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,0BAA0B,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QACxG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,6BAA6B,EAAE;KAChG,CAAC;IACF,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;IAClE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY,EAAE,kBAAuB;IAC9D,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACzE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;AACzC,CAAC"}
|
|
1
|
+
{"version":3,"file":"tibberLocal.js","sourceRoot":"","sources":["../../src/lib/tibberLocal.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "tibberlink",
|
|
4
|
-
"version": "3.4.
|
|
4
|
+
"version": "3.4.3",
|
|
5
5
|
"news": {
|
|
6
|
+
"3.4.3": {
|
|
7
|
+
"en": "added unit to Pulse temperature and round to 0.1°C\nadded unit to Pulse battery voltage and round to 100mV\nadded unit to Pulse uptime\nadded state with Pulse uptime as human readable string",
|
|
8
|
+
"de": "Einheit zur Pulse-Temperatur hinzugefügt und auf 0,1°C gerundet\nEinheit zur Pulse-Batteriespannung hinzugefügt und auf 100mV gerundet\nEinheit zur Pulse-Betriebszeit hinzugefügt\nZustand mit Pulse-Betriebszeit als lesbaren String hinzugefügt",
|
|
9
|
+
"ru": "добавлена единица измерения температуры Pulse и округление до 0,1°C\nдобавлена единица измерения напряжения батареи Pulse и округление до 100мВ\nдобавлена единица измерения времени работы Pulse\nдобавлено состояние с временем работы Pulse в виде читаемой строки",
|
|
10
|
+
"pt": "adicionada unidade à temperatura do Pulse e arredondada para 0,1°C\nadicionada unidade à voltagem da bateria do Pulse e arredondada para 100mV\nadicionada unidade ao tempo de atividade do Pulse\nadicionado estado com tempo de atividade do Pulse como string legível",
|
|
11
|
+
"nl": "eenheid toegevoegd aan Pulse-temperatuur en afgerond naar 0,1°C\neenheid toegevoegd aan Pulse-accuspanning en afgerond naar 100mV\neenheid toegevoegd aan Pulse-uptime\ntoestand toegevoegd met Pulse-uptime als leesbare string",
|
|
12
|
+
"fr": "ajout de l'unité à la température du Pulse et arrondi à 0,1°C\najout de l'unité à la tension de la batterie du Pulse et arrondi à 100mV\najout de l'unité au temps de fonctionnement du Pulse\najout de l'état avec le temps de fonctionnement du Pulse sous forme de chaîne lisible",
|
|
13
|
+
"it": "aggiunta unità alla temperatura Pulse e arrotondata a 0,1°C\naggiunta unità alla tensione della batteria Pulse e arrotondata a 100mV\naggiunta unità al tempo di attività Pulse\naggiunto stato con tempo di attività Pulse come stringa leggibile",
|
|
14
|
+
"es": "se agregó unidad a la temperatura del Pulse y se redondeó a 0,1°C\nse agregó unidad al voltaje de la batería del Pulse y se redondeó a 100mV\nse agregó unidad al tiempo de actividad del Pulse\nse agregó estado con el tiempo de actividad del Pulse como cadena legible",
|
|
15
|
+
"pl": "dodano jednostkę do temperatury Pulse i zaokrąglono do 0,1°C\ndodano jednostkę do napięcia baterii Pulse i zaokrąglono do 100mV\ndodano jednostkę do czasu pracy Pulse\ndodano stan z czasem pracy Pulse jako czytelny ciąg znaków",
|
|
16
|
+
"uk": "додано одиницю виміру температури Pulse і округлено до 0,1°C\nдодано одиницю виміру напруги акумулятора Pulse і округлено до 100мВ\nдодано одиницю виміру часу роботи Pulse\nдодано стан з часом роботи Pulse у вигляді читабельного рядка",
|
|
17
|
+
"zh-cn": "添加单位到 Pulse 温度并四舍五入到 0.1°C\n添加单位到 Pulse 电池电压并四舍五入到 100mV\n添加单位到 Pulse 运行时间\n添加具有 Pulse 运行时间的状态为人类可读字符串"
|
|
18
|
+
},
|
|
19
|
+
"3.4.2": {
|
|
20
|
+
"en": "fix typos in units\nfix type mismatch for state objects (#455)\ncode optimisation",
|
|
21
|
+
"de": "Tippfehler in Einheiten korrigieren\nTypeninkongruenz für Statusobjekte beheben (#455)\nCode-Optimierung",
|
|
22
|
+
"ru": "исправить опечатки в единицах\nисправить несоответствие типов для объектов состояния (#455)\nоптимизация кода",
|
|
23
|
+
"pt": "corrigir erros de digitação nas unidades\ncorrigir incompatibilidade de tipo para objetos de estado (#455)\notimização de código",
|
|
24
|
+
"nl": "typfouten in eenheden corrigeren\ntype-mismatch voor toestandsobjecten oplossen (#455)\ncode optimalisatie",
|
|
25
|
+
"fr": "corriger les fautes de frappe dans les unités\ncorriger l'incohérence de type pour les objets d'état (#455)\noptimisation du code",
|
|
26
|
+
"it": "correggere i refusi nelle unità\ncorreggere l'incongruenza di tipo per gli oggetti di stato (#455)\nottimizzazione del codice",
|
|
27
|
+
"es": "corregir errores tipográficos en las unidades\ncorregir la incompatibilidad de tipo para objetos de estado (#455)\noptimización del código",
|
|
28
|
+
"pl": "poprawić literówki w jednostkach\nnaprawić niezgodność typów dla obiektów stanu (#455)\noptymalizacja kodu",
|
|
29
|
+
"uk": "виправити друкарські помилки в одиницях\nвиправити невідповідність типів для об'єктів стану (#455)\nоптимізація коду",
|
|
30
|
+
"zh-cn": "修正单位中的拼写错误\n修正状态对象的类型不匹配 (#455)\n代码优化"
|
|
31
|
+
},
|
|
6
32
|
"3.4.1": {
|
|
7
33
|
"en": "fix logging error\nbump dependencies",
|
|
8
34
|
"de": "Protokollierungsfehler beheben\nAbhängigkeiten aktualisieren",
|
|
@@ -211,19 +237,6 @@
|
|
|
211
237
|
"uk": "спростити обробку внутрішнього стану\nскоротити рядок дома на екрані калькулятора (#317)\nвиправити пастку петлі зворотного зв'язку (#321)\nдодати деякі підказки на екран конфігурації (#317)",
|
|
212
238
|
"zh-cn": "简化内部状态处理\n在计算器屏幕上缩短主页字符串（#317）\n修复反馈循环陷阱（#321）\n在配置屏幕上添加一些工具提示（#317）"
|
|
213
239
|
},
|
|
214
|
-
"2.2.1": {
|
|
215
|
-
"en": "fix edge case problems with defect feed data from Tibber server (#312)",
|
|
216
|
-
"de": "Probleme mit Randfällen bei defekten Feed-Daten vom Tibber-Server beheben (#312)",
|
|
217
|
-
"ru": "Исправить проблемы с крайними случаями с дефектными данными ленты от сервера Tibber (#312)",
|
|
218
|
-
"pt": "Corrigir problemas de casos extremos com dados de feed defeituosos do servidor Tibber (#312)",
|
|
219
|
-
"nl": "Randgevalproblemen oplossen met defecte feedgegevens van Tibber-server (#312)",
|
|
220
|
-
"fr": "Corriger les problèmes de cas particuliers avec les données de flux défectueuses du serveur Tibber (#312)",
|
|
221
|
-
"it": "Risolvere i problemi dei casi limite con i dati di feed difettosi dal server Tibber (#312)",
|
|
222
|
-
"es": "Corregir problemas de casos extremos con datos de feed defectuosos del servidor Tibber (#312)",
|
|
223
|
-
"pl": "Napraw problemy z przypadkami brzegowymi z wadliwymi danymi z serwera Tibber (#312)",
|
|
224
|
-
"uk": "Виправити проблеми з крайовими випадками з вадливими даними ленти від сервера Tibber (#312)",
|
|
225
|
-
"zh-cn": "修复 Tibber 服务器的缺陷数据的边缘案例问题 (#312)"
|
|
226
|
-
},
|
|
227
240
|
"2.2.0": {
|
|
228
241
|
"en": "add data points for BestHoursBlock results - period and average cost (#240)",
|
|
229
242
|
"de": "Datenpunkte für BestHoursBlock-Ergebnisse hinzufügen - Zeitraum und Durchschnittskosten (#240)",
|
|
@@ -237,19 +250,6 @@
|
|
|
237
250
|
"uk": "Додати точки даних для результатів BestHoursBlock - період і середня вартість (#240)",
|
|
238
251
|
"zh-cn": "为 BestHoursBlock 结果添加数据点 - 周期和平均成本 (#240)"
|
|
239
252
|
},
|
|
240
|
-
"2.1.0": {
|
|
241
|
-
"en": "add repeatability for LTF channels (#289)",
|
|
242
|
-
"de": "Wiederholbarkeit für LTF-Kanäle hinzufügen (#289)",
|
|
243
|
-
"ru": "Добавить повторяемость для каналов LTF (#289)",
|
|
244
|
-
"pt": "Adicionar repetibilidade para canais LTF (#289)",
|
|
245
|
-
"nl": "Herhaalbaarheid toevoegen voor LTF-kanalen (#289)",
|
|
246
|
-
"fr": "Ajouter la répétabilité pour les canaux LTF (#289)",
|
|
247
|
-
"it": "Aggiungere la ripetibilità per i canali LTF (#289)",
|
|
248
|
-
"es": "Agregar repetibilidad para canales LTF (#289)",
|
|
249
|
-
"pl": "Dodaj powtarzalność dla kanałów LTF (#289)",
|
|
250
|
-
"uk": "Додати повторюваність для каналів LTF (#289)",
|
|
251
|
-
"zh-cn": "为LTF通道添加可重复性 (#289)"
|
|
252
|
-
},
|
|
253
253
|
"2.0.0": {
|
|
254
254
|
"en": "BREAKING: dropped support for js-controller 3.x (#247)\ndiversificate Tibber server polls to prevent potential DDoS reactions (#252)\nadd data point for averageRemaining of today's prices (#254)\nadd 2 data points for last successful update of today and tomorrow prices (#261)\nyear 2024 changes\nfix small error in dynamic feed timing",
|
|
255
255
|
"de": "WICHTIG: Unterstützung für js-controller 3.x wurde eingestellt (#247)\nDiversifizieren Sie die Tibber-Serverabfragen, um potenzielle DDoS-Reaktionen zu verhindern (#252)\nFügen Sie einen Datenpunkt für den durchschnittlichen Restbetrag der heutigen Preise hinzu (#254)\nFügen Sie 2 Datenpunkte für das letzte erfolgreiche Update der heutigen und morgigen Preise hinzu (#261)\nÄnderungen im Jahr 2024\nBeheben Sie einen kleinen Fehler in der zeitlichen Abstimmung des dynamischen Feeds",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.tibberlink",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.3",
|
|
4
4
|
"description": "links tibber API data to be used in ioBroker",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Hombach",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@iobroker/testing": "^4.1.3",
|
|
34
|
-
"@iobroker/types": "^6.0.
|
|
34
|
+
"@iobroker/types": "^6.0.8",
|
|
35
35
|
"@types/chai": "^4.3.11",
|
|
36
36
|
"@types/chai-as-promised": "^7.1.8",
|
|
37
37
|
"@types/mocha": "^10.0.7",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"eslint-config-prettier": "^9.1.0",
|
|
49
49
|
"eslint-plugin-prettier": "^5.1.3",
|
|
50
50
|
"mocha": "^10.6.0",
|
|
51
|
-
"prettier": "^3.3.
|
|
51
|
+
"prettier": "^3.3.3",
|
|
52
52
|
"proxyquire": "^2.1.3",
|
|
53
53
|
"sinon": "^18.0.0",
|
|
54
54
|
"sinon-chai": "^3.7.0",
|