andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-26 16:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

txpause in system info (#1953), added Wemos S3 pins (#2874)

Browse Source
This commit is contained in:
proddy
2026-01-01 10:08:57 +01:00
parent c782deb581
commit ba57942b7d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/system.cpp
View File

@@ -1842,7 +1842,6 @@ std::string System::get_metrics_prometheus() {
for (JsonPair p : obj) { for (JsonPair p : obj) {
std::string key = p.key().c_str(); std::string key = p.key().c_str();
std::string path = prefix.empty() ? key : prefix + "." + key;
std::string metric_name = prefix.empty() ? key : prefix + "_" + key; std::string metric_name = prefix.empty() ? key : prefix + "_" + key;
if (should_ignore(prefix, key)) { if (should_ignore(prefix, key)) {
@@ -1981,6 +1980,7 @@ std::string System::get_metrics_prometheus() {
} }
result += info_metric; result += info_metric;
// TODO fix, as local_info_labels is always empty here
if (!local_info_labels.empty()) { if (!local_info_labels.empty()) {
result += "{"; result += "{";
bool first = true; 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(); node["temperature"] = EMSESP::system_.temperature();
#endif #endif
node["txpause"] = EMSbus::tx_mode() == EMS_TXMODE_OFF;
#endif #endif
// Network Status // Network Status
@@ -2852,7 +2853,8 @@ void System::set_valid_system_gpios() {
// 33-37 for Octal SPI (SPIIO4 through SPIIO7 and SPIDQS) // 33-37 for Octal SPI (SPIIO4 through SPIIO7 and SPIDQS)
// 38 and 39 are input only // 38 and 39 are input only
// 45 and 36 are strapping pins, 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 #elif CONFIG_IDF_TARGET_ESP32
// 1 and 3 are UART0 pins, but used for some eth-boards (BBQKees-E32, OlimexPOE) // 1 and 3 are UART0 pins, but used for some eth-boards (BBQKees-E32, OlimexPOE)
// 32-39 is ADC1, input only // 32-39 is ADC1, input only

2
src/emsesp_version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.8.1-dev.0" #define EMSESP_APP_VERSION "3.8.1-dev.1"