developer/xiuos
1
0
Fork 0
forked from xuos/xiuos
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify lora_radio_driver path and compile OK

Browse Source
This commit is contained in:
Liu_Weichao
2023-03-17 10:05:59 +08:00
parent a4eec2646d
commit 47cea831ba
12 changed files with 905 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -22,6 +22,6 @@
[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source"]
path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source
url = https://code.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
[submodule "APP_Framework/lib/lora_radio_driver"]
path = APP_Framework/lib/lora_radio_driver
[submodule "APP_Framework/lib/lorawan/lora_radio_driver"]
path = APP_Framework/lib/lorawan/lora_radio_driver
url = https://gitlink.org.cn/IACU/lora_radio_driver.git

9
APP_Framework/lib/Kconfig
View File

@@ -9,8 +9,9 @@ menu "lib"
config APP_SELECT_OTHER_LIB
bool "app select other lib"
endchoice
source "$APP_DIR/lib/cJSON/Kconfig"
source "$APP_DIR/lib/queue/Kconfig"
source "$APP_DIR/lib/lvgl/Kconfig"
source "$APP_DIR/lib/embedded_database/Kconfig"
source "$APP_DIR/lib/cJSON/Kconfig"
source "$APP_DIR/lib/queue/Kconfig"
source "$APP_DIR/lib/lvgl/Kconfig"
source "$APP_DIR/lib/embedded_database/Kconfig"
source "$APP_DIR/lib/lorawan/Kconfig"
endmenu

4
APP_Framework/lib/Makefile
View File

@@ -14,4 +14,8 @@ ifeq ($(CONFIG_LIB_USING_CJSON),y)
SRC_DIR += cJSON
endif
ifeq ($(CONFIG_LIB_USING_LORAWAN),y)
SRC_DIR += lorawan
endif
include $(KERNEL_ROOT)/compiler.mk

8
APP_Framework/lib/cJSON/Kconfig
View File

@@ -1,3 +1,5 @@
menuconfig LIB_USING_CJSON
bool "USING cJSON"
default n
menu "lib using cJSON"
menuconfig LIB_USING_CJSON
bool "USING cJSON"
default n
endmenu

16
APP_Framework/lib/embedded_database/Kconfig
View File

@@ -1,6 +1,10 @@
menuconfig USING_EMBEDDED_DATABASE
bool "embedded database"
default n
if USING_EMBEDDED_DATABASE
source "$APP_DIR/lib/embedded_database/flashdb/Kconfig"
endif
menu "lib using embedded_database"
menuconfig USING_EMBEDDED_DATABASE
bool "embedded database"
default n
if USING_EMBEDDED_DATABASE
source "$APP_DIR/lib/embedded_database/flashdb/Kconfig"
endif
endmenu

1
APP_Framework/lib/lora_radio_driver

Submodule APP_Framework/lib/lora_radio_driver deleted from 8dec1f0d86

17
APP_Framework/lib/lorawan/Kconfig Normal file
View File

@@ -0,0 +1,17 @@
menu "lib using LoRaWan"
menuconfig LIB_USING_LORAWAN
bool "Using LoRaWan lib"
default n
if LIB_USING_LORAWAN
menuconfig LIB_USING_LORA_RADIO
bool "LoRaWan using lora-radio-driver lib"
default n
if LIB_USING_LORA_RADIO
source "$APP_DIR/lib/lorawan/lora_radio_driver/Kconfig"
endif
endif
endmenu

7
APP_Framework/lib/lorawan/Makefile Normal file
View File

@@ -0,0 +1,7 @@
SRC_DIR :=
ifeq ($(CONFIG_LIB_USING_LORA_RADIO),y)
SRC_DIR += lora_radio_driver
endif
include $(KERNEL_ROOT)/compiler.mk

1
APP_Framework/lib/lorawan/lora_radio_driver Submodule

Submodule APP_Framework/lib/lorawan/lora_radio_driver added at a400879b13

1668
APP_Framework/lib/lvgl/Kconfig
View File

File diff suppressed because it is too large Load Diff

10
APP_Framework/lib/queue/Kconfig
View File

@@ -1,3 +1,7 @@
menuconfig LIB_USING_QUEUE
bool "USING QUEUE"
default n
menu "lib using queue"
menuconfig LIB_USING_QUEUE
bool "USING QUEUE"
default n
endmenu

12
Ubiquitous/XiZi_IIoT/path_kernel.mk
View File

@@ -512,11 +512,21 @@ KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/control/plc_protoc
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/control/plc_protocol/s7 #
endif
ifeq ($(CONFIG_LIB_USING_CJSON), y)
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/cJSON
endif
ifeq ($(CONFIG_LIB_USING_LORAWAN), y)
ifeq ($(CONFIG_LIB_USING_LORA_RADIO), y)
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lora_radio_driver/lora-radio/common #
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lora_radio_driver/lora-radio/include #
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lora_radio_driver/lora-radio/sx126x #
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lora_radio_driver/lora-radio/sx127x #
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
endif
ifeq ($(CONFIG_CRYPTO), y)
KERNELPATHS += -I$(KERNEL_ROOT)/framework/security/crypto/include #
endif