From d59a93e730262dfde624eae178ee20c672a1047a Mon Sep 17 00:00:00 2001 From: Torsten Stauder Date: Mon, 8 Nov 2021 22:51:19 +0100 Subject: [PATCH] Print IDF-version at boot and via GUI --- src/Web.cpp | 8 ++++++++ src/main.cpp | 6 +++++- src/revision.h | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Web.cpp b/src/Web.cpp index 7abe1e7..e2d41ba 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -162,6 +162,10 @@ void webserverStart(void) { if (Wlan_IsConnected()) { info += "\nWLAN-Signalstaerke: " + String((int8_t)Wlan_GetRssi()) + " dBm"; } + info += "\nESP-IDF-version (major): "; + info += ESP_IDF_VERSION_MAJOR; + info += "\nESP-IDF-version (minor): "; + info += ESP_IDF_VERSION_MINOR; #else String info = "Free heap: " + String(ESP.getFreeHeap()) + " bytes"; info += "\nLargest free heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)) + " bytes"; @@ -170,6 +174,10 @@ void webserverStart(void) { if (Wlan_IsConnected()) { info += "\nWiFi signal-strength: " + String((int8_t)Wlan_GetRssi()) + " dBm"; } + info += "ESP-IDF major: "; + info += ESP_IDF_VERSION_MAJOR; + info += "\nESP-IDF minor: "; + info += ESP_IDF_VERSION_MINOR; #endif #ifdef MEASURE_BATTERY_VOLTAGE snprintf(Log_Buffer, Log_BufferLength, "\n%s: %.2f V", (char *) FPSTR(currentVoltageMsg), Battery_GetVoltage()); diff --git a/src/main.cpp b/src/main.cpp index ecd38f8..b90b41b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -187,8 +187,12 @@ void setup() { Serial.println(F(" | _| \\__ \\ | |_) | | | | | | | | '_ \\ / _ \\")); Serial.println(F(" | |___ ___) | | __/ | |_| | | | | | | | | (_) |")); Serial.println(F(" |_____| |____/ |_| \\__,_| |_| |_| |_| \\___/ ")); - Serial.print(F(" Rfid-controlled musicplayer\n ")); + Serial.print(F(" Rfid-controlled musicplayer\n\n")); Serial.printf("%s\n\n", softwareRevision); + Serial.print(F("ESP-IDF-version (major): ")); + Serial.println(ESP_IDF_VERSION_MAJOR); + Serial.print(F("ESP-IDF-version (minor): ")); + Serial.println(ESP_IDF_VERSION_MINOR); // print wake-up reason printWakeUpReason(); diff --git a/src/revision.h b/src/revision.h index fd671da..6d644df 100644 --- a/src/revision.h +++ b/src/revision.h @@ -1,4 +1,4 @@ #ifndef __REVISION_H__ #define __REVISION_H__ - constexpr const char softwareRevision[] PROGMEM = "Software-revision: 20211031-1"; + constexpr const char softwareRevision[] PROGMEM = "Software-revision: 20211108-1"; #endif \ No newline at end of file