merge version.h and config.h

This commit is contained in:
technyon
2023-01-26 17:34:53 +01:00
parent 626b8bd8d1
commit c0b4733f1e
4 changed files with 4 additions and 6 deletions

View File

@@ -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

View File

@@ -1,4 +1,6 @@
#pragma once
#define NUKI_HUB_VERSION "7.3"
#define MQTT_QOS_LEVEL 0
#define MQTT_CLEAN_SESSIONS true

View File

@@ -1,3 +0,0 @@
#pragma once
#define nuki_hub_version "7.3"

View File

@@ -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>");