From 024f639e1f92ab5da140ebb553706ed07679791c Mon Sep 17 00:00:00 2001
From: Torsten Stauder <stauder@ts-cs.de>
Date: Thu, 15 Jul 2021 23:02:16 +0200
Subject: [PATCH] Moving software-revision + adding it to webGUI

---
 src/Web.cpp    | 2 ++
 src/main.cpp   | 5 +++--
 src/revision.h | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 src/revision.h

diff --git a/src/Web.cpp b/src/Web.cpp
index 9aebdf6..e9b029b 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -21,6 +21,7 @@
 #include "System.h"
 #include "Web.h"
 #include "Wlan.h"
+#include "revision.h"
 
 #if (LANGUAGE == DE)
     #include "HTMLaccesspoint_DE.h"
@@ -174,6 +175,7 @@ void webserverStart(void) {
                     snprintf(Log_Buffer, Log_BufferLength, "\n%s: %.2f V", (char *) FPSTR(currentVoltageMsg), Battery_GetVoltage());
                     info += (String) Log_Buffer;
                 #endif
+                info += "\n" + (String) softwareRevision;
                 request->send_P(200, "text/plain", info.c_str());
             });
 
diff --git a/src/main.cpp b/src/main.cpp
index d2f4d8a..bf12abb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,7 @@
 #include "System.h"
 #include "Web.h"
 #include "Wlan.h"
+#include "revision.h"
 
 #ifdef PLAY_LAST_RFID_AFTER_REBOOT
     bool recoverLastRfid = true;
@@ -183,8 +184,8 @@ void setup() {
     Serial.println(F(" |  _|   \\__  \\  | |_) | | | | | | | | '_ \\   / _ \\"));
     Serial.println(F(" | |___   ___) | |  __/  | |_| | | | | | | | | (_) |"));
     Serial.println(F(" |_____| |____/  |_|      \\__,_| |_| |_| |_|  \\___/ "));
-    Serial.println(F(" Rfid-controlled musicplayer\n"));
-    Serial.println(F(" Rev 20210714-1\n"));
+    Serial.print(F(" Rfid-controlled musicplayer\n "));
+    Serial.printf("%s\n\n", softwareRevision);
 
     // print wake-up reason
     printWakeUpReason();
diff --git a/src/revision.h b/src/revision.h
new file mode 100644
index 0000000..b65c3dd
--- /dev/null
+++ b/src/revision.h
@@ -0,0 +1,4 @@
+#ifndef __REVISION_H__
+    #define __REVISION_H__
+    constexpr const char softwareRevision[] PROGMEM = "Software-revision: 20210715-1";
+#endif
\ No newline at end of file