* merge PR: fix reboot problem with deactivated power graph #1360
* changed scope of variables and member functions inside display classes
* removed automatically "minimal" builds
* fix include of "settings.h" (was already done in #1360)
* merge PR: Enhancement: Add info about compiled modules to version string #1357
* add info about installed binary to `/update` #1353
* fix lang in `/system` #1346
This commit is contained in:
lumapu 2024-01-14 17:38:37 +01:00
parent 201c96ec3b
commit 6c4e6f9d90
10 changed files with 87 additions and 40 deletions

View file

@ -465,42 +465,42 @@ void app:: zeroIvValues(bool checkAvail, bool skipYieldDay) {
//-----------------------------------------------------------------------------
void app::resetSystem(void) {
snprintf(mVersion, sizeof(mVersion), "%d.%d.%d%s", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH,
"-"
#ifdef ENABLE_PROMETHEUS_EP
"P"
#endif
snprintf(mVersion, sizeof(mVersion), "%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
snprintf(mVersionModules, sizeof(mVersionModules), "%s",
#ifdef ENABLE_PROMETHEUS_EP
"P"
#endif
#ifdef ENABLE_MQTT
"M"
#endif
#ifdef ENABLE_MQTT
"M"
#endif
#ifdef PLUGIN_DISPLAY
"D"
#endif
#ifdef PLUGIN_DISPLAY
"D"
#endif
#ifdef ENABLE_HISTORY
"H"
#endif
#ifdef ENABLE_HISTORY
"H"
#endif
#ifdef AP_ONLY
"A"
#endif
#ifdef AP_ONLY
"A"
#endif
#ifdef ENABLE_SYSLOG
"Y"
#endif
#ifdef ENABLE_SYSLOG
"Y"
#endif
#ifdef ENABLE_SIMULATOR
"S"
#endif
#ifdef ENABLE_SIMULATOR
"S"
#endif
"-"
#ifdef LANG_DE
"de"
#else
"en"
#endif
"-"
#ifdef LANG_DE
"de"
#else
"en"
#endif
);
#ifdef AP_ONLY