From 443bd67f815850bb98849fe033880a4136ff27a7 Mon Sep 17 00:00:00 2001
From: CaCO3 <caco3@ruinelli.ch>
Date: Wed, 21 Dec 2022 21:26:52 +0100
Subject: [PATCH] show release in log instead of branch (#1660)

Co-authored-by: CaCO3 <caco@ruinelli.ch>
---
 code/main/main.cpp        |  4 ++--
 code/main/server_main.cpp | 10 +---------
 code/main/version.h       | 13 +++++++++++++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/code/main/main.cpp b/code/main/main.cpp
index dce3395d..567e108d 100644
--- a/code/main/main.cpp
+++ b/code/main/main.cpp
@@ -44,6 +44,7 @@ extern const char* GIT_REV;
 extern const char* GIT_BRANCH;
 extern const char* BUILD_TIME;
 
+extern std::string getFwVersion(void);
 extern std::string getHTMLversion(void);
 extern std::string getHTMLcommit(void);
 
@@ -155,8 +156,7 @@ extern "C" void app_main(void)
         return; // No way to continue without SD-Card!
     }
 
-    string versionFormated = "Branch: '" + std::string(GIT_BRANCH) + \
-        "', Revision: " + std::string(GIT_REV) +", Date/Time: " + std::string(BUILD_TIME) + \
+    string versionFormated = getFwVersion() + ", Date/Time: " + std::string(BUILD_TIME) + \
         ", Web UI: " + getHTMLversion();
 
     if (std::string(GIT_TAG) != "") { // We are on a tag, add it as prefix
diff --git a/code/main/server_main.cpp b/code/main/server_main.cpp
index 7ee7a310..f028a648 100644
--- a/code/main/server_main.cpp
+++ b/code/main/server_main.cpp
@@ -74,15 +74,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
     }
     else if (_task.compare("FirmwareVersion") == 0)
     {
-        string buf;
-        if (std::string(GIT_TAG) == "") { // Tag not set, show branch
-            buf = "Development-Branch: " + std::string(GIT_BRANCH);
-        }
-        else { // Tag is set, ignore branch
-            buf = "Release: " + std::string(GIT_TAG);
-        }
-        buf = buf + " (Commit: " + std::string(GIT_REV) + ")";
-        httpd_resp_sendstr_chunk(req, buf.c_str());
+        httpd_resp_sendstr_chunk(req, getFwVersion().c_str());
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
     }
diff --git a/code/main/version.h b/code/main/version.h
index 2ea44ac4..e2e28f41 100644
--- a/code/main/version.h
+++ b/code/main/version.h
@@ -38,6 +38,19 @@ const char* libfive_git_branch(void)
 }
 
 
+std::string getFwVersion(void) {
+    std::string buf;
+    if (std::string(GIT_TAG) == "") { // Tag not set, show branch
+        buf = "Development-Branch: " + std::string(GIT_BRANCH);
+    }
+    else { // Tag is set, ignore branch
+        buf = "Release: " + std::string(GIT_TAG);
+    }
+    buf = buf + " (Commit: " + std::string(GIT_REV) + ")";
+
+    return buf;
+}
+
 std::string getHTMLversion(void){
     char buf[100]="?\0";
     FILE* pFile;