From c782deb581b89250fb8ffa1bb9edf1beba65b9f0 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 1 Jan 2026 10:07:11 +0100 Subject: [PATCH 1/2] package udpate --- interface/pnpm-lock.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/pnpm-lock.yaml b/interface/pnpm-lock.yaml index 9abe3bfaa..e37fff143 100644 --- a/interface/pnpm-lock.yaml +++ b/interface/pnpm-lock.yaml @@ -453,8 +453,8 @@ packages: cpu: [x64] os: [win32] - '@eslint-community/eslint-utils@4.9.0': - resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==} + '@eslint-community/eslint-utils@4.9.1': + resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 @@ -1542,8 +1542,8 @@ packages: resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - esquery@1.6.0: - resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==} + esquery@1.7.0: + resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==} engines: {node: '>=0.10'} esrecurse@4.3.0: @@ -3397,7 +3397,7 @@ snapshots: '@esbuild/win32-x64@0.27.2': optional: true - '@eslint-community/eslint-utils@4.9.0(eslint@9.39.2)': + '@eslint-community/eslint-utils@4.9.1(eslint@9.39.2)': dependencies: eslint: 9.39.2 eslint-visitor-keys: 3.4.3 @@ -3880,7 +3880,7 @@ snapshots: '@typescript-eslint/utils@8.51.0(eslint@9.39.2)(typescript@5.9.3)': dependencies: - '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.2) + '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2) '@typescript-eslint/scope-manager': 8.51.0 '@typescript-eslint/types': 8.51.0 '@typescript-eslint/typescript-estree': 8.51.0(typescript@5.9.3) @@ -4520,7 +4520,7 @@ snapshots: eslint@9.39.2: dependencies: - '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.2) + '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2) '@eslint-community/regexpp': 4.12.2 '@eslint/config-array': 0.21.1 '@eslint/config-helpers': 0.4.2 @@ -4540,7 +4540,7 @@ snapshots: eslint-scope: 8.4.0 eslint-visitor-keys: 4.2.1 espree: 10.4.0 - esquery: 1.6.0 + esquery: 1.7.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 file-entry-cache: 8.0.0 @@ -4563,7 +4563,7 @@ snapshots: acorn-jsx: 5.3.2(acorn@8.15.0) eslint-visitor-keys: 4.2.1 - esquery@1.6.0: + esquery@1.7.0: dependencies: estraverse: 5.3.0 From ba57942b7d832e8dd67bcc91f8ac9c465c4860ff Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 1 Jan 2026 10:08:57 +0100 Subject: [PATCH 2/2] txpause in system info (#1953), added Wemos S3 pins (#2874) --- src/core/system.cpp | 6 ++++-- src/emsesp_version.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index 83b026cbb..e6d152c13 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1842,7 +1842,6 @@ std::string System::get_metrics_prometheus() { for (JsonPair p : obj) { std::string key = p.key().c_str(); - std::string path = prefix.empty() ? key : prefix + "." + key; std::string metric_name = prefix.empty() ? key : prefix + "_" + key; if (should_ignore(prefix, key)) { @@ -1981,6 +1980,7 @@ std::string System::get_metrics_prometheus() { } result += info_metric; + // TODO fix, as local_info_labels is always empty here if (!local_info_labels.empty()) { result += "{"; bool first = true; @@ -2069,6 +2069,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output node["temperature"] = EMSESP::system_.temperature(); #endif + node["txpause"] = EMSbus::tx_mode() == EMS_TXMODE_OFF; #endif // Network Status @@ -2852,7 +2853,8 @@ void System::set_valid_system_gpios() { // 33-37 for Octal SPI (SPIIO4 through SPIIO7 and SPIDQS) // 38 and 39 are input only // 45 and 36 are strapping pins, input only - valid_system_gpios_ = string_range_to_vector("0-14, 17, 18, 21, 33-39, 45, 46"); + // 47 and 48 are valid on a Wemos S3 (https://github.com/emsesp/EMS-ESP32/issues/2874) + valid_system_gpios_ = string_range_to_vector("0-14, 17, 18, 21, 33-39, 45-48"); #elif CONFIG_IDF_TARGET_ESP32 // 1 and 3 are UART0 pins, but used for some eth-boards (BBQKees-E32, OlimexPOE) // 32-39 is ADC1, input only diff --git a/src/emsesp_version.h b/src/emsesp_version.h index 0c91d79cb..013df086d 100644 --- a/src/emsesp_version.h +++ b/src/emsesp_version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.8.1-dev.0" +#define EMSESP_APP_VERSION "3.8.1-dev.1"