add software version to webpage

Author: JimsterCoder

core/WebServer/WebServer.cpp

@@ -11,11 +11,12 @@ extern "C" int mg_log_level;
 
 namespace core {
 
-WebServer::WebServer(std::vector<monitor::Monitor*> &mons,
+WebServer::WebServer(const char* version, std::vector<monitor::Monitor*> &mons,
                      contactor::Contactor* contactorPtr)
     : m_monitor(mons),
     m_main_contactor(contactorPtr),
-    m_running(true)
+    m_running(true),
+    m_version(version)
 
 {
     m_start_time = std::chrono::system_clock::now();
@@ -160,6 +161,7 @@ void WebServer::handleStatusPage(struct mg_connection *c, struct mg_http_message
 
     html << "<p><b>Current Time:</b> " << std::ctime(&now_time) << "</p>";
     html << "<p><b>Run Time:</b> " << fmt1(hours,3) << " hours</p>";
+    html << "<p><b>Software Version:</b> " << m_version << "</p>";
 
     // ---- Main table ----
     html << "<table>";

core/WebServer/WebServer.hpp

@@ -23,7 +23,7 @@ namespace core
 class WebServer {
 public:
     // monitors is a reference to your vbatterymon vector in main()
-     WebServer(std::vector<monitor::Monitor*> &mons,
+     WebServer(const char* version, std::vector<monitor::Monitor*> &mons,
                      contactor::Contactor* contactorPtr);
     ~WebServer();
 
@@ -49,6 +49,7 @@ class WebServer {
     contactor::Contactor* m_main_contactor;
 
     std::chrono::system_clock::time_point m_start_time;
+    const char* m_version;
 };
 
 } // namespace core

packs/Nissan/LeafMultiPack.cpp

@@ -356,8 +356,6 @@ void LeafMultiPack::setPackStatus(Monitor::Pack_Status p)
          m_ready_led.set(core::OutputPin::LOW);
          break;
    }
-   
-
 }
 
 uint32_t LeafMultiPack::getFailsafeStatus() const

testcan.cpp

@@ -1,16 +1,14 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 
-/*
- * This file is prototyping code - don't judge.
- */
-
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/epoll.h>
 #include <fstream>
 #include <vector>
 
+#define VERSION_NUMBER "0001"
+
 // #include "packs/Nissan/LeafPack.hpp"
 #include "packs/Tesla/TeslaSlavePack.hpp"
 #include "packs/Nissan/LeafMultiPack.hpp"
@@ -87,6 +85,10 @@ int main(int argc, const char** argv)
    timer.setLogger(&logger);
    logger.info("------------------- BatteryController Started ------------------- ",__FILENAME__, __LINE__);
    std::string smsg;
+   smsg.append("VERSION NUMBER: ");
+   smsg += VERSION_NUMBER;
+   logger.info(smsg);
+   smsg.clear();
    smsg.append("LOGGER_LEVEL: ");
    smsg.append(argv[1]);
    logger.info(smsg);
@@ -201,7 +203,7 @@ int main(int argc, const char** argv)
 
    logger.setMonitor(vbatterymon);
 
-   core::WebServer webserver(vbatterymon, &multi_pack.getMainContactor());
+   core::WebServer webserver(VERSION_NUMBER, vbatterymon, &multi_pack.getMainContactor());
    ss << "Web server started on port: " << webserver.getWebServerPort();
    logger.info(ss);