From 57c4d550a37aede2911a1d0872eda5fb3d109303 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 17:33:16 +0100 Subject: [PATCH 1/5] ESPAsyncWebServer @ 3.7.2 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 48ed0482f..b1f01ef30 100644 --- a/platformio.ini +++ b/platformio.ini @@ -127,7 +127,7 @@ board_build.filesystem = littlefs lib_deps = bblanchon/ArduinoJson @ 7.3.1 ESP32Async/AsyncTCP @ 3.3.6 - ESP32Async/ESPAsyncWebServer @ 3.7.1 + ESP32Async/ESPAsyncWebServer @ 3.7.2 https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.5 ; From 44c4ee8bc07a8754d2654d6fb1b04928ecadc3a1 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 17:33:31 +0100 Subject: [PATCH 2/5] show device id in hex --- src/core/system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index 2503c5a99..e51e8c4d6 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -2115,7 +2115,7 @@ bool System::readCommand(const char * data) { strlcpy(value, p, 10); // get string device_id = (uint8_t)Helpers::hextoint(value); // convert hex to int if (!EMSESP::valid_device(device_id)) { - LOG_ERROR("Invalid device ID (%d) in read command", device_id); + LOG_ERROR("Invalid device ID (0x%02X) in read command", device_id); return false; // invalid device } } From 04ac3be242635cebae6bfbad85518357a1e48115 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 17:44:53 +0100 Subject: [PATCH 3/5] adjust cache --- interface/src/api/endpoints.ts | 2 +- interface/src/api/system.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/interface/src/api/endpoints.ts b/interface/src/api/endpoints.ts index cbc0a4bca..d3b2a4c93 100644 --- a/interface/src/api/endpoints.ts +++ b/interface/src/api/endpoints.ts @@ -9,7 +9,7 @@ export const ACCESS_TOKEN = 'access_token'; export const alovaInstance = createAlova({ statesHook: ReactHook, // timeout: 3000, // 3 seconds before throwing a timeout error, default is 0 = none - cacheFor: null, // disable cache + // cacheFor: null, // disable cache // cacheFor: { // GET: { // mode: 'memory', diff --git a/interface/src/api/system.ts b/interface/src/api/system.ts index 387fddcc3..99162e20f 100644 --- a/interface/src/api/system.ts +++ b/interface/src/api/system.ts @@ -14,8 +14,10 @@ export const updateLogSettings = (data: LogSettings) => export const fetchLogES = () => alovaInstance.Get('/es/log'); // Get versions from GitHub +// cache for 10 minutes to stop getting the IP blocked by GitHub export const getStableVersion = () => alovaInstanceGH.Get('latest', { + cacheFor: 60 * 10 * 1000, transform(response: { data: { name: string; published_at: string } }) { return { name: response.data.name.substring(1), @@ -25,6 +27,7 @@ export const getStableVersion = () => }); export const getDevVersion = () => alovaInstanceGH.Get('tags/latest', { + cacheFor: 60 * 10 * 1000, transform(response: { data: { name: string; published_at: string } }) { return { name: response.data.name.split(/\s+/).splice(-1)[0].substring(1), From 110c0df6fbef9a2e9c9d57ce7706e795288addbc Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 21:38:12 +0100 Subject: [PATCH 4/5] change test log message --- mock-api/mockServer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mock-api/mockServer.js b/mock-api/mockServer.js index 88bc0a9a0..9951d31de 100644 --- a/mock-api/mockServer.js +++ b/mock-api/mockServer.js @@ -105,7 +105,7 @@ export default () => { let message = 'message #' + count; if (count % 6 === 1) { message += - ' with a long message that will be wrapped, to see if it stays one a single line'; + ' that is a long message that will be wrapped, to test if it gets truncated'; } const data = { t: new Date().toISOString(), From c37c1aaad5d2b03af15c86132407229c19be2610 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 21:38:24 +0100 Subject: [PATCH 5/5] size of log level box --- interface/src/app/status/SystemLog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/app/status/SystemLog.tsx b/interface/src/app/status/SystemLog.tsx index f8178532e..ee0207713 100644 --- a/interface/src/app/status/SystemLog.tsx +++ b/interface/src/app/status/SystemLog.tsx @@ -201,7 +201,7 @@ const SystemLog = () => { name="level" label={LL.LOG_LEVEL()} value={data.level} - sx={{ width: '10ch' }} + sx={{ width: '14ch' }} variant="outlined" onChange={updateFormValue} margin="normal"