diff --git a/APP_Framework/Applications/app_test/Kconfig b/APP_Framework/Applications/app_test/Kconfig index 14c28b1d5..c5e5894cd 100644 --- a/APP_Framework/Applications/app_test/Kconfig +++ b/APP_Framework/Applications/app_test/Kconfig @@ -239,10 +239,46 @@ menu "test app" menuconfig USER_TEST_TIMER bool "Config test soft timer" default n + + menuconfig USER_TEST_HASH + bool "Config test hash" + default n + + menuconfig USER_TEST_RADIX + bool "Config test radix tree" + default n menuconfig USER_TEST_RBTREE bool "Config test red black tree" default n + menuconfig USER_TEST_WEBSERVER + bool "Config test webserver" + default n + + menuconfig USER_TEST_MQTTCLIENT + bool "Config test mqtt client" + default n + + menuconfig USER_TEST_FTPCLIENT + bool "Config test ftp client" + default n + + menuconfig USER_TEST_LORA_P2P + bool "Config test lora p2p" + default n + + menuconfig USER_TEST_LORAWAN_SINGLEGW + bool "Config test lorawan single channel gateway" + default n + + menuconfig USER_TEST_CANOPEN + bool "Config test CanOpen" + default n + + menuconfig USER_TEST_USB_CAMERA + bool "Config test usb camera" + default n + endif endmenu diff --git a/APP_Framework/Applications/app_test/Makefile b/APP_Framework/Applications/app_test/Makefile index 37cb3d64b..6016dcb7a 100644 --- a/APP_Framework/Applications/app_test/Makefile +++ b/APP_Framework/Applications/app_test/Makefile @@ -101,9 +101,45 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES += test_timer.c endif + ifeq ($(CONFIG_USER_TEST_HASH),y) + SRC_FILES += test_hash/test_hash.c + endif + + ifeq ($(CONFIG_USER_TEST_RADIX),y) + SRC_FILES += test_radix_tree/test_radix_tree.c + endif + ifeq ($(CONFIG_USER_TEST_RBTREE),y) SRC_FILES += test_rbtree/test_rbtree.c endif + ifeq ($(CONFIG_USER_TEST_WEBSERVER),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_MQTTCLIENT),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_FTPCLIENT),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_LORA_P2P),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_LORAWAN_SINGLEGW),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_CANOPEN),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_USB_CAMERA),y) + SRC_FILES += + endif + include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.c b/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.c index 35b718da0..6f25376df 100644 --- a/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.c +++ b/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.c @@ -20,7 +20,7 @@ #include #include #include"test_rbtree.h" -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES void RBTreeTraversal(RBTreeType *tree, RBNodeType *node) { diff --git a/Ubiquitous/XiZi_IIoT/board/edu-arm32/config.mk b/Ubiquitous/XiZi_IIoT/board/edu-arm32/config.mk index cb757227c..cf681ac77 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-arm32/config.mk +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/config.mk @@ -5,7 +5,7 @@ export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-edu-arm32.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -Werror -export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-edu-arm32.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := export DEFINES := -DHAVE_CCONFIG_H -DHC32F4A0 -DUSE_DDL_DRIVER -DHAVE_SIGINFO