Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

Merge pull request #5563 from TD-er/bugfix/sort_custom_vars_ESP32_only

Browse Source 
[SysVarSort] Only sort system variables on ESP32 due to build size
This commit is contained in:
TD-er
2026-06-08 09:13:03 +02:00
committed by GitHub
parent 673f5bbdc3 30ca5c6370
commit 77e8b8290a
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -94,3 +94,5 @@ sdkconfig.*
src/Custom_.h
compile_commands.json
*.Identifier
src/src/WebServer/SysVarPage.cpp
+10 -5
View File
@@ -18,6 +18,11 @@
# include "../Helpers/SystemVariables.h"
#if defined(ESP32) && (!defined(LIMIT_BUILD_SIZE) || FEATURE_STRING_VARIABLES)
#define FEATURE_CUSTOM_STRING_SORT 1
#else
#define FEATURE_CUSTOM_STRING_SORT 0
#endif
// ********************************************************************************
// Web Interface sysvars showing all system vars and their value.
// ********************************************************************************
@@ -52,7 +57,7 @@ void handle_sysvars() {
html_table_header(F("URL encoded"), F("RTDReference/SystemVariable.html"), 0);
addTableSeparator(F("Custom Variables"), 3, 3);
# if !defined(LIMIT_BUILD_SIZE) || FEATURE_STRING_VARIABLES
#if FEATURE_CUSTOM_STRING_SORT
auto numAlphaSort = [](const String& a, const String& b) {
const int32_t ai = a.toInt();
const int32_t bi = b.toInt();
@@ -64,7 +69,7 @@ void handle_sysvars() {
};
std::vector<String> customStringSort;
# endif // if !defined(LIMIT_BUILD_SIZE) || FEATURE_STRING_VARIABLES
# endif // FEATURE_CUSTOM_STRING_SORT
if (customFloatVar.empty()) {
html_TR_TD();
@@ -72,7 +77,7 @@ void handle_sysvars() {
html_TD();
html_TD();
} else {
# if !defined(LIMIT_BUILD_SIZE) || FEATURE_STRING_VARIABLES
#if FEATURE_CUSTOM_STRING_SORT
for (auto it = customFloatVar.begin(); it != customFloatVar.end(); ++it) {
customStringSort.push_back(it->first);
@@ -88,7 +93,7 @@ void handle_sysvars() {
}
addSysVar_html(strformat(F("%%%s%s%%"), FsP(isv_ ? F("v_") : F("v")), it.c_str()), false);
}
# else // if !defined(LIMIT_BUILD_SIZE) || FEATURE_STRING_VARIABLES
# else // FEATURE_CUSTOM_STRING_SORT
for (auto it = customFloatVar.begin(); it != customFloatVar.end(); ++it) {
NumericalType detectedType;
bool isv_ = true;
@@ -98,7 +103,7 @@ void handle_sysvars() {
}
addSysVar_html(strformat(F("%%%s%s%%"), FsP(isv_ ? F("v_") : F("v")), it->first.c_str()), false);
}
# endif // if !defined(LIMIT_BUILD_SIZE) || FEATURE_STRING_VARIABLES
# endif // FEATURE_CUSTOM_STRING_SORT
}
# if FEATURE_STRING_VARIABLES