Arduino Core 3 (#407)

* Add and remove libs and components for Arduino Core 3 * Arduino Core 3 * Add back Solo1 * Change ESP32-S3 to 4MB build * Update README.md * Fix retain and number of retries * Fix rolling log * Fix defaults * Fix BleScanner on Solo1 * Export settings * Import settings * Fix HA Battery voltage * Change submodule * Update espMqttClient and AsyncTCP * Webserial and MQTT/Network reconnecting * Update nuki_ble --------- Co-authored-by: iranl <iranl@github.com>
2024-07-05 18:45:39 +02:00
parent 193ebb5f91
commit 6b0100fd61
236 changed files with 16390 additions and 9740 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,147 +1,3 @@
-cmake_minimum_required(VERSION 3.0.0)
-
-if(NOT ARDUINO_BOARD)
-    set(ARDUINO_BOARD "ESP32 Dev Module [esp32.esp32]")
-endif()
-
-project(nuki_hub CXX)
-
-# ARDUHAL_LOG_LEVEL_NONE, define ARDUHAL_LOG_LEVEL_ERROR, define ARDUHAL_LOG_LEVEL_WARN, define ARDUHAL_LOG_LEVEL_INFO,
-# define ARDUHAL_LOG_LEVEL_DEBUG, define ARDUHAL_LOG_LEVEL_VERBOSE
-
-set(LOG_LEVEL ARDUHAL_LOG_LEVEL_NONE)
-
-#add_compile_definitions(DEBUG_SENSE_NUKI)
-#add_compile_definitions(DEBUG_NUKI_COMMAND)
-#add_compile_definitions(DEBUG_NUKI_CONNECT)
-#add_compile_definitions(DEBUG_NUKI_COMMUNICATION)
-#add_compile_definitions(DEBUG_NUKI_HEX_DATA)
-#add_compile_definitions(DEBUG_NUKI_READABLE_DATA)
-
-# Length of char arrays to store certificates for MQTTS
-add_compile_definitions(TLS_CA_MAX_SIZE=2200)
-add_compile_definitions(TLS_CERT_MAX_SIZE=1500)
-add_compile_definitions(TLS_KEY_MAX_SIZE=1800)
-add_compile_definitions(ESP_PLATFORM)
-add_compile_definitions(ESP32)
-add_compile_definitions(ARDUINO_ARCH_ESP32)
-# add_compile_definitions(CONFIG_BT_NIMBLE_PINNED_TO_CORE=1)
-
-include_directories(${PROJECT_NAME}
-        PRIVATE
-        lib/Crc16
-        resources/NimBLE-Arduino/src
-        lib/BleScanner/src
-        lib/nuki_ble/src
-        lib/WiFiManager
-        lib/WebServer/src
-        lib/Ethernet/src
-        lib/MqttLogger/src
-        lib/espMqttClient/src
-        lib/AsyncTCP/src
-        lib/ArduinoJson/src
-)
-
-set(SRCFILES
-        src/Config.h
-        src/NukiDeviceId.cpp
-        src/CharBuffer.cpp
-        src/Network.cpp
-        src/MqttReceiver.h
-        src/NetworkLock.cpp
-        src/NetworkOpener.cpp
-        src/networkDevices/NetworkDevice.h
-        src/networkDevices/NetworkDevice.cpp
-        src/networkDevices/WifiDevice.cpp
-        src/networkDevices/W5500Device.cpp
-        src/networkDevices/EthLan8720Device.cpp
-        src/networkDevices/ClientSyncW5500.cpp
-        src/networkDevices/espMqttClientW5500.cpp
-        src/networkDevices/IPConfiguration.cpp
-        src/LockActionResult.h
-        src/QueryCommand.h
-        src/NukiWrapper.cpp
-        src/NukiOpenerWrapper.cpp
-        src/MqttTopics.h
-        src/Ota.cpp
-        src/WebCfgServerConstants.h
-        src/WebCfgServer.cpp
-        src/PresenceDetection.cpp
-        src/PreferencesKeys.h
-        src/Gpio.cpp
-        src/Logger.cpp
-        src/RestartReason.h
-#        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
-        lib/nuki_ble/src/NukiLock.cpp
-        lib/nuki_ble/src/NukiOpener.cpp
-        lib/nuki_ble/src/NukiConstants.h
-        lib/nuki_ble/src/NukiOpenerConstants.h
-        lib/nuki_ble/src/NukiLockConstants.h
-        lib/nuki_ble/src/NukiDataTypes.h
-        lib/nuki_ble/src/NukiUtils.cpp
-        lib/nuki_ble/src/NukiLockUtils.cpp
-        lib/nuki_ble/src/NukiOpenerUtils.cpp
-        lib/gpio2go/src/Gpio2Go.cpp
-        lib/gpio2go/src/InterruptMode.h
-        lib/gpio2go/src/PinMode.h
-        lib/BleScanner/src/BleInterfaces.h
-        lib/BleScanner/src/BleScanner.cpp
-        lib/MqttLogger/src/MqttLogger.cpp
-        lib/AsyncTCP/src/AsyncTCP.cpp
-        )
-
-file(GLOB_RECURSE SRCFILESREC
-        resources/NimBLE-Arduino/src/*.c
-        resources/NimBLE-Arduino/src/*.cpp
-        resources/NimBLE-Arduino/src/*.h
-        lib/WebServer/src/*.cpp
-        lib/WebServer/src/*.h
-        lib/Ethernet/src/*.cpp
-        lib/Ethernet/src/*.h
-        lib/espMqttClient/src/*.cpp
-        lib/espMqttClient/src/*.h
-        lib/espMqttClient/src/Packets/*.cpp
-        lib/espMqttClient/src/Packets/*.h
-        lib/espMqttClient/src/Transport/*.cpp
-        lib/espMqttClient/src/Transport/*.h
-        lib/ArduinoJson/src/*.h
-        lib/ArduinoJson/src/*.hpp
-)
-
-add_executable(${PROJECT_NAME}
-        src/main.cpp
-        ${SRCFILES}
-        ${SRCFILESREC}
-        )
-
-target_compile_definitions(${PROJECT_NAME}
-        PRIVATE
-        ARDUHAL_LOG_LEVEL=${LOG_LEVEL}
-        CORE_DEBUG_LEVEL=${LOG_LEVEL}
-        CONFIG_NIMBLE_CPP_LOG_LEVEL=0
-        )
-
-target_link_arduino_libraries(${PROJECT_NAME}
-    PRIVATE
-        core
-        BLE
-        WiFi
-        WiFiClientSecure
-        Update
-        DNSServer
-        Preferences
-        Ethernet
-        SPI
-)
-
-target_link_arduino_libraries(DNSServer PUBLIC WiFi)
-
-# This is needed for the generation of HEX binary and uploading it
-target_enable_arduino_upload(${PROJECT_NAME})
-
+cmake_minimum_required(VERSION 3.16.0)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(nukihub)