From c0b4733f1e56dbc9da3a1412d12be431018000ff Mon Sep 17 00:00:00 2001
From: technyon <j.o.schuemann@gmx.de>
Date: Thu, 26 Jan 2023 17:34:53 +0100
Subject: [PATCH] merge version.h and config.h

---
 CMakeLists.txt   | 1 -
 Config.h         | 2 ++
 Version.h        | 3 ---
 WebCfgServer.cpp | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 Version.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c384e5..70400c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,6 @@ file(GLOB SRCFILES
         PreferencesKeys.h
         Gpio.cpp
         Logger.cpp
-        Version.h
 #        include/RTOS.h
         lib/WiFiManager/WiFiManager.cpp
         lib/Crc16/Crc16.h
diff --git a/Config.h b/Config.h
index b98de92..ea42eca 100644
--- a/Config.h
+++ b/Config.h
@@ -1,4 +1,6 @@
 #pragma once
 
+#define NUKI_HUB_VERSION "7.3"
+
 #define MQTT_QOS_LEVEL 0
 #define MQTT_CLEAN_SESSIONS true
\ No newline at end of file
diff --git a/Version.h b/Version.h
deleted file mode 100644
index f215c32..0000000
--- a/Version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define nuki_hub_version "7.3"
\ No newline at end of file
diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp
index 875b7d3..9912242 100644
--- a/WebCfgServer.cpp
+++ b/WebCfgServer.cpp
@@ -1,9 +1,9 @@
 #include "WebCfgServer.h"
 #include "WebCfgServerConstants.h"
 #include "PreferencesKeys.h"
-#include "Version.h"
 #include "hardware/WifiEthServer.h"
 #include "Logger.h"
+#include "Config.h"
 #include <esp_task_wdt.h>
 
 WebCfgServer::WebCfgServer(NukiWrapper* nuki, NukiOpenerWrapper* nukiOpener, Network* network, EthServer* ethServer, Preferences* preferences, bool allowRestartToPortal)
@@ -449,7 +449,7 @@ void WebCfgServer::buildHtml(String& response)
 
     response.concat("<br><h3>Info</h3>\n");
 
-    String version = nuki_hub_version;
+    String version = NUKI_HUB_VERSION;
 
     response.concat("<table>");