From ce84aae9504094faa1417eba27250b2fef809418 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 18 Jul 2024 15:00:18 +0200 Subject: [PATCH 1/7] removed obsolete files --- scripts/boot_app0.bin | Bin 8192 -> 0 bytes scripts/bootloader.bin | Bin 15888 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100755 scripts/boot_app0.bin delete mode 100644 scripts/bootloader.bin diff --git a/scripts/boot_app0.bin b/scripts/boot_app0.bin deleted file mode 100755 index 13562cabb9648287fdf70d2a22789fdf1e4156b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8192 zcmeI#u?+wq2n0Z!&B7Ip%ZdwNPjZydJlFk*h+E9ra}_6R0t5&UAV7cs0RjXF5FkLH gk-)3}W&dyVhNuJx5FkK+009C72oNAZfWSu}0Te{nn*aa+ diff --git a/scripts/bootloader.bin b/scripts/bootloader.bin deleted file mode 100644 index 01419bff9ddec101303cf823745f0d8f3bffd769..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15888 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�cm4_x=5Cdi$TJa{|@Yk!3%^x!>`3ydU7- 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 From 3af3d3f0d87d65bfe24fd55dcdaa26a89430bf56 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 18 Jul 2024 15:00:25 +0200 Subject: [PATCH 2/7] add comments --- lib/ESPAsyncWebServer/src/AsyncJson.h | 2 +- lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ESPAsyncWebServer/src/AsyncJson.h b/lib/ESPAsyncWebServer/src/AsyncJson.h index c1c604d54..1db57c991 100644 --- a/lib/ESPAsyncWebServer/src/AsyncJson.h +++ b/lib/ESPAsyncWebServer/src/AsyncJson.h @@ -41,7 +41,7 @@ class ChunkPrint : public Print { } }; -// added msgPack by Proddy +// added msgPack by proddy for EMS-ESP class AsyncJsonResponse : public AsyncAbstractResponse { protected: JsonDocument _jsonBuffer; diff --git a/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h b/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h index 7526b6254..c864d40ce 100644 --- a/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h +++ b/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h @@ -329,9 +329,7 @@ class AsyncWebServerRequest { AsyncResponseStream * beginResponseStream(const String & contentType, size_t bufferSize = 1460); AsyncWebServerResponse * beginResponse_P(int code, const String & contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback = nullptr); AsyncWebServerResponse * beginResponse_P(int code, const String & contentType, PGM_P content, AwsTemplateProcessor callback = nullptr); - - // added by proddy for EMS-ESP - AsyncWebServerResponse * beginResponse(const String & contentType, const uint8_t * content, size_t len); + AsyncWebServerResponse * beginResponse(const String & contentType, const uint8_t * content, size_t len); // added by proddy for EMS-ESP size_t headers() const; // get header count bool hasHeader(const String & name) const; // check if header exists From 7826f3b873633aadd0cac8a90f7dde1e44aace3f Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 18 Jul 2024 15:00:38 +0200 Subject: [PATCH 3/7] add HA API test --- test/api_test.http | 20 ++++++++++++++++++++ test/api_test.sh | 16 ++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100755 test/api_test.sh diff --git a/test/api_test.http b/test/api_test.http index 8af1807e8..71012060a 100755 --- a/test/api_test.http +++ b/test/api_test.http @@ -146,3 +146,23 @@ Content-Type: application/json < ./standalone_file_export/emsesp_settings.json ------WebKitFormBoundary7MA4YWxkTrZu0gW-- +# test calling Home Assistant script +# https://developers.home-assistant.io/docs/api/rest/#post-apiservicesdomainservice +POST {{host_standalone}}/api + +# HA + +@ha = http://192.168.1.42:8123 +@ha_token = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIwMzMyZjU1MjhlZmM0NGIyOTgyMjIxNThiODU1NDkyNSIsImlhdCI6MTcyMTMwNDg2NSwiZXhwIjoyMDM2NjY0ODY1fQ.Q-Y7E_i7clH3ff4Ma-OMmhZfbN7aMi_CahKwmoar + +### + +GET {{ha}}/api/services +Content-Type: application/json +Authorization: Bearer {{ha_token}} + +### + +POST {{ha}}/api/services/script/test_notify +Content-Type: application/json +Authorization: Bearer {{ha_token}} diff --git a/test/api_test.sh b/test/api_test.sh new file mode 100755 index 000000000..c6e464831 --- /dev/null +++ b/test/api_test.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# API + +curl -X GET http://ems-esp.local/api/system/info +echo "\n" + +# HA + +ha_url="http://192.168.1.42:8123" +ha_token="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIwMzMyZjU1MjhlZmM0NGIyOTgyMjIxNThiODU1NDkyNSIsImlhdCI6MTcyMTMwNDg2NSwiZXhwIjoyMDM2NjY0ODY1fQ.Q-Y7E_i7clH3ff4Ma-OMmhZfbN7aMi_CahKwmoar" + +curl -X POST \ + ${ha_url}/api/services/script/test_notify \ + -H "Authorization: Bearer ${ha_token}" \ + -H "Content-Type: application/json" \ From 887cd33f5bff8e91ca51c97b9eed07cac45cc2f7 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 18 Jul 2024 15:59:13 +0200 Subject: [PATCH 4/7] change order of menu items, make all bus status clickable for bbqkees --- .../src/framework/system/SystemStatus.tsx | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/interface/src/framework/system/SystemStatus.tsx b/interface/src/framework/system/SystemStatus.tsx index 5a6d65383..3a60cc832 100644 --- a/interface/src/framework/system/SystemStatus.tsx +++ b/interface/src/framework/system/SystemStatus.tsx @@ -314,16 +314,6 @@ const SystemStatus: FC = () => { return ( <> - - - - - - - - - - @@ -347,7 +337,6 @@ const SystemStatus: FC = () => { - @@ -375,8 +364,8 @@ const SystemStatus: FC = () => { )} - + { text={data.emsesp_version} to="/settings/upload" /> - + + + + { text={formatNumber(data.free_heap) + ' KB' + ' ' + LL.FREE_MEMORY()} to="/system/espsystemstatus" /> - + { text={networkStatus()} to="/settings/network/status" /> - + { text={data.mqtt_status ? LL.ACTIVE() : LL.INACTIVE(0)} to="/settings/mqtt/status" /> - + { text={ntpStatus()} to="/settings/ntp/status" /> - + Date: Fri, 19 Jul 2024 10:11:45 +0200 Subject: [PATCH 5/7] package update --- interface/package.json | 4 +- interface/yarn.lock | 135 +++++++++++++++++++++++++++-------------- 2 files changed, 90 insertions(+), 49 deletions(-) diff --git a/interface/package.json b/interface/package.json index 6cfa89f3a..f7031d810 100644 --- a/interface/package.json +++ b/interface/package.json @@ -24,8 +24,8 @@ "dependencies": { "@alova/adapter-xhr": "^1.0.6", "@alova/scene-react": "^1.6.1", - "@emotion/react": "^11.11.4", - "@emotion/styled": "^11.11.5", + "@emotion/react": "^11.12.0", + "@emotion/styled": "^11.12.0", "@mui/icons-material": "^5.16.4", "@mui/material": "^5.16.4", "@table-library/react-table-library": "4.1.7", diff --git a/interface/yarn.lock b/interface/yarn.lock index 42ea62bac..e60cab673 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -665,22 +665,22 @@ __metadata: languageName: node linkType: hard -"@emotion/babel-plugin@npm:^11.11.0": - version: 11.11.0 - resolution: "@emotion/babel-plugin@npm:11.11.0" +"@emotion/babel-plugin@npm:^11.12.0": + version: 11.12.0 + resolution: "@emotion/babel-plugin@npm:11.12.0" dependencies: "@babel/helper-module-imports": "npm:^7.16.7" "@babel/runtime": "npm:^7.18.3" - "@emotion/hash": "npm:^0.9.1" - "@emotion/memoize": "npm:^0.8.1" - "@emotion/serialize": "npm:^1.1.2" + "@emotion/hash": "npm:^0.9.2" + "@emotion/memoize": "npm:^0.9.0" + "@emotion/serialize": "npm:^1.2.0" babel-plugin-macros: "npm:^3.1.0" convert-source-map: "npm:^1.5.0" escape-string-regexp: "npm:^4.0.0" find-root: "npm:^1.1.0" source-map: "npm:^0.5.7" stylis: "npm:4.2.0" - checksum: 10c0/89cbb6ec0e52c8ee9c2a4b9889ccd4fc3a75d28091d835bfac6d7c4565d3338621e23af0a85f3bcd133e1cae795c692e1dadada015784d4b0554aa5bb111df43 + checksum: 10c0/930ff6f8768b0c24d05896ad696be20e1c65f32ed61fb5c1488f571120a947ef0a2cf69187b17114cc76e7886f771fac150876ed7b5341324fec2377185d6573 languageName: node linkType: hard @@ -697,19 +697,32 @@ __metadata: languageName: node linkType: hard -"@emotion/hash@npm:^0.9.1": - version: 0.9.1 - resolution: "@emotion/hash@npm:0.9.1" - checksum: 10c0/cdafe5da63fc1137f3db6e232fdcde9188b2b47ee66c56c29137199642a4086f42382d866911cfb4833cae2cc00271ab45cad3946b024f67b527bb7fac7f4c9d +"@emotion/cache@npm:^11.12.0": + version: 11.12.0 + resolution: "@emotion/cache@npm:11.12.0" + dependencies: + "@emotion/memoize": "npm:^0.9.0" + "@emotion/sheet": "npm:^1.3.0" + "@emotion/utils": "npm:^1.3.0" + "@emotion/weak-memoize": "npm:^0.4.0" + stylis: "npm:4.2.0" + checksum: 10c0/b6909597a41dfc1d07ada1b8a719697d2c0155a8f71c14079b7a089e281093a4c0710933592c864185e9176621ce6eff96e5ce2eb6774ba7959235232892d3c8 languageName: node linkType: hard -"@emotion/is-prop-valid@npm:^1.2.2": - version: 1.2.2 - resolution: "@emotion/is-prop-valid@npm:1.2.2" +"@emotion/hash@npm:^0.9.2": + version: 0.9.2 + resolution: "@emotion/hash@npm:0.9.2" + checksum: 10c0/0dc254561a3cc0a06a10bbce7f6a997883fd240c8c1928b93713f803a2e9153a257a488537012efe89dbe1246f2abfe2add62cdb3471a13d67137fcb808e81c2 + languageName: node + linkType: hard + +"@emotion/is-prop-valid@npm:^1.3.0": + version: 1.3.0 + resolution: "@emotion/is-prop-valid@npm:1.3.0" dependencies: - "@emotion/memoize": "npm:^0.8.1" - checksum: 10c0/bb1530dcb4e0e5a4fabb219279f2d0bc35796baf66f6241f98b0d03db1985c890a8cafbea268e0edefd5eeda143dbd5c09a54b5fba74cee8c69b98b13194af50 + "@emotion/memoize": "npm:^0.9.0" + checksum: 10c0/4620b62aaca4b3b610202513652872756d7f4a8b84b2cea6b798dd6e8ccdfe43944b956c6a6a8cb5da0b0fe61bef6caca273d198ba32b5c658df22a6c7371b1b languageName: node linkType: hard @@ -720,37 +733,44 @@ __metadata: languageName: node linkType: hard -"@emotion/react@npm:^11.11.4": - version: 11.11.4 - resolution: "@emotion/react@npm:11.11.4" +"@emotion/memoize@npm:^0.9.0": + version: 0.9.0 + resolution: "@emotion/memoize@npm:0.9.0" + checksum: 10c0/13f474a9201c7f88b543e6ea42f55c04fb2fdc05e6c5a3108aced2f7e7aa7eda7794c56bba02985a46d8aaa914fcdde238727a98341a96e2aec750d372dadd15 + languageName: node + linkType: hard + +"@emotion/react@npm:^11.12.0": + version: 11.12.0 + resolution: "@emotion/react@npm:11.12.0" dependencies: "@babel/runtime": "npm:^7.18.3" - "@emotion/babel-plugin": "npm:^11.11.0" - "@emotion/cache": "npm:^11.11.0" - "@emotion/serialize": "npm:^1.1.3" + "@emotion/babel-plugin": "npm:^11.12.0" + "@emotion/cache": "npm:^11.12.0" + "@emotion/serialize": "npm:^1.2.0" "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" - "@emotion/utils": "npm:^1.2.1" - "@emotion/weak-memoize": "npm:^0.3.1" + "@emotion/utils": "npm:^1.3.0" + "@emotion/weak-memoize": "npm:^0.4.0" hoist-non-react-statics: "npm:^3.3.1" peerDependencies: react: ">=16.8.0" peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/6df892fd9e04b5c8c37aacfd7f461631e04e00e845edc3c5b2955ab8ad681abf5cd49584101f579427e08b82f2f88369c78d37ae2fe9360a8f68fd4e51b8e448 + checksum: 10c0/a2035e0a5788ec6748b595ae898732aa845515dea52657fcf2661288d01c7da16133588fdaa4288c05175dc4c39938546af265bb039065efca20a729c486da9b languageName: node linkType: hard -"@emotion/serialize@npm:^1.1.2, @emotion/serialize@npm:^1.1.3, @emotion/serialize@npm:^1.1.4": - version: 1.1.4 - resolution: "@emotion/serialize@npm:1.1.4" +"@emotion/serialize@npm:^1.2.0": + version: 1.2.0 + resolution: "@emotion/serialize@npm:1.2.0" dependencies: - "@emotion/hash": "npm:^0.9.1" - "@emotion/memoize": "npm:^0.8.1" - "@emotion/unitless": "npm:^0.8.1" - "@emotion/utils": "npm:^1.2.1" + "@emotion/hash": "npm:^0.9.2" + "@emotion/memoize": "npm:^0.9.0" + "@emotion/unitless": "npm:^0.9.0" + "@emotion/utils": "npm:^1.3.0" csstype: "npm:^3.0.2" - checksum: 10c0/164d936f72382594c47b9c24e67a51c7fc16b83d9a36b84eec5e4cb9bf7be029218a490ef4b44233a1b53423bdb3905d65b597cde3ebba759d40dab7a4c99121 + checksum: 10c0/bac56ccc42b4842bbb55139296bfef812ec6d26cf92db1a7adfc90dcab8d2b717706828ff474feff227ef1a5f611020c5a2443ba600ed01d28095f0201b352e2 languageName: node linkType: hard @@ -761,30 +781,37 @@ __metadata: languageName: node linkType: hard -"@emotion/styled@npm:^11.11.5": - version: 11.11.5 - resolution: "@emotion/styled@npm:11.11.5" +"@emotion/sheet@npm:^1.3.0": + version: 1.3.0 + resolution: "@emotion/sheet@npm:1.3.0" + checksum: 10c0/99ce618d426e0646f58591200619cf3cd6f452e829c0b0339f66b3e4bfd7d51773f49d0200e14334861bee9db1dfb5d46328b20eafbfdd28f857584688fad8f4 + languageName: node + linkType: hard + +"@emotion/styled@npm:^11.12.0": + version: 11.12.0 + resolution: "@emotion/styled@npm:11.12.0" dependencies: "@babel/runtime": "npm:^7.18.3" - "@emotion/babel-plugin": "npm:^11.11.0" - "@emotion/is-prop-valid": "npm:^1.2.2" - "@emotion/serialize": "npm:^1.1.4" + "@emotion/babel-plugin": "npm:^11.12.0" + "@emotion/is-prop-valid": "npm:^1.3.0" + "@emotion/serialize": "npm:^1.2.0" "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" - "@emotion/utils": "npm:^1.2.1" + "@emotion/utils": "npm:^1.3.0" peerDependencies: "@emotion/react": ^11.0.0-rc.0 react: ">=16.8.0" peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/27da6ad7f5b374d61cfe6647cc2f93ee3ceb1139a51907050576ee30da0a50a27b0bbed45f76889d560d2a8ccf8bc4a4f7126cad3f00127e107c11093dc0a801 + checksum: 10c0/f87466ade3c872c6452091969f2784b97dcec821f812f641088e1289ad039ddea7165e8b1221895911f199469d07a9ffc786434e496ae3cb62156f72a5686ad7 languageName: node linkType: hard -"@emotion/unitless@npm:^0.8.1": - version: 0.8.1 - resolution: "@emotion/unitless@npm:0.8.1" - checksum: 10c0/a1ed508628288f40bfe6dd17d431ed899c067a899fa293a13afe3aed1d70fac0412b8a215fafab0b42829360db687fecd763e5f01a64ddc4a4b58ec3112ff548 +"@emotion/unitless@npm:^0.9.0": + version: 0.9.0 + resolution: "@emotion/unitless@npm:0.9.0" + checksum: 10c0/f907d968a49315bb654b5734edf3315e52350f77c160a63f3437f14d80610dc78fd8295e759e7339055c45bd25c74c46363235c5971aae5587f7eeb969580c4c languageName: node linkType: hard @@ -804,6 +831,13 @@ __metadata: languageName: node linkType: hard +"@emotion/utils@npm:^1.3.0": + version: 1.3.0 + resolution: "@emotion/utils@npm:1.3.0" + checksum: 10c0/a42ec56b78e4fea16d120da31fb1d5ccffb9ad372e26c620eb6fe3ca5bb63f9d0d88497af01cd503e4baea9b1dd6d4fe04b897b7720c26a53eee8b993bc8000d + languageName: node + linkType: hard + "@emotion/weak-memoize@npm:^0.3.1": version: 0.3.1 resolution: "@emotion/weak-memoize@npm:0.3.1" @@ -811,6 +845,13 @@ __metadata: languageName: node linkType: hard +"@emotion/weak-memoize@npm:^0.4.0": + version: 0.4.0 + resolution: "@emotion/weak-memoize@npm:0.4.0" + checksum: 10c0/64376af11f1266042d03b3305c30b7502e6084868e33327e944b539091a472f089db307af69240f7188f8bc6b319276fd7b141a36613f1160d73d12a60f6ca1a + languageName: node + linkType: hard + "@esbuild/aix-ppc64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/aix-ppc64@npm:0.21.5" @@ -2013,8 +2054,8 @@ __metadata: "@alova/adapter-xhr": "npm:^1.0.6" "@alova/scene-react": "npm:^1.6.1" "@babel/core": "npm:^7.24.9" - "@emotion/react": "npm:^11.11.4" - "@emotion/styled": "npm:^11.11.5" + "@emotion/react": "npm:^11.12.0" + "@emotion/styled": "npm:^11.12.0" "@eslint/js": "npm:^9.7.0" "@mui/icons-material": "npm:^5.16.4" "@mui/material": "npm:^5.16.4" From d8c1a7e82d8ddab534544cb1b3347fe841d17e27 Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 19 Jul 2024 10:12:03 +0200 Subject: [PATCH 6/7] show brand in system/info --- src/system.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/system.cpp b/src/system.cpp index 0d76b31ed..25ffdc458 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1359,6 +1359,7 @@ bool System::get_value_info(JsonObject root, const char * command) { // export status information including the device information // http://ems-esp/api/system/info +// TODO camelCase - #1860 bool System::command_info(const char * value, const int8_t id, JsonObject output) { JsonObject node; @@ -1413,7 +1414,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output #endif EMSESP::esp8266React.getNetworkSettingsService()->read([&](NetworkSettings & settings) { if (WiFi.status() == WL_CONNECTED && !settings.bssid.isEmpty()) { - node["BSSID"] = "set"; // TODO why is this not the actual value?? + node["BSSID"] = "set"; // we don't disclose the name } node["TxPower setting"] = settings.tx_power; node["static ip config"] = settings.staticIPConfig; @@ -1591,6 +1592,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output obj["name"] = emsdevice->name(); // custom name obj["device id"] = Helpers::hextoa(emsdevice->device_id()); obj["product id"] = emsdevice->product_id(); + obj["brand"] = emsdevice->brand_to_char(); obj["version"] = emsdevice->version(); obj["entities"] = emsdevice->count_entities(); char result[500]; From 9efd9f27fc6c3281e811a7a0e0651d7faf6ff039 Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 19 Jul 2024 10:12:11 +0200 Subject: [PATCH 7/7] add comment --- src/mqtt.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mqtt.cpp b/src/mqtt.cpp index 06d1151f1..91f578182 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -580,6 +580,7 @@ void Mqtt::ha_status() { #endif // These come from the heartbeat MQTT topic + // we don't use camelCase as it would change the HA entity_id and impact historic data publish_system_ha_sensor_config(DeviceValueType::STRING, "EMS Bus", "bus_status", DeviceValueUOM::NONE); publish_system_ha_sensor_config(DeviceValueType::STRING, "Uptime", "uptime", DeviceValueUOM::NONE); publish_system_ha_sensor_config(DeviceValueType::INT8, "Uptime (sec)", "uptime_sec", DeviceValueUOM::SECONDS);