diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f5c579..17ab205 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories(${PROJECT_NAME} lib/WiFiManager lib/pubsubclient/src lib/WebServer/src + include ) file(GLOB SRCFILES @@ -35,6 +36,7 @@ file(GLOB SRCFILES PreferencesKeys.h SpiffsCookie.cpp Version.h + include/RTOS.h lib/ESP32_BLE_Arduino-1.0.1/src/*.cpp lib/ESP32_BLE_Arduino-1.0.1/src/*.h lib/WiFiManager/WiFiManager.cpp diff --git a/include/RTOS.h b/include/RTOS.h new file mode 100644 index 0000000..269d57b --- /dev/null +++ b/include/RTOS.h @@ -0,0 +1 @@ +#include \ No newline at end of file diff --git a/lib/nuki_ble b/lib/nuki_ble index 7bb5d57..75d63e4 160000 --- a/lib/nuki_ble +++ b/lib/nuki_ble @@ -1 +1 @@ -Subproject commit 7bb5d57d9e4877ff7410cc720735fe0822df160e +Subproject commit 75d63e4d7a71293b2de6e81fc69df8548ed7e4f6 diff --git a/main.cpp b/main.cpp index 202626e..2a728b3 100644 --- a/main.cpp +++ b/main.cpp @@ -9,8 +9,6 @@ #include "hardware/W5500EthServer.h" #include "hardware/WifiEthServer.h" -#define ESP32 - Network* network = nullptr; WebCfgServer* webCfgServer = nullptr; NukiWrapper* nuki = nullptr;