update ble lib; show firmware version in config page

2022-04-07 21:59:06 +02:00
parent bae6192a9d
commit 300e2b9cbd
4 changed files with 10 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ file(GLOB SRCFILES
        WebCfgServer.cpp
        PresenceDetection.cpp
        PreferencesKeys.h
+        Version.h
        lib/ESP32_BLE_Arduino-1.0.1/src/*.cpp
        lib/ESP32_BLE_Arduino-1.0.1/src/*.h
        lib/WiFiManager/WiFiManager.cpp
--- a/Version.h
+++ b/Version.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define nuki_hub_version "1.8"
--- a/WebCfgServer.cpp
+++ b/WebCfgServer.cpp
@@ -1,6 +1,7 @@
 #include "WebCfgServer.h"
 #include <WiFiClient.h>
 #include "PreferencesKeys.h"
+#include "Version.h"

 WebCfgServer::WebCfgServer(NukiWrapper* nuki, Network* network, Preferences* preferences)
 : server(80),
@@ -191,12 +192,15 @@ void WebCfgServer::buildHtml(String& response)
    response.concat("<TITLE>NUKI Hub</TITLE>\n");
    response.concat("</HEAD>\n");
    response.concat("<BODY>\n");
-    response.concat("<br><br><h3>Info</h3>\n");
+    response.concat("<br><h3>Info</h3>\n");

+    String version = "&nbsp;";
+    version.concat(nuki_hub_version);

    response.concat("<table>");
    printParameter(response, "Paired", _nuki->isPaired() ? "&nbsp;Yes" : "&nbsp;No");
    printParameter(response, "MQTT Connected", _network->isMqttConnected() ? "&nbsp;Yes" : "&nbsp;No");
+    printParameter(response, "Firmware", version.c_str());
    response.concat("</table><br><br>");

    response.concat("<FORM ACTION=method=get >");
--- a/lib/nuki_ble
+++ b/lib/nuki_ble