merge master

2023-01-27 23:03:18 +01:00
parent c2f4f85688 99cd2e37c5
commit e439d67276
23 changed files with 1134 additions and 772 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,8 @@ file(GLOB SRCFILES
        Logger.cpp
 #        include/RTOS.h
        lib/WiFiManager/WiFiManager.cpp
+        lib/WiFiManager/wm_consts_en.h
+        lib/WiFiManager/wm_strings_en.h
        lib/Crc16/Crc16.h
        lib/nuki_ble/src/NukiBle.cpp
        lib/nuki_ble/src/NukiBle.hpp