diff --git a/interface/package.json b/interface/package.json index a0d7ae4fa..4ffc6d712 100644 --- a/interface/package.json +++ b/interface/package.json @@ -26,10 +26,10 @@ "@mui/material": "^5.14.0", "@preact/compat": "^17.1.2", "@table-library/react-table-library": "4.1.4", - "@types/lodash-es": "^4.17.7", - "@types/node": "^20.4.1", - "@types/react": "^18.2.14", - "@types/react-dom": "^18.2.6", + "@types/lodash-es": "^4.17.8", + "@types/node": "^20.4.2", + "@types/react": "^18.2.15", + "@types/react-dom": "^18.2.7", "@types/react-router-dom": "^5.3.3", "alova": "^2.9.2", "async-validator": "^4.2.5", @@ -54,7 +54,7 @@ "@typescript-eslint/parser": "^6.0.0", "eslint": "^8.44.0", "eslint-config-airbnb": "^19.0.4", - "eslint-config-airbnb-typescript": "^17.0.0", + "eslint-config-airbnb-typescript": "^17.1.0", "eslint-config-prettier": "^8.8.0", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-autofix": "^1.1.0", diff --git a/interface/src/project/SettingsEntitiesDialog.tsx b/interface/src/project/SettingsEntitiesDialog.tsx index 0873aa7b1..6d8d39511 100644 --- a/interface/src/project/SettingsEntitiesDialog.tsx +++ b/interface/src/project/SettingsEntitiesDialog.tsx @@ -222,7 +222,7 @@ const SettingsEntitiesDialog = ({ fullWidth margin="normal" type="number" - inputProps={{ min: '1', max: '28', step: '1' }} + inputProps={{ min: '1', max: '27', step: '1' }} /> )} diff --git a/interface/yarn.lock b/interface/yarn.lock index c5ee5ef6d..3c1cce40f 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -1277,12 +1277,12 @@ __metadata: languageName: node linkType: hard -"@types/lodash-es@npm:^4.17.7": - version: 4.17.7 - resolution: "@types/lodash-es@npm:4.17.7" +"@types/lodash-es@npm:^4.17.8": + version: 4.17.8 + resolution: "@types/lodash-es@npm:4.17.8" dependencies: "@types/lodash": "*" - checksum: c3ecfcff9f6864efa1a5f0d3ec457db17536f05a3a7a1a3f1fb1052042ed3e9747b12cd1eddab14fbbe98aef7aec131aaaf71c2f4611725cb15dd42b9651a64d + checksum: 950771d406c842814dd22217adba5e01bd06b3c21e97900d3c3816f38580e132894400b5d83a7962645fa284d8478614bdcc50755255ad15024311b7b8ed8520 languageName: node linkType: hard @@ -1293,10 +1293,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^20.4.1": - version: 20.4.1 - resolution: "@types/node@npm:20.4.1" - checksum: 000b001bc4a2bd96fde75c4e20358c6232b94228a6712989bd14cee652474f1084774a88552a82b3dac98fc49750313a76d5d3d773a6b616a041c2bad55590f3 +"@types/node@npm:^20.4.2": + version: 20.4.2 + resolution: "@types/node@npm:20.4.2" + checksum: ca506e089737d54effabda5d6534fdf9fdbe22adbcc4864a170feea390389f38cbae6abcf89c2b1ce5c3e4ffc450b35341509a7619f850babf43106009f01b2d languageName: node linkType: hard @@ -1314,12 +1314,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.2.6": - version: 18.2.6 - resolution: "@types/react-dom@npm:18.2.6" +"@types/react-dom@npm:^18.2.7": + version: 18.2.7 + resolution: "@types/react-dom@npm:18.2.7" dependencies: "@types/react": "*" - checksum: bd734ca04c52b3c96891a7f9c1139486807dac7a2449fb72e8f8e23018bc6eeeb87a490a105cb39d05ccb7ddf80ed7a441e5bd3e5866c6f6ae8870cd723599e8 + checksum: bd090f5e1b13765fbc191d9eb720dd152d26c20558221963009189c4636ce11e4c1c976e4cde4a74335f997a2be651af27d3727474a8091424101a83a71eebfb languageName: node linkType: hard @@ -1362,7 +1362,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^18.2.14": +"@types/react@npm:*": version: 18.2.14 resolution: "@types/react@npm:18.2.14" dependencies: @@ -1373,6 +1373,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^18.2.15": + version: 18.2.15 + resolution: "@types/react@npm:18.2.15" + dependencies: + "@types/prop-types": "*" + "@types/scheduler": "*" + csstype: ^3.0.2 + checksum: d1999bd8a565704a9885e3b7a44d93d8d70beb0aae7b3c66139d98832b6dddf82da790519ac9c6502d57504af1cb729c6edb3bf506fe14386a364618884ed0a2 + languageName: node + linkType: hard + "@types/scheduler@npm:*": version: 0.16.3 resolution: "@types/scheduler@npm:0.16.3" @@ -1524,10 +1535,10 @@ __metadata: "@preact/compat": ^17.1.2 "@preact/preset-vite": ^2.5.0 "@table-library/react-table-library": 4.1.4 - "@types/lodash-es": ^4.17.7 - "@types/node": ^20.4.1 - "@types/react": ^18.2.14 - "@types/react-dom": ^18.2.6 + "@types/lodash-es": ^4.17.8 + "@types/node": ^20.4.2 + "@types/react": ^18.2.15 + "@types/react-dom": ^18.2.7 "@types/react-router-dom": ^5.3.3 "@typescript-eslint/eslint-plugin": ^6.0.0 "@typescript-eslint/parser": ^6.0.0 @@ -1535,7 +1546,7 @@ __metadata: async-validator: ^4.2.5 eslint: ^8.44.0 eslint-config-airbnb: ^19.0.4 - eslint-config-airbnb-typescript: ^17.0.0 + eslint-config-airbnb-typescript: ^17.1.0 eslint-config-prettier: ^8.8.0 eslint-import-resolver-typescript: ^3.5.5 eslint-plugin-autofix: ^1.1.0 @@ -2608,17 +2619,17 @@ __metadata: languageName: node linkType: hard -"eslint-config-airbnb-typescript@npm:^17.0.0": - version: 17.0.0 - resolution: "eslint-config-airbnb-typescript@npm:17.0.0" +"eslint-config-airbnb-typescript@npm:^17.1.0": + version: 17.1.0 + resolution: "eslint-config-airbnb-typescript@npm:17.1.0" dependencies: eslint-config-airbnb-base: ^15.0.0 peerDependencies: - "@typescript-eslint/eslint-plugin": ^5.13.0 - "@typescript-eslint/parser": ^5.0.0 + "@typescript-eslint/eslint-plugin": ^5.13.0 || ^6.0.0 + "@typescript-eslint/parser": ^5.0.0 || ^6.0.0 eslint: ^7.32.0 || ^8.2.0 eslint-plugin-import: ^2.25.3 - checksum: 9a8ce73c5a52ff1f82842ff95fca9313bb826ade8733d2dc25aa65781969282a5825fb5ac1b89c9d2e18da439aa3dc03486c2c405158559d0b1400e08593557e + checksum: 46d1753d660fe4225ccd89e91dd9f812db490326dfb835cfb786ab0b9a4ca25a39171a838661233b8f6f9a19294aaedaa962e19df915066beb80e7422749f7f1 languageName: node linkType: hard diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index 30b8580d8..fa0c2112f 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -1645,7 +1645,7 @@ bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, c Helpers::translated_word(FL_(minutes))); json[name] = time_s; } else { - json[name] = serialized(Helpers::render_value(val, time_value, 1)); + json[name] = serialized(Helpers::render_value(val, time_value, 0)); } } diff --git a/src/emsesp.cpp b/src/emsesp.cpp index 94552fe4d..21d44155d 100644 --- a/src/emsesp.cpp +++ b/src/emsesp.cpp @@ -849,12 +849,13 @@ void EMSESP::process_version(std::shared_ptr telegram) { bool EMSESP::process_telegram(std::shared_ptr telegram) { // if watching or reading... if ((telegram->type_id == read_id_ || telegram->type_id == response_id_) && (telegram->dest == txservice_.ems_bus_id())) { + // show log for read and response LOG_NOTICE("%s", pretty_telegram(telegram).c_str()); if (telegram->type_id == response_id_) { publish_response(telegram); response_id_ = 0; } - + // check if read is finished or gives more parts if (!read_next_) { read_id_ = WATCH_ID_NONE; } @@ -1315,7 +1316,8 @@ void EMSESP::incoming_telegram(uint8_t * data, const uint8_t length) { tx_successful = true; // if telegram is longer read next part with offset +25 for ems+ or +27 for ems1.0 - if ((length >= 31) && (txservice_.read_next_tx(data[3], length) == read_id_)) { + // not for response to raw send commands + if ((response_id_ == 0) && (length >= 31) && (txservice_.read_next_tx(data[3], length) == read_id_)) { read_next_ = true; } } diff --git a/src/web/WebEntityService.cpp b/src/web/WebEntityService.cpp index 8a01325ff..68a96f31f 100644 --- a/src/web/WebEntityService.cpp +++ b/src/web/WebEntityService.cpp @@ -252,8 +252,8 @@ bool WebEntityService::get_value_info(JsonObject & output, const char * cmd) { output["readable"] = true; output["writeable"] = entity.writeable; output["visible"] = true; - output["device_id"] = entity.device_id; - output["type_id"] = entity.type_id; + output["device_id"] = Helpers::hextoa(entity.device_id); + output["type_id"] = Helpers::hextoa(entity.type_id); output["offset"] = entity.offset; if (entity.value_type != DeviceValueType::BOOL && entity.value_type != DeviceValueType::STRING) { output["factor"] = entity.factor;