mclimate-payload-helper 1.2.6 → 1.2.7
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/.eslintrc.cjs +18 -0
- package/.husky/pre-commit +6 -0
- package/CLAUDE.md +10 -1
- package/add-encoder-command-existing.md +51 -51
- package/add-encoder-command-new.md +51 -51
- package/dist/decoders/commandsReadingHelper.d.ts.map +1 -1
- package/dist/decoders/commandsReadingHelper.js +204 -202
- package/dist/decoders/commandsReadingHelper.js.map +1 -1
- package/dist/decoders/payloadParsers/AQISensorPayloadParser.js +5 -5
- package/dist/decoders/payloadParsers/AQISensorPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/CO2DisplayLitePayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/CO2DisplayLitePayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/CO2DisplayLitePayloadParser.js +18 -18
- package/dist/decoders/payloadParsers/CO2DisplayLitePayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/CO2DisplayPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/CO2DisplayPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/CO2DisplayPayloadParser.js +19 -19
- package/dist/decoders/payloadParsers/CO2DisplayPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/CO2SensorPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/CO2SensorPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/CO2SensorPayloadParser.js +3 -3
- package/dist/decoders/payloadParsers/CO2SensorPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/DskDevicePayloadParser.js +11 -11
- package/dist/decoders/payloadParsers/DskDevicePayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/FanCoilThermostatPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/FanCoilThermostatPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/FanCoilThermostatPayloadParser.js +1 -1
- package/dist/decoders/payloadParsers/FanCoilThermostatPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/ThermostatPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/ThermostatPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/ThermostatPayloadParser.js +32 -40
- package/dist/decoders/payloadParsers/ThermostatPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/WirelessThermostatPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/WirelessThermostatPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/WirelessThermostatPayloadParser.js +13 -13
- package/dist/decoders/payloadParsers/WirelessThermostatPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/buttonPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/buttonPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/buttonPayloadParser.js +6 -6
- package/dist/decoders/payloadParsers/buttonPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/co2PirLitePayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/co2PirLitePayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/co2PirLitePayloadParser.js +16 -16
- package/dist/decoders/payloadParsers/co2PirLitePayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/htDisplayLitePayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/htDisplayLitePayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/htDisplayLitePayloadParser.js +17 -17
- package/dist/decoders/payloadParsers/htDisplayLitePayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/htPirLitePayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/htPirLitePayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/htPirLitePayloadParser.js +14 -14
- package/dist/decoders/payloadParsers/htPirLitePayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/htSensorPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/htSensorPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/htSensorPayloadParser.js +16 -16
- package/dist/decoders/payloadParsers/htSensorPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/melissaLorawanPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/melissaLorawanPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/melissaLorawanPayloadParser.js +8 -8
- package/dist/decoders/payloadParsers/melissaLorawanPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/multisensorPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/multisensorPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/multisensorPayloadParser.js +4 -5
- package/dist/decoders/payloadParsers/multisensorPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/openCloseSensorPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/openCloseSensorPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/openCloseSensorPayloadParser.js +23 -20
- package/dist/decoders/payloadParsers/openCloseSensorPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/relay16DryPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/relay16DryPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/relay16DryPayloadParser.js +8 -8
- package/dist/decoders/payloadParsers/relay16DryPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/relay16PayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/relay16PayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/relay16PayloadParser.js +8 -8
- package/dist/decoders/payloadParsers/relay16PayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/tFloodPayloadParser.js +7 -7
- package/dist/decoders/payloadParsers/tFloodPayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/tValvePayloadParser.js +4 -4
- package/dist/decoders/payloadParsers/tValvePayloadParser.js.map +1 -1
- package/dist/decoders/payloadParsers/uplinkPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/uplinkPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/vickiPayloadParser.d.ts +1 -1
- package/dist/decoders/payloadParsers/vickiPayloadParser.d.ts.map +1 -1
- package/dist/decoders/payloadParsers/vickiPayloadParser.js +25 -25
- package/dist/decoders/payloadParsers/vickiPayloadParser.js.map +1 -1
- package/dist/encoders/Co2DisplayCommands.js +1 -1
- package/dist/encoders/Co2DisplayCommands.js.map +1 -1
- package/dist/encoders/Co2DisplayCommonCommands.d.ts +0 -4
- package/dist/encoders/Co2DisplayCommonCommands.d.ts.map +1 -1
- package/dist/encoders/Co2DisplayCommonCommands.js +0 -38
- package/dist/encoders/Co2DisplayCommonCommands.js.map +1 -1
- package/dist/encoders/Co2DisplayLiteCommands.js +1 -1
- package/dist/encoders/Co2DisplayLiteCommands.js.map +1 -1
- package/dist/encoders/CommandBuilder.d.ts +2 -2
- package/dist/encoders/CommandBuilder.d.ts.map +1 -1
- package/dist/encoders/CommandBuilder.js +4 -2
- package/dist/encoders/CommandBuilder.js.map +1 -1
- package/dist/encoders/FanCoilThermostat.d.ts +61 -0
- package/dist/encoders/FanCoilThermostat.d.ts.map +1 -0
- package/dist/encoders/FanCoilThermostat.js +719 -0
- package/dist/encoders/FanCoilThermostat.js.map +1 -0
- package/dist/encoders/HTPirLiteCommands.d.ts.map +1 -1
- package/dist/encoders/HTPirLiteCommands.js +2 -8
- package/dist/encoders/HTPirLiteCommands.js.map +1 -1
- package/dist/encoders/MelissaCommands.d.ts.map +1 -1
- package/dist/encoders/MelissaCommands.js.map +1 -1
- package/dist/encoders/Relay16DryCommands.d.ts.map +1 -1
- package/dist/encoders/Relay16DryCommands.js +1 -3
- package/dist/encoders/Relay16DryCommands.js.map +1 -1
- package/dist/encoders/SetAqiLed.d.ts +6 -0
- package/dist/encoders/SetAqiLed.d.ts.map +1 -0
- package/dist/encoders/SetAqiLed.js +46 -0
- package/dist/encoders/SetAqiLed.js.map +1 -0
- package/dist/encoders/VickiCommands.d.ts.map +1 -1
- package/dist/encoders/VickiCommands.js +5 -7
- package/dist/encoders/VickiCommands.js.map +1 -1
- package/dist/encoders/types/enumValidation.d.ts +6 -0
- package/dist/encoders/types/enumValidation.d.ts.map +1 -0
- package/dist/encoders/types/enumValidation.js +50 -0
- package/dist/encoders/types/enumValidation.js.map +1 -0
- package/dist/encoders/types/schemaValidatedEnums.d.ts +40 -0
- package/dist/encoders/types/schemaValidatedEnums.d.ts.map +1 -0
- package/dist/encoders/types/schemaValidatedEnums.js +181 -0
- package/dist/encoders/types/schemaValidatedEnums.js.map +1 -0
- package/dist/encoders/types/schemas.d.ts.map +1 -1
- package/dist/encoders/types/schemas.js +1 -0
- package/dist/encoders/types/schemas.js.map +1 -1
- package/dist/test/payloadDecoders.test.js +28 -23
- package/dist/test/payloadDecoders.test.js.map +1 -1
- package/dist/test/payloadEncoders.test.js +44 -22
- package/dist/test/payloadEncoders.test.js.map +1 -1
- package/dist/types/deviceTypes.d.ts +19 -0
- package/dist/types/deviceTypes.d.ts.map +1 -0
- package/dist/types/deviceTypes.js +23 -0
- package/dist/types/deviceTypes.js.map +1 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -0
- package/dist/types/index.js +18 -0
- package/dist/types/index.js.map +1 -0
- package/dist/types/types.d.ts +13 -0
- package/dist/types/types.d.ts.map +1 -0
- package/dist/types/types.js +9 -0
- package/dist/types/types.js.map +1 -0
- package/dist/utils/delMethods.d.ts +1 -1
- package/dist/utils/delMethods.d.ts.map +1 -1
- package/dist/utils/delMethods.js +3 -2
- package/dist/utils/delMethods.js.map +1 -1
- package/dist/utils/mixin.d.ts +1 -1
- package/dist/utils/mixin.d.ts.map +1 -1
- package/dist/utils/mixin.js +4 -1
- package/dist/utils/mixin.js.map +1 -1
- package/dist/validation.d.ts +3 -0
- package/dist/validation.d.ts.map +1 -0
- package/dist/validation.js +8 -0
- package/dist/validation.js.map +1 -0
- package/package.json +13 -2
- package/src/decoders/commandsReadingHelper.ts +205 -203
- package/src/decoders/payloadParsers/AQISensorPayloadParser.ts +5 -5
- package/src/decoders/payloadParsers/CO2DisplayLitePayloadParser.ts +19 -19
- package/src/decoders/payloadParsers/CO2DisplayPayloadParser.ts +19 -19
- package/src/decoders/payloadParsers/CO2SensorPayloadParser.ts +4 -4
- package/src/decoders/payloadParsers/DskDevicePayloadParser.ts +11 -11
- package/src/decoders/payloadParsers/FanCoilThermostatPayloadParser.ts +3 -3
- package/src/decoders/payloadParsers/ThermostatPayloadParser.ts +32 -42
- package/src/decoders/payloadParsers/WirelessThermostatPayloadParser.ts +16 -14
- package/src/decoders/payloadParsers/buttonPayloadParser.ts +6 -6
- package/src/decoders/payloadParsers/co2PirLitePayloadParser.ts +28 -29
- package/src/decoders/payloadParsers/htDisplayLitePayloadParser.ts +17 -17
- package/src/decoders/payloadParsers/htPirLitePayloadParser.ts +25 -25
- package/src/decoders/payloadParsers/htSensorPayloadParser.ts +17 -17
- package/src/decoders/payloadParsers/melissaLorawanPayloadParser.ts +11 -11
- package/src/decoders/payloadParsers/multisensorPayloadParser.ts +75 -77
- package/src/decoders/payloadParsers/openCloseSensorPayloadParser.ts +40 -36
- package/src/decoders/payloadParsers/relay16DryPayloadParser.ts +10 -10
- package/src/decoders/payloadParsers/relay16PayloadParser.ts +10 -10
- package/src/decoders/payloadParsers/tFloodPayloadParser.ts +7 -7
- package/src/decoders/payloadParsers/tValvePayloadParser.ts +4 -4
- package/src/decoders/payloadParsers/vickiPayloadParser.ts +28 -28
- package/src/encoders/Co2DisplayCommands.ts +1 -1
- package/src/encoders/Co2DisplayLiteCommands.ts +2 -2
- package/src/encoders/Co2PirLiteCommands.ts +0 -1
- package/src/encoders/CommandBuilder.ts +5 -3
- package/src/encoders/HTPirLiteCommands.ts +27 -34
- package/src/encoders/MelissaCommands.ts +20 -24
- package/src/encoders/Relay16DryCommands.ts +3 -6
- package/src/encoders/VickiCommands.ts +23 -53
- package/src/encoders/index.ts +0 -1
- package/src/encoders/types/schemas.ts +1 -0
- package/src/test/payloadDecoders.test.ts +88 -73
- package/src/test/payloadEncoders.test.ts +101 -72
- package/src/utils/delMethods.ts +6 -3
- package/src/utils/mixin.ts +5 -2
|
@@ -6,27 +6,27 @@ const types_1 = require("../../decoders/payloadParsers/types");
|
|
|
6
6
|
const helpers_1 = require("../../helpers");
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
const CO2DisplayPayloadParser = (hexData) => {
|
|
9
|
-
|
|
9
|
+
const deviceData = {};
|
|
10
10
|
try {
|
|
11
11
|
const calculateTemperature = (rawData) => (rawData - 400) / 10;
|
|
12
12
|
const calculateHumidity = (rawData) => (rawData * 100) / 256;
|
|
13
13
|
const handleKeepAliveData = (data) => {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
14
|
+
const tempHex = ('0' + data[1].toString(16)).substr(-2) + ('0' + data[2].toString(16)).substr(-2);
|
|
15
|
+
const tempDec = parseInt(tempHex, 16);
|
|
16
|
+
const temperature = calculateTemperature(tempDec);
|
|
17
|
+
const humidity = calculateHumidity(data[3]);
|
|
18
|
+
const batteryVoltageCalculated = parseInt(`${(0, helpers_1.decbin)(data[4])}${(0, helpers_1.decbin)(data[5])}`, 2) / 1000;
|
|
19
|
+
const sensorTemperature = Number(temperature.toFixed(2));
|
|
20
|
+
const relativeHumidity = Number(humidity.toFixed(2));
|
|
21
|
+
const batteryVoltage = Number(batteryVoltageCalculated.toFixed(2));
|
|
22
22
|
let ppmBin = (0, helpers_1.decbin)(data[6]);
|
|
23
|
-
|
|
23
|
+
const ppmBin2 = (0, helpers_1.decbin)(data[7]);
|
|
24
24
|
ppmBin = `${ppmBin2.slice(0, 5)}${ppmBin}`;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
const ppm = parseInt(ppmBin, 2);
|
|
26
|
+
const powerSourceStatus = ppmBin2.slice(5, 8);
|
|
27
|
+
const lux = (data[8] << 8) | data[9];
|
|
28
|
+
const pir = (0, helpers_1.toBool)(data[10]);
|
|
29
|
+
const keepaliveData = {
|
|
30
30
|
CO2: ppm,
|
|
31
31
|
sensorTemperature,
|
|
32
32
|
relativeHumidity,
|
|
@@ -47,19 +47,19 @@ const CO2DisplayPayloadParser = (hexData) => {
|
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
// parse command answers
|
|
50
|
-
|
|
50
|
+
const data = (0, decoders_1.commandsReadingHelper)(hexData, 22, types_1.DeviceType.CO2Display);
|
|
51
51
|
// Q: error handling
|
|
52
52
|
if (!data)
|
|
53
53
|
return;
|
|
54
|
-
const shouldKeepAlive =
|
|
54
|
+
const shouldKeepAlive = Object.prototype.hasOwnProperty.call(data, 'decodeKeepalive');
|
|
55
55
|
if ('decodeKeepalive' in data) {
|
|
56
56
|
delete data.decodeKeepalive;
|
|
57
57
|
}
|
|
58
58
|
Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, data));
|
|
59
59
|
// get only keepalive from device response
|
|
60
60
|
if (shouldKeepAlive) {
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
const keepaliveData = hexData.slice(-22);
|
|
62
|
+
const dataToPass = (0, helpers_1.byteArrayParser)(keepaliveData);
|
|
63
63
|
if (!dataToPass)
|
|
64
64
|
return;
|
|
65
65
|
handleKeepAliveData(dataToPass);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CO2DisplayPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/CO2DisplayPayloadParser.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAClD,2DAA4D;AAC5D,uCAA2D;AAC3D,mCAAqC;AAE9B,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,EAAE;IAC1D,
|
|
1
|
+
{"version":3,"file":"CO2DisplayPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/CO2DisplayPayloadParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const CO2SensorPayloadParser: (hexData: string) =>
|
|
1
|
+
export declare const CO2SensorPayloadParser: (hexData: string) => Record<string, unknown> | undefined;
|
|
2
2
|
//# sourceMappingURL=CO2SensorPayloadParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CO2SensorPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/CO2SensorPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,sBAAsB,YAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"CO2SensorPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/CO2SensorPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,sBAAsB,YAAa,MAAM,wCA4DrD,CAAA"}
|
|
@@ -6,7 +6,7 @@ const types_1 = require("../../decoders/payloadParsers/types");
|
|
|
6
6
|
const helpers_1 = require("../../helpers");
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
const CO2SensorPayloadParser = (hexData) => {
|
|
9
|
-
|
|
9
|
+
const deviceData = {};
|
|
10
10
|
try {
|
|
11
11
|
const handleKeepAliveData = (byteArray) => {
|
|
12
12
|
const co2 = parseInt(byteArray[1].toString(16).padStart(2, '0') + byteArray[2].toString(16).padStart(2, '0'), 16);
|
|
@@ -14,7 +14,7 @@ const CO2SensorPayloadParser = (hexData) => {
|
|
|
14
14
|
const temperature = (parseInt(tempHex, 16) - 400) / 10;
|
|
15
15
|
const humidity = Number(((byteArray[5] * 100) / 256).toFixed(2));
|
|
16
16
|
const voltage = Number(((byteArray[6] * 8 + 1600) / 1000).toFixed(2));
|
|
17
|
-
|
|
17
|
+
const keepaliveData = {
|
|
18
18
|
CO2: co2,
|
|
19
19
|
temperature: temperature,
|
|
20
20
|
humidity: humidity,
|
|
@@ -35,7 +35,7 @@ const CO2SensorPayloadParser = (hexData) => {
|
|
|
35
35
|
// Q: error handling
|
|
36
36
|
if (!data)
|
|
37
37
|
return;
|
|
38
|
-
const shouldKeepAlive =
|
|
38
|
+
const shouldKeepAlive = Object.prototype.hasOwnProperty.call(data, 'decodeKeepalive');
|
|
39
39
|
if ('decodeKeepalive' in data) {
|
|
40
40
|
delete data.decodeKeepalive;
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CO2SensorPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/CO2SensorPayloadParser.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAClD,2DAA4D;AAC5D,uCAA2C;AAC3C,mCAAqC;AAE9B,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,EAAE;IACzD,
|
|
1
|
+
{"version":3,"file":"CO2SensorPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/CO2SensorPayloadParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,19 +7,19 @@ const helpers_1 = require("../../helpers");
|
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
// WARN: no tests found for below
|
|
9
9
|
const DskDevicePayloadParser = (hexData) => {
|
|
10
|
-
|
|
10
|
+
const deviceData = {};
|
|
11
11
|
try {
|
|
12
12
|
const handleKeepAliveData = (data) => {
|
|
13
13
|
const hexArray = (0, helpers_1.byteArrayParser)(data);
|
|
14
14
|
if (!hexArray)
|
|
15
15
|
return;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
16
|
+
const powerSupplyVoltage = ((hexArray[1] * 8 + 1600) / 1000).toFixed(2);
|
|
17
|
+
const thermistorProperlyConnected = parseInt((0, helpers_1.decbin)(hexArray[2])[5]) == 0;
|
|
18
|
+
const extT1 = ('0' + hexArray[2].toString(16)).substr(-2)[1];
|
|
19
|
+
const extT2 = ('0' + hexArray[3].toString(16)).substr(-2);
|
|
20
|
+
const sensorTemperature = thermistorProperlyConnected ? (parseInt(`0x${extT1}${extT2}`, 16) * 0.1).toFixed(2) : 0;
|
|
21
|
+
const status = hexArray[4];
|
|
22
|
+
const keepaliveData = {
|
|
23
23
|
sensorTemperature: Number(sensorTemperature),
|
|
24
24
|
powerSupplyVoltage: Number(powerSupplyVoltage),
|
|
25
25
|
status,
|
|
@@ -34,11 +34,11 @@ const DskDevicePayloadParser = (hexData) => {
|
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
// parse command answers
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
const decodeKeepalive = hexData.length <= 84;
|
|
38
|
+
const data = (0, commandsReadingHelper_1.commandsReadingHelper)(hexData, 10, types_1.DeviceType.DskDevice);
|
|
39
39
|
Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, data));
|
|
40
40
|
// get only keepalive from device response
|
|
41
|
-
|
|
41
|
+
const keepaliveData = hexData.slice(-10);
|
|
42
42
|
if (decodeKeepalive)
|
|
43
43
|
handleKeepAliveData(keepaliveData);
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DskDevicePayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/DskDevicePayloadParser.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AACxE,2DAA4D;AAC5D,uCAAmD;AACnD,mCAAqC;AAErC,iCAAiC;AAC1B,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,EAAE;IACzD,
|
|
1
|
+
{"version":3,"file":"DskDevicePayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/DskDevicePayloadParser.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AACxE,2DAA4D;AAC5D,uCAAmD;AACnD,mCAAqC;AAErC,iCAAiC;AAC1B,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,EAAE,CAAA;IAErB,IAAI,CAAC;QACJ,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAA;YAEtC,IAAI,CAAC,QAAQ;gBAAE,OAAM;YAErB,MAAM,kBAAkB,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YAEvE,MAAM,2BAA2B,GAAG,QAAQ,CAAC,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;YAEzE,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC5D,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACzD,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,KAAK,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACjH,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAE1B,MAAM,aAAa,GAAG;gBACrB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,CAAC;gBAC5C,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC;gBAC9C,MAAM;gBACN,2BAA2B;aAC3B,CAAA;YACD,MAAM,CAAC,MAAM,CAAC,UAAU,oBAAO,UAAU,qBAAS,aAAa,EAAG,CAAA;QACnE,CAAC,CAAA;QAED,IAAI,OAAO,EAAE,CAAC;YACb,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/B,mBAAmB;gBACnB,mBAAmB,CAAC,OAAO,CAAC,CAAA;YAC7B,CAAC;iBAAM,CAAC;gBACP,wBAAwB;gBACxB,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAA;gBAC5C,MAAM,IAAI,GAAG,IAAA,6CAAqB,EAAC,OAAO,EAAE,EAAE,EAAE,kBAAU,CAAC,SAAS,CAAC,CAAA;gBACrE,MAAM,CAAC,MAAM,CAAC,UAAU,oBAAO,UAAU,qBAAS,IAAI,EAAG,CAAA;gBAEzD,0CAA0C;gBAC1C,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;gBAExC,IAAI,eAAe;oBAAE,mBAAmB,CAAC,aAAa,CAAC,CAAA;YACxD,CAAC;YACD,OAAO,UAAU,CAAA;QAClB,CAAC;IACF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAW,CAAC;YACrB,OAAO,EAAE,gBAAgB;YACzB,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,YAAY;YACxB,aAAa,EAAE,CAAU;SACzB,CAAC,CAAA;IACH,CAAC;AACF,CAAC,CAAA;AApDY,QAAA,sBAAsB,0BAoDlC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const FanCoilThermostatPayloadParser: (hexData: string) =>
|
|
1
|
+
export declare const FanCoilThermostatPayloadParser: (hexData: string) => Record<string, unknown> | undefined;
|
|
2
2
|
//# sourceMappingURL=FanCoilThermostatPayloadParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FanCoilThermostatPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/FanCoilThermostatPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,8BAA8B,YAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"FanCoilThermostatPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/FanCoilThermostatPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,8BAA8B,YAAa,MAAM,wCAqE7D,CAAA"}
|
|
@@ -46,7 +46,7 @@ const FanCoilThermostatPayloadParser = (hexData) => {
|
|
|
46
46
|
const data = (0, commandsReadingHelper_1.commandsReadingHelper)(hexData, 22, types_1.DeviceType.FanCoilThermostat);
|
|
47
47
|
if (!data)
|
|
48
48
|
return;
|
|
49
|
-
const shouldKeepAlive =
|
|
49
|
+
const shouldKeepAlive = Object.prototype.hasOwnProperty.call(data, 'decodeKeepalive');
|
|
50
50
|
if ('decodeKeepalive' in data) {
|
|
51
51
|
delete data.decodeKeepalive;
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FanCoilThermostatPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/FanCoilThermostatPayloadParser.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AACxE,2DAA4D;AAC5D,uCAAmD;AACnD,mCAAqC;AAE9B,MAAM,8BAA8B,GAAG,CAAC,OAAe,EAAE,EAAE;IACjE,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"FanCoilThermostatPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/FanCoilThermostatPayloadParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const ThermostatPayloadParser: (hexData: string) =>
|
|
1
|
+
export declare const ThermostatPayloadParser: (hexData: string) => Record<string, unknown> | undefined;
|
|
2
2
|
//# sourceMappingURL=ThermostatPayloadParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThermostatPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/ThermostatPayloadParser.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,uBAAuB,YAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"ThermostatPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/ThermostatPayloadParser.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,uBAAuB,YAAa,MAAM,wCAkEtD,CAAA"}
|
|
@@ -4,56 +4,48 @@ exports.ThermostatPayloadParser = void 0;
|
|
|
4
4
|
const helpers_1 = require("../../helpers");
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
6
|
const ThermostatPayloadParser = (hexData) => {
|
|
7
|
-
|
|
7
|
+
const deviceData = {};
|
|
8
8
|
try {
|
|
9
9
|
const handleKeepAliveData = (byteArray) => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
relay_status: relay_status,
|
|
26
|
-
battery_status: battery_status,
|
|
10
|
+
const reason = byteArray[0];
|
|
11
|
+
const currentTemp1 = byteArray[1];
|
|
12
|
+
const currentTemp2 = byteArray[2];
|
|
13
|
+
const currentTemperature = (currentTemp2 * 256 + currentTemp1) / 10;
|
|
14
|
+
const relayStatus = byteArray[2] === 1;
|
|
15
|
+
const desiredTemp1 = byteArray[4];
|
|
16
|
+
const desiredTemp2 = byteArray[5];
|
|
17
|
+
const targetTemperature = (desiredTemp2 * 256 + desiredTemp1) / 10;
|
|
18
|
+
const batteryStatus = byteArray[6]; // in %
|
|
19
|
+
const keepaliveData = {
|
|
20
|
+
reason,
|
|
21
|
+
target_temperature: targetTemperature,
|
|
22
|
+
temperature: currentTemperature,
|
|
23
|
+
relay_status: relayStatus,
|
|
24
|
+
battery_status: batteryStatus,
|
|
27
25
|
};
|
|
28
26
|
Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, keepaliveData));
|
|
29
27
|
};
|
|
30
28
|
const handleFirstData = (byteArray) => {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
reason: reason,
|
|
47
|
-
temp_span: temp_span,
|
|
48
|
-
temp_sampling: temp_sampling,
|
|
49
|
-
target_temperature: target_temperature,
|
|
50
|
-
battery_status: battery_status,
|
|
51
|
-
keepAliveTime: lora_period,
|
|
29
|
+
const reason = byteArray[0];
|
|
30
|
+
const loraPeriod = byteArray[1]; // in minutes
|
|
31
|
+
const tempSpan = byteArray[2]; // divide by 10 (/10) for final value
|
|
32
|
+
const tempSampling = byteArray[3]; // in minutes
|
|
33
|
+
const desiredTemp1 = byteArray[4];
|
|
34
|
+
const desiredTemp2 = byteArray[5];
|
|
35
|
+
const targetTemperature = desiredTemp2 > 0 ? (desiredTemp1 + 256) / 10 : desiredTemp1 / 10;
|
|
36
|
+
const batteryStatus = byteArray[6]; // in %
|
|
37
|
+
const keepaliveData = {
|
|
38
|
+
reason,
|
|
39
|
+
temp_span: tempSpan,
|
|
40
|
+
temp_sampling: tempSampling,
|
|
41
|
+
target_temperature: targetTemperature,
|
|
42
|
+
battery_status: batteryStatus,
|
|
43
|
+
keepAliveTime: loraPeriod,
|
|
52
44
|
};
|
|
53
45
|
Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, keepaliveData));
|
|
54
46
|
};
|
|
55
47
|
if (hexData) {
|
|
56
|
-
|
|
48
|
+
const byteArray = (0, helpers_1.byteArrayParser)(hexData);
|
|
57
49
|
if (!byteArray)
|
|
58
50
|
return;
|
|
59
51
|
if (byteArray[0] == 0 || byteArray[0] == 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThermostatPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/ThermostatPayloadParser.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,mCAAqC;AAE9B,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,EAAE;IAC1D,
|
|
1
|
+
{"version":3,"file":"ThermostatPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/ThermostatPayloadParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const WirelessThermostatPayloadParser: (hexData: string) =>
|
|
1
|
+
export declare const WirelessThermostatPayloadParser: (hexData: string) => Record<string, unknown> | undefined;
|
|
2
2
|
//# sourceMappingURL=WirelessThermostatPayloadParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WirelessThermostatPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/WirelessThermostatPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,+BAA+B,YAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"WirelessThermostatPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/WirelessThermostatPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,+BAA+B,YAAa,MAAM,wCAoF9D,CAAA"}
|
|
@@ -7,19 +7,19 @@ const helpers_1 = require("../../helpers");
|
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
const WirelessThermostatPayloadParser = (hexData) => {
|
|
9
9
|
var _a;
|
|
10
|
-
|
|
10
|
+
const deviceData = {};
|
|
11
11
|
try {
|
|
12
12
|
const calculateTemperature = (rawData) => (rawData - 400) / 10;
|
|
13
13
|
const calculateHumidity = (rawData) => (rawData * 100) / 256;
|
|
14
14
|
const handleKeepAliveData = (data) => {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
15
|
+
const tempHex = ('0' + data[1].toString(16)).substr(-2) + ('0' + data[2].toString(16)).substr(-2);
|
|
16
|
+
const tempDec = parseInt(tempHex, 16);
|
|
17
|
+
const temperature = calculateTemperature(tempDec);
|
|
18
|
+
const humidity = calculateHumidity(data[3]);
|
|
19
|
+
const batteryVoltageCalculated = parseInt(`${(0, helpers_1.decbin)(data[4])}${(0, helpers_1.decbin)(data[5])}`, 2) / 1000;
|
|
20
|
+
const sensorTemperature = Number(temperature.toFixed(2));
|
|
21
|
+
const relativeHumidity = Number(humidity.toFixed(2));
|
|
22
|
+
const batteryVoltage = Number(batteryVoltageCalculated.toFixed(2));
|
|
23
23
|
let targetTemperature, powerSourceStatus, lux, pir;
|
|
24
24
|
if (data[0] == 1) {
|
|
25
25
|
targetTemperature = data[6];
|
|
@@ -55,21 +55,21 @@ const WirelessThermostatPayloadParser = (hexData) => {
|
|
|
55
55
|
else {
|
|
56
56
|
// parse command answers
|
|
57
57
|
let keepaliveLength = 22;
|
|
58
|
-
|
|
58
|
+
const potentialKeepAlive = (_a = hexData.match(/.{1,2}/g)) === null || _a === void 0 ? void 0 : _a.slice(-24 / 2);
|
|
59
59
|
if (potentialKeepAlive && potentialKeepAlive[0] == '81')
|
|
60
60
|
keepaliveLength = 24;
|
|
61
61
|
const data = (0, commandsReadingHelper_1.commandsReadingHelper)(hexData, keepaliveLength, types_1.DeviceType.WirelessThermostat);
|
|
62
62
|
if (!data)
|
|
63
63
|
return;
|
|
64
|
-
const shouldKeepAlive =
|
|
64
|
+
const shouldKeepAlive = Object.prototype.hasOwnProperty.call(data, 'decodeKeepalive');
|
|
65
65
|
if ('decodeKeepalive' in data) {
|
|
66
66
|
delete data.decodeKeepalive;
|
|
67
67
|
}
|
|
68
68
|
Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, data));
|
|
69
69
|
// get only keepalive from device response
|
|
70
70
|
if (shouldKeepAlive) {
|
|
71
|
-
|
|
72
|
-
|
|
71
|
+
const keepaliveData = hexData.slice(-keepaliveLength);
|
|
72
|
+
const dataToPass = (0, helpers_1.byteArrayParser)(keepaliveData);
|
|
73
73
|
if (!dataToPass)
|
|
74
74
|
return;
|
|
75
75
|
handleKeepAliveData(dataToPass);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WirelessThermostatPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/WirelessThermostatPayloadParser.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AACxE,2DAA4D;AAC5D,uCAA2D;AAC3D,mCAAqC;AAE9B,MAAM,+BAA+B,GAAG,CAAC,OAAe,EAAE,EAAE;;IAClE,
|
|
1
|
+
{"version":3,"file":"WirelessThermostatPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/WirelessThermostatPayloadParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const ButtonPayloadParser: (hexData: string) =>
|
|
1
|
+
export declare const ButtonPayloadParser: (hexData: string) => Record<string, unknown> | undefined;
|
|
2
2
|
//# sourceMappingURL=buttonPayloadParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buttonPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/buttonPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,YAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"buttonPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/buttonPayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,YAAa,MAAM,wCAyElD,CAAA"}
|
|
@@ -6,7 +6,7 @@ const types_1 = require("../../decoders/payloadParsers/types");
|
|
|
6
6
|
const helpers_1 = require("../../helpers");
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
const ButtonPayloadParser = (hexData) => {
|
|
9
|
-
|
|
9
|
+
const deviceData = {};
|
|
10
10
|
try {
|
|
11
11
|
const calculateBatteryVoltage = (byte) => {
|
|
12
12
|
return byte * 8 + 1600;
|
|
@@ -25,7 +25,7 @@ const ButtonPayloadParser = (hexData) => {
|
|
|
25
25
|
const temperatureRaw = (temperatureHighBits << 8) | temperatureLowBits;
|
|
26
26
|
const temperatureCelsius = calculateTemperature(temperatureRaw);
|
|
27
27
|
// Byte 4: Button event data
|
|
28
|
-
const buttonEventData =
|
|
28
|
+
const buttonEventData = '0' + bytes[4];
|
|
29
29
|
// check if it is a keepalive
|
|
30
30
|
const keepaliveData = {
|
|
31
31
|
sensorTemperature: Number(temperatureCelsius.toFixed(1)),
|
|
@@ -45,18 +45,18 @@ const ButtonPayloadParser = (hexData) => {
|
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
47
|
// parse command answers
|
|
48
|
-
|
|
48
|
+
const data = (0, commandsReadingHelper_1.commandsReadingHelper)(hexData, 10, types_1.DeviceType.MCButton);
|
|
49
49
|
if (!data)
|
|
50
50
|
return;
|
|
51
|
-
const shouldKeepAlive =
|
|
51
|
+
const shouldKeepAlive = Object.prototype.hasOwnProperty.call(data, 'decodeKeepalive');
|
|
52
52
|
if ('decodeKeepalive' in data) {
|
|
53
53
|
delete data.decodeKeepalive;
|
|
54
54
|
}
|
|
55
55
|
Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, data));
|
|
56
56
|
// get only keepalive from device response
|
|
57
57
|
if (shouldKeepAlive) {
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
const keepaliveData = hexData.slice(-10);
|
|
59
|
+
const dataToPass = (0, helpers_1.byteArrayParser)(keepaliveData);
|
|
60
60
|
if (!dataToPass)
|
|
61
61
|
return;
|
|
62
62
|
handleKeepAliveData(dataToPass);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buttonPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/buttonPayloadParser.ts"],"names":[],"mappings":";;;AAAA,4EAAwE;AACxE,2DAA4D;AAC5D,uCAA2C;AAC3C,mCAAqC;AAE9B,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,EAAE;IACtD,
|
|
1
|
+
{"version":3,"file":"buttonPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/buttonPayloadParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const co2PirLitePayloadParser: (hexData: string) =>
|
|
1
|
+
export declare const co2PirLitePayloadParser: (hexData: string) => Record<string, unknown> | undefined;
|
|
2
2
|
//# sourceMappingURL=co2PirLitePayloadParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"co2PirLitePayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/co2PirLitePayloadParser.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,uBAAuB,YAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"co2PirLitePayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/co2PirLitePayloadParser.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,uBAAuB,YAAa,MAAM,wCA0EtD,CAAA"}
|
|
@@ -6,37 +6,37 @@ const types_1 = require("../../decoders/payloadParsers/types");
|
|
|
6
6
|
const helpers_1 = require("../../helpers");
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
const co2PirLitePayloadParser = (hexData) => {
|
|
9
|
-
|
|
9
|
+
const deviceData = {};
|
|
10
10
|
try {
|
|
11
11
|
const handleKeepAliveData = (bytes) => {
|
|
12
|
-
|
|
12
|
+
const keepaliveData = {};
|
|
13
13
|
// Bytes 1-2: Internal temperature sensor data
|
|
14
14
|
// Formula: t[°C] = (T[15:0]-400)/10
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
const tempMsb = bytes[1]; // bits 15:8
|
|
16
|
+
const tempLsb = bytes[2]; // bits 7:0
|
|
17
|
+
const rawTemperature = (tempMsb << 8) | tempLsb;
|
|
18
18
|
keepaliveData.sensorTemperature = Number(((rawTemperature - 400) / 10).toFixed(2));
|
|
19
19
|
// Byte 3: Relative Humidity data
|
|
20
20
|
// Formula: RH[%] = (XX*100)/256
|
|
21
21
|
keepaliveData.relativeHumidity = Number(((bytes[3] * 100) / 256).toFixed(2));
|
|
22
22
|
// Bytes 4-5: Device battery voltage data
|
|
23
23
|
// Battery voltage [mV]
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
const batteryMsb = bytes[4]; // bits 15:8
|
|
25
|
+
const batteryLsb = bytes[5]; // bits 7:0
|
|
26
26
|
keepaliveData.batteryVoltage = Number((((batteryMsb << 8) | batteryLsb) / 1000).toFixed(2));
|
|
27
27
|
// CO2 calculation from data 6 and 7
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
const co2Low = bytes[6]; // Lower byte of CO2
|
|
29
|
+
const co2High = (bytes[7] & 0xf8) >> 3; // Mask the upper 5 bits and shift them right
|
|
30
30
|
keepaliveData.CO2 = (co2High << 8) | co2Low; // Shift co2High left by 8 bits and combine with co2Low
|
|
31
31
|
// Byte 8: PIR sensor status (only bit 0 is used)
|
|
32
32
|
// 0 - No motion detected
|
|
33
33
|
// 1 - Motion detected
|
|
34
|
-
|
|
35
|
-
keepaliveData.pir = pirValue === 1
|
|
34
|
+
const pirValue = bytes[8] & 0x01; // Extract only the last bit
|
|
35
|
+
keepaliveData.pir = pirValue === 1;
|
|
36
36
|
Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, keepaliveData));
|
|
37
37
|
};
|
|
38
38
|
if (hexData) {
|
|
39
|
-
|
|
39
|
+
const byteArray = (0, helpers_1.byteArrayParser)(hexData);
|
|
40
40
|
if (!byteArray)
|
|
41
41
|
return;
|
|
42
42
|
// Route the message based on the command byte
|
|
@@ -46,10 +46,10 @@ const co2PirLitePayloadParser = (hexData) => {
|
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
48
|
// parse command answers
|
|
49
|
-
|
|
49
|
+
const data = (0, commandsReadingHelper_1.commandsReadingHelper)(hexData, 18, types_1.DeviceType.CO2PirLite);
|
|
50
50
|
if (!data)
|
|
51
51
|
return;
|
|
52
|
-
const shouldKeepAlive =
|
|
52
|
+
const shouldKeepAlive = Object.prototype.hasOwnProperty.call(data, 'decodeKeepalive');
|
|
53
53
|
if ('decodeKeepalive' in data) {
|
|
54
54
|
delete data.decodeKeepalive;
|
|
55
55
|
}
|
|
@@ -57,8 +57,8 @@ const co2PirLitePayloadParser = (hexData) => {
|
|
|
57
57
|
// Handle the remaining keepalive data if present
|
|
58
58
|
if (shouldKeepAlive) {
|
|
59
59
|
// Extract the last 9 bytes which contain keepalive data for CO2-PIR-Lite
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
const keepaliveData = hexData.slice(-18); // 9 bytes = 18 hex chars
|
|
61
|
+
const dataToPass = (0, helpers_1.byteArrayParser)(keepaliveData);
|
|
62
62
|
if (!dataToPass)
|
|
63
63
|
return;
|
|
64
64
|
handleKeepAliveData(dataToPass);
|