From 95b049e636b57411d3b20755a93fffc5b6866265 Mon Sep 17 00:00:00 2001 From: Liu_Weichao Date: Fri, 31 Mar 2023 14:14:54 +0800 Subject: [PATCH] feat support lorawan_devicenode submodule --- APP_Framework/lib/lorawan/Kconfig | 9 +++++++++ APP_Framework/lib/lorawan/Makefile | 4 ++++ APP_Framework/lib/lorawan/lora_radio_driver | 2 +- APP_Framework/lib/lorawan/lorawan_devicenode | 2 +- Ubiquitous/XiZi_IIoT/path_kernel.mk | 8 ++++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/APP_Framework/lib/lorawan/Kconfig b/APP_Framework/lib/lorawan/Kconfig index d07306e13..8606b90dd 100644 --- a/APP_Framework/lib/lorawan/Kconfig +++ b/APP_Framework/lib/lorawan/Kconfig @@ -5,6 +5,15 @@ menuconfig LIB_USING_LORAWAN default n if LIB_USING_LORAWAN + menuconfig LIB_USING_LORAWAN_ED_STACK + bool "LoRaWan using lorawan_ed_stack lib" + default n + select LIB_USING_LORA_RADIO + + if LIB_USING_LORAWAN_ED_STACK + source "$APP_DIR/lib/lorawan/lorawan_devicenode/Kconfig" + endif + menuconfig LIB_USING_LORA_RADIO bool "LoRaWan using lora-radio-driver lib" default n diff --git a/APP_Framework/lib/lorawan/Makefile b/APP_Framework/lib/lorawan/Makefile index abd1cb168..dd6c0721f 100644 --- a/APP_Framework/lib/lorawan/Makefile +++ b/APP_Framework/lib/lorawan/Makefile @@ -4,4 +4,8 @@ ifeq ($(CONFIG_LIB_USING_LORA_RADIO),y) SRC_DIR += lora_radio_driver endif +ifeq ($(CONFIG_LIB_USING_LORAWAN_ED_STACK),y) + SRC_DIR += lorawan_devicenode +endif + include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/lib/lorawan/lora_radio_driver b/APP_Framework/lib/lorawan/lora_radio_driver index be37aa885..bc03d64f4 160000 --- a/APP_Framework/lib/lorawan/lora_radio_driver +++ b/APP_Framework/lib/lorawan/lora_radio_driver @@ -1 +1 @@ -Subproject commit be37aa885ca710ddcdf6ec0f671f0d566da9cb6f +Subproject commit bc03d64f4b7408f85512735064dc5569431d6c8d diff --git a/APP_Framework/lib/lorawan/lorawan_devicenode b/APP_Framework/lib/lorawan/lorawan_devicenode index 66bf41908..2896d7234 160000 --- a/APP_Framework/lib/lorawan/lorawan_devicenode +++ b/APP_Framework/lib/lorawan/lorawan_devicenode @@ -1 +1 @@ -Subproject commit 66bf41908297200ac81d98dc2aed75d1902f009b +Subproject commit 2896d7234688de77992e7e1872a7e67a9456b420 diff --git a/Ubiquitous/XiZi_IIoT/path_kernel.mk b/Ubiquitous/XiZi_IIoT/path_kernel.mk index e52a1e579..8af1d2340 100755 --- a/Ubiquitous/XiZi_IIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_IIoT/path_kernel.mk @@ -525,6 +525,14 @@ KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lora_radio_drive KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lora_radio_driver/ports/lora-module/inc # KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lora_radio_driver/ports/samples/lora-radio-tester # endif + +ifeq ($(CONFIG_LIB_USING_LORAWAN_ED_STACK), y) +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lorawan_devicenode/lorawan-ed-stack/Aps/Basic # +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lorawan_devicenode/lorawan-ed-stack/Common # +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lorawan_devicenode/lorawan-ed-stack/Mac # +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lorawan_devicenode/lorawan-ed-stack/Mac/Crypto # +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lorawan_devicenode/lorawan-ed-stack/Phy/region # +endif endif ifeq ($(CONFIG_CRYPTO), y)