diff --git a/.gitmodules b/.gitmodules index 15d750e..66e04f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "extlibs/libespfs"] path = extlibs/libespfs url = https://github.com/userbogd/libespfs.git -[submodule "extlibs/ttn-esp32"] - path = extlibs/ttn-esp32 - url = https://github.com/userbogd/ttn-esp32.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 835cf9e..d37a744 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/extlibs/jReadWrite/include.cmake) include(${CMAKE_CURRENT_LIST_DIR}/extlibs/libespfs/cmake/include.cmake) if(CONFIG_WEBGUIAPP_LORAWAN_ENABLE) - set(lora_SRCS "lorawan/LoRaWAN.c") - set(lora_PRIV_REQUIRES - ttn-esp32 - ) - set(lora_INCLUDE_DIRS - "../ttn-esp32/include" - "../ttn-esp32/src/hal" - ) +include(${CMAKE_CURRENT_LIST_DIR}/extlibs/ttn-esp32/include.cmake) + set(lora_SRCS "lorawan/LoRaWAN.c") endif() @@ -19,6 +13,7 @@ idf_component_register( INCLUDE_DIRS ${jreadwrite_INCLUDE_DIRS} SRCS ${lora_SRCS} + SRC_DIRS ${lora_SRC_DIRS} PRIV_REQUIRES ${lora_PRIV_REQUIRES} INCLUDE_DIRS ${lora_INCLUDE_DIRS} diff --git a/extlibs/ttn-esp32 b/extlibs/ttn-esp32 deleted file mode 160000 index f1f77e2..0000000 --- a/extlibs/ttn-esp32 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f1f77e22ba0adea75fa96d8edf53e609402707cb