diff --git a/.gitmodules b/.gitmodules index 0c1a2eedf..4b15013ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,4 +28,7 @@ [submodule "APP_Framework/lib/lorawan/lorawan_devicenode"] path = APP_Framework/lib/lorawan/lorawan_devicenode url = https://gitlink.org.cn/IACU/lorawan_devicenode.git - branch = master \ No newline at end of file + branch = master +[submodule "APP_Framework/lib/lorawan/lorawan_gateway_single_channel"] + path = APP_Framework/lib/lorawan/lorawan_gateway_single_channel + url = https://gitlink.org.cn/IACU/lorawan_gateway_single_channel.git diff --git a/APP_Framework/Applications/Makefile b/APP_Framework/Applications/Makefile index 262ae4911..0f0d2a744 100644 --- a/APP_Framework/Applications/Makefile +++ b/APP_Framework/Applications/Makefile @@ -1,13 +1,13 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_DIR := general_functions app_test SRC_FILES := main.c diff --git a/APP_Framework/Applications/app_test/Kconfig b/APP_Framework/Applications/app_test/Kconfig index 45df5f5d5..3a103a6b3 100644 --- a/APP_Framework/Applications/app_test/Kconfig +++ b/APP_Framework/Applications/app_test/Kconfig @@ -8,7 +8,7 @@ menu "test app" bool "Config test adc" default n if USER_TEST_ADC - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config ADC_DEV_DRIVER string "Set ADC dev path" default "/dev/adc1_dev" @@ -19,7 +19,7 @@ menu "test app" bool "Config test dac" default n if USER_TEST_DAC - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config DAC_DEV_DRIVER string "Set DAC dev path" default "/dev/dac_dev" @@ -30,7 +30,7 @@ menu "test app" bool "Config test fs with sd or usb" default n if USER_TEST_FS - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config FPATH string "Set test file path" default "/test_file" @@ -46,7 +46,7 @@ menu "test app" bool "Config test gpio with led and key" default n if USER_TEST_GPIO - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config GPIO_DEV_DRIVER string "Set gpio dev path" default "/dev/pin_dev" @@ -62,7 +62,7 @@ menu "test app" bool "Config test uart(loraE220)" default n if USER_TEST_LORA - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config LORA_UART_DEV_DRIVER string "Set uart dev path" default "/dev/uart2_dev2" @@ -80,7 +80,7 @@ menu "test app" bool "Config test uart(RS485)" default n if USER_TEST_RS485 - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config RS485_UART_DEV_DRIVER string "Set uart dev path" default "/dev/uart1_dev1" @@ -95,7 +95,7 @@ menu "test app" bool "Config test rtc" default n if USER_TEST_RTC - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config RTC_DEV_DRIVER string "Set rtc dev path" default "/dev/rtc_dev" @@ -110,7 +110,7 @@ menu "test app" bool "Config test hwtimer" default n if USER_TEST_HWTIMER - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config HWTIMER_TIMER_DEV_DRIVER string "Set pin dev path" default "/dev/timer0_dev0" @@ -125,7 +125,7 @@ menu "test app" bool "Config test watchdog" default n if USER_TEST_WDT - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config WDT0_DEV_DRIVER string "Set wdt dev path" default "/dev/wdt0_dev0" @@ -137,7 +137,7 @@ menu "test app" bool "Config test lcd in PrivOpen" default n if USER_TEST_LCD_EDU - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config EDU_LCD_DEV_DRIVER string "Set lcd dev path" default "/dev/lcd_dev" @@ -149,7 +149,7 @@ menu "test app" bool "Config test touch" default n if USER_TEST_TOUCH - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config TOUCH_DEV_DRIVER string "Set touch dev path" default "/dev/touch_dev" @@ -164,7 +164,7 @@ menu "test app" bool "Config test i2c" default n if USER_TEST_I2C - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config I2C_DEV_DRIVER string "Set i2c dev path" default "/dev/i2c1_dev0" @@ -176,7 +176,7 @@ menu "test app" bool "Config test can" default n if USER_TEST_CAN - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config CAN_DEV_DRIVER string "Set can dev path" default "/dev/can2_dev1" @@ -189,7 +189,7 @@ menu "test app" bool "Config test camera with lcd" default n if USER_TEST_CAMERA - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config CAMERA_DEV_DRIVER string "Set camera dev path" default "/dev/camera_dev" @@ -211,7 +211,7 @@ menu "test app" bool "Config test ethernet only for edu-riscv64" default n if USER_TEST_ETHERNET - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES choice prompt "set ethernet role as client or server" default ETHERNET_AS_SERVER @@ -229,7 +229,7 @@ menu "test app" bool "Config test w25q128 device" default n if USER_TEST_FLASH - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config FLASH_DEV_DRIVER string "Set flash dev path" default "/dev/qspi_W25Q128" diff --git a/APP_Framework/Applications/app_test/Makefile b/APP_Framework/Applications/app_test/Makefile index 1cf919846..200e9e02a 100644 --- a/APP_Framework/Applications/app_test/Makefile +++ b/APP_Framework/Applications/app_test/Makefile @@ -1,5 +1,5 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs ifeq ($(CONFIG_USER_TEST_SEMC),y) @@ -22,7 +22,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := test_shell.c ifeq ($(CONFIG_USER_TEST_ADC),y) diff --git a/APP_Framework/Applications/app_test/test_adc.c b/APP_Framework/Applications/app_test/test_adc.c index c8cb94bfc..ceceec161 100644 --- a/APP_Framework/Applications/app_test/test_adc.c +++ b/APP_Framework/Applications/app_test/test_adc.c @@ -21,7 +21,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES void TestAdc(void) { diff --git a/APP_Framework/Applications/app_test/test_camera.c b/APP_Framework/Applications/app_test/test_camera.c index 5f9c03e65..442bfd615 100644 --- a/APP_Framework/Applications/app_test/test_camera.c +++ b/APP_Framework/Applications/app_test/test_camera.c @@ -21,7 +21,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES static uint16_t image_buff[384000]; diff --git a/APP_Framework/Applications/app_test/test_can.c b/APP_Framework/Applications/app_test/test_can.c index 046503642..c19abecdb 100644 --- a/APP_Framework/Applications/app_test/test_can.c +++ b/APP_Framework/Applications/app_test/test_can.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES void TestCAN(void) diff --git a/APP_Framework/Applications/app_test/test_dac.c b/APP_Framework/Applications/app_test/test_dac.c index 4aa105eb1..37ac2bf1c 100644 --- a/APP_Framework/Applications/app_test/test_dac.c +++ b/APP_Framework/Applications/app_test/test_dac.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES void TestDac(void) { diff --git a/APP_Framework/Applications/app_test/test_ethernet.c b/APP_Framework/Applications/app_test/test_ethernet.c index a94a8c15c..9f4a4ce8f 100644 --- a/APP_Framework/Applications/app_test/test_ethernet.c +++ b/APP_Framework/Applications/app_test/test_ethernet.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #include diff --git a/APP_Framework/Applications/app_test/test_flash.c b/APP_Framework/Applications/app_test/test_flash.c index e2ea3be86..fb12f461a 100644 --- a/APP_Framework/Applications/app_test/test_flash.c +++ b/APP_Framework/Applications/app_test/test_flash.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES void TestFlash(void) { diff --git a/APP_Framework/Applications/app_test/test_fs.c b/APP_Framework/Applications/app_test/test_fs.c index 280d599c8..e0a2c2339 100644 --- a/APP_Framework/Applications/app_test/test_fs.c +++ b/APP_Framework/Applications/app_test/test_fs.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #define MAX_READ_LENGTH 1000 diff --git a/APP_Framework/Applications/app_test/test_gpio.c b/APP_Framework/Applications/app_test/test_gpio.c index ea2262416..16bbfbb89 100644 --- a/APP_Framework/Applications/app_test/test_gpio.c +++ b/APP_Framework/Applications/app_test/test_gpio.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #ifdef BOARD_EDU_RISCV64_EVB #define BSP_LED_PIN 29 diff --git a/APP_Framework/Applications/app_test/test_hwtimer.c b/APP_Framework/Applications/app_test/test_hwtimer.c index c44a63bc3..9e6f7f981 100644 --- a/APP_Framework/Applications/app_test/test_hwtimer.c +++ b/APP_Framework/Applications/app_test/test_hwtimer.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #define BSP_LED_PIN 134 #define NULL_PARAMETER 0 diff --git a/APP_Framework/Applications/app_test/test_i2c.c b/APP_Framework/Applications/app_test/test_i2c.c index 5428d9296..76881b92e 100644 --- a/APP_Framework/Applications/app_test/test_i2c.c +++ b/APP_Framework/Applications/app_test/test_i2c.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #define I2C_SLAVE_ADDRESS 0x0012U diff --git a/APP_Framework/Applications/app_test/test_lcd.c b/APP_Framework/Applications/app_test/test_lcd.c index 0e8b4be28..eee200d7a 100755 --- a/APP_Framework/Applications/app_test/test_lcd.c +++ b/APP_Framework/Applications/app_test/test_lcd.c @@ -20,7 +20,7 @@ #include -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #ifdef CONFIG_K210_LCD void LcdDemo(void) diff --git a/APP_Framework/Applications/app_test/test_lcd_edu.c b/APP_Framework/Applications/app_test/test_lcd_edu.c index edb1ac96c..e1dddbfd2 100644 --- a/APP_Framework/Applications/app_test/test_lcd_edu.c +++ b/APP_Framework/Applications/app_test/test_lcd_edu.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #define GRAPHIC_CTRL_RECT_UPDATE 0x00 #define LCD_STRING_TYPE 0 diff --git a/APP_Framework/Applications/app_test/test_loraE220.c b/APP_Framework/Applications/app_test/test_loraE220.c index 45eddd69b..90682c990 100644 --- a/APP_Framework/Applications/app_test/test_loraE220.c +++ b/APP_Framework/Applications/app_test/test_loraE220.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #define NULL_PARAMETER 0 #define E220_CFG_LENGTH diff --git a/APP_Framework/Applications/app_test/test_musl.c b/APP_Framework/Applications/app_test/test_musl.c index bfa1ba1f7..ce9432b5a 100644 --- a/APP_Framework/Applications/app_test/test_musl.c +++ b/APP_Framework/Applications/app_test/test_musl.c @@ -20,7 +20,7 @@ #include -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #if defined(CONFIG_MUSL_LIBC) && defined(CONFIG_FS_AUTOMOUNTER) diff --git a/APP_Framework/Applications/app_test/test_rs485.c b/APP_Framework/Applications/app_test/test_rs485.c index 1c90a5190..bbe6f1c4d 100644 --- a/APP_Framework/Applications/app_test/test_rs485.c +++ b/APP_Framework/Applications/app_test/test_rs485.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #define BSP_485_DIR_PIN 24 diff --git a/APP_Framework/Applications/app_test/test_rtc.c b/APP_Framework/Applications/app_test/test_rtc.c index cff31edbc..a7f64d393 100644 --- a/APP_Framework/Applications/app_test/test_rtc.c +++ b/APP_Framework/Applications/app_test/test_rtc.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES void TestRTC(int argc,char *argv[]) { diff --git a/APP_Framework/Applications/app_test/test_touch.c b/APP_Framework/Applications/app_test/test_touch.c index e378b9de6..0eb1cdc88 100644 --- a/APP_Framework/Applications/app_test/test_touch.c +++ b/APP_Framework/Applications/app_test/test_touch.c @@ -24,7 +24,7 @@ #include -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #ifdef CONFIG_BSP_USING_TOUCH void TestTouch(void) @@ -48,7 +48,7 @@ void TestTouch(void) #define LCD_DOT_TYPE 1 #define LCD_SIZE 320 -#elif defined ADD_XIZI_FETURES +#elif defined ADD_XIZI_FEATURES void TestTouch(void) { diff --git a/APP_Framework/Applications/app_test/test_wdt.c b/APP_Framework/Applications/app_test/test_wdt.c index 99115c038..cace0a9cd 100644 --- a/APP_Framework/Applications/app_test/test_wdt.c +++ b/APP_Framework/Applications/app_test/test_wdt.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES void TestWDT(int argc, char *agrv[]) { diff --git a/APP_Framework/Applications/connection_app/Makefile b/APP_Framework/Applications/connection_app/Makefile index df4ae9b97..8aa357308 100755 --- a/APP_Framework/Applications/connection_app/Makefile +++ b/APP_Framework/Applications/connection_app/Makefile @@ -1,11 +1,11 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_4G),y) SRC_DIR += 4g_app diff --git a/APP_Framework/Applications/connection_app/socket_demo/Makefile b/APP_Framework/Applications/connection_app/socket_demo/Makefile index f75bae3ee..c75d0ece7 100755 --- a/APP_Framework/Applications/connection_app/socket_demo/Makefile +++ b/APP_Framework/Applications/connection_app/socket_demo/Makefile @@ -1,10 +1,10 @@ -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := lwip_tcp_socket_demo.c lwip_udp_socket_demo.c include $(KERNEL_ROOT)/compiler.mk endif include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += lwip_tcp_socket_demo.c lwip_udp_socket_demo.c include $(APPDIR)/Application.mk diff --git a/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c b/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c index 48f147fe9..f0d0d6dbc 100755 --- a/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c +++ b/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c @@ -20,13 +20,13 @@ #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #include #include #include "lwip/sys.h" #endif -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #include #include #include @@ -45,7 +45,7 @@ static char tcp_demo_ipaddr[] = {192, 168, 131, 77}; static char tcp_demo_netmask[] = {255, 255, 254, 0}; static char tcp_demo_gwaddr[] = {192, 168, 131, 1}; -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #define lw_print printf #define lw_notice printf #define lw_error printf @@ -151,7 +151,7 @@ void TcpSocketRecvTest(int argc, char *argv[]) TcpSocketConfigParam(argv[1]); } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES lwip_config_tcp(0, tcp_demo_ipaddr, tcp_demo_netmask, tcp_demo_gwaddr); pthread_attr_t attr; @@ -159,7 +159,7 @@ void TcpSocketRecvTest(int argc, char *argv[]) attr.stacksize = LWIP_TCP_DEMO_TASK_STACK_SIZE; #endif -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES pthread_attr_t attr = PTHREAD_ATTR_INITIALIZER; attr.priority = LWIP_TCP_DEMO_TASK_PRIO; attr.stacksize = LWIP_TCP_DEMO_TASK_STACK_SIZE; @@ -222,14 +222,14 @@ void TcpSocketSendTest(int argc, char *argv[]) TcpSocketConfigParam(argv[1]); } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES lwip_config_tcp(0, tcp_demo_ipaddr, tcp_demo_netmask, tcp_demo_gwaddr); pthread_attr_t attr; attr.schedparam.sched_priority = LWIP_TCP_DEMO_TASK_PRIO; attr.stacksize = LWIP_TCP_DEMO_TASK_STACK_SIZE; #endif -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES pthread_attr_t attr = PTHREAD_ATTR_INITIALIZER; attr.priority = LWIP_TCP_DEMO_TASK_PRIO; attr.stacksize = LWIP_TCP_DEMO_TASK_STACK_SIZE; diff --git a/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c b/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c index b6af89ffe..ebb2a06d0 100755 --- a/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c +++ b/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c @@ -19,12 +19,12 @@ */ #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES #include #include "lwip/sockets.h" #endif -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #include #include #include @@ -133,14 +133,14 @@ void UdpSocketRecvTest(int argc, char *argv[]) UdpSocketConfigParam(argv[1]); } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES lwip_config_tcp(0, udp_demo_ipaddr, udp_demo_netmask, udp_demo_gwaddr); pthread_attr_t attr; attr.schedparam.sched_priority = LWIP_UDP_DEMO_TASK_PRIO; attr.stacksize = LWIP_UDP_DEMO_TASK_STACK_SIZE; #endif -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES pthread_attr_t attr = PTHREAD_ATTR_INITIALIZER; attr.priority = LWIP_UDP_DEMO_TASK_PRIO; attr.stacksize = LWIP_UDP_DEMO_TASK_STACK_SIZE; @@ -199,14 +199,14 @@ void UdpSocketSendTest(int argc, char *argv[]) UdpSocketConfigParam(argv[1]); } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES lwip_config_tcp(0, udp_demo_ipaddr, udp_demo_netmask, udp_demo_gwaddr); pthread_attr_t attr; attr.schedparam.sched_priority = LWIP_UDP_DEMO_TASK_PRIO; attr.stacksize = LWIP_UDP_DEMO_TASK_STACK_SIZE; #endif -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES pthread_attr_t attr = PTHREAD_ATTR_INITIALIZER; attr.priority = LWIP_UDP_DEMO_TASK_PRIO; attr.stacksize = LWIP_UDP_DEMO_TASK_STACK_SIZE; diff --git a/APP_Framework/Applications/general_functions/circular_area/Makefile b/APP_Framework/Applications/general_functions/circular_area/Makefile index 30616891b..3a440ecbf 100644 --- a/APP_Framework/Applications/general_functions/circular_area/Makefile +++ b/APP_Framework/Applications/general_functions/circular_area/Makefile @@ -1,11 +1,11 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += circular_area_app.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := circular_area_app.c include $(KERNEL_ROOT)/compiler.mk endif \ No newline at end of file diff --git a/APP_Framework/Applications/general_functions/list/Makefile b/APP_Framework/Applications/general_functions/list/Makefile index acfac595c..cb227275c 100644 --- a/APP_Framework/Applications/general_functions/list/Makefile +++ b/APP_Framework/Applications/general_functions/list/Makefile @@ -1,11 +1,11 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += double_list.c single_list.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := double_list.c single_list.c include $(KERNEL_ROOT)/compiler.mk endif \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/k210_fft_test/Makefile b/APP_Framework/Applications/knowing_app/k210_fft_test/Makefile index ff9bc3df8..23476939d 100644 --- a/APP_Framework/Applications/knowing_app/k210_fft_test/Makefile +++ b/APP_Framework/Applications/knowing_app/k210_fft_test/Makefile @@ -1,6 +1,6 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs ifeq ($(CONFIG_K210_FFT_TEST), y) diff --git a/APP_Framework/Applications/knowing_app/k210_fft_test/fft_test.c b/APP_Framework/Applications/knowing_app/k210_fft_test/fft_test.c index 3a54afbb0..5166087f9 100644 --- a/APP_Framework/Applications/knowing_app/k210_fft_test/fft_test.c +++ b/APP_Framework/Applications/knowing_app/k210_fft_test/fft_test.c @@ -155,7 +155,7 @@ void k210_fft_test(void) cycle[FFT_SOFT][FFT_DIR_BACKWARD]/(sysctl_clock_get_freq(SYSCTL_CLOCK_CPU)/1000000)); } -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES void nuttx_k210_fft_test(void) { pthread_t thread; diff --git a/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c b/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c index dcdb6e8f7..4c2f5022e 100644 --- a/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c +++ b/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c @@ -71,7 +71,7 @@ void mnist_nnom(int argc, char **argv) printf("Predicted label: %d\n", predic_label); printf("Probability: %d%%\n", (int)(prob * 100)); } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES PRIV_SHELL_CMD_FUNCTION(mnist_nnom, a mnist_nnom test sample, PRIV_SHELL_CMD_MAIN_ATTR); #endif #ifdef __RT_THREAD_H__ diff --git a/APP_Framework/Applications/sensor_app/Kconfig b/APP_Framework/Applications/sensor_app/Kconfig index fbab69a78..d00f82865 100755 --- a/APP_Framework/Applications/sensor_app/Kconfig +++ b/APP_Framework/Applications/sensor_app/Kconfig @@ -108,7 +108,7 @@ menu "sensor app" bool "Using sensor HS300x apps" default n - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES endif endif @@ -122,7 +122,7 @@ menu "sensor app" bool "Using sensor HS300x apps" default n - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES endif endif diff --git a/APP_Framework/Applications/sensor_app/Makefile b/APP_Framework/Applications/sensor_app/Makefile index 03bc3952a..a67b8fb53 100644 --- a/APP_Framework/Applications/sensor_app/Makefile +++ b/APP_Framework/Applications/sensor_app/Makefile @@ -1,6 +1,6 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs ifeq ($(CONFIG_APPLICATION_SENSOR_HCHO_TB600B_WQ_HCHO1OS), y) @@ -64,7 +64,7 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := ifeq ($(CONFIG_APPLICATION_SENSOR_HCHO_TB600B_WQ_HCHO1OS), y) diff --git a/APP_Framework/Framework/Kconfig b/APP_Framework/Framework/Kconfig index 7934d2006..9be072ceb 100644 --- a/APP_Framework/Framework/Kconfig +++ b/APP_Framework/Framework/Kconfig @@ -5,16 +5,16 @@ menu "Framework" default y choice prompt "select os features" - default ADD_XIZI_FETURES + default ADD_XIZI_FEATURES - config ADD_XIZI_FETURES - bool "add xizi fetures" + config ADD_XIZI_FEATURES + bool "add xizi features" - config ADD_NUTTX_FETURES - bool "add nuttx fetures" + config ADD_NUTTX_FEATURES + bool "add nuttx features" - config ADD_RTTHREAD_FETURES - bool "add rt_thread fetures" + config ADD_RTTHREAD_FEATURES + bool "add rt_thread features" endchoice diff --git a/APP_Framework/Framework/Makefile b/APP_Framework/Framework/Makefile index 32a3a1005..ca4bace06 100644 --- a/APP_Framework/Framework/Makefile +++ b/APP_Framework/Framework/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += framework_init.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := framework_init.c SRC_DIR := transform_layer diff --git a/APP_Framework/Framework/connection/4g/Makefile b/APP_Framework/Framework/connection/4g/Makefile index f5c4a138e..df607fbb6 100644 --- a/APP_Framework/Framework/connection/4g/Makefile +++ b/APP_Framework/Framework/connection/4g/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += adapter_4g.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := adapter_4g.c ifeq ($(CONFIG_ADAPTER_EC200T),y) diff --git a/APP_Framework/Framework/connection/4g/ec200t/Kconfig b/APP_Framework/Framework/connection/4g/ec200t/Kconfig index 01ecea76e..7d3640739 100644 --- a/APP_Framework/Framework/connection/4g/ec200t/Kconfig +++ b/APP_Framework/Framework/connection/4g/ec200t/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_4G_EC200T string "EC200T adapter name" default "ec200t" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_EC200T_USING_PWRKEY bool "EC200T using PWRKEY pin number" default n @@ -37,7 +37,7 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES config ADAPTER_EC200T_USING_PWRKEY bool "EC200T using PWRKEY pin number" default n @@ -72,7 +72,7 @@ if ADD_NUTTX_FETURES endif endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES config ADAPTER_EC200T_PWRKEY int "EC200T PWRKEY pin number" default "97" diff --git a/APP_Framework/Framework/connection/4g/ec200t/Makefile b/APP_Framework/Framework/connection/4g/ec200t/Makefile index 5b2bff1fe..e3bf4efec 100644 --- a/APP_Framework/Framework/connection/4g/ec200t/Makefile +++ b/APP_Framework/Framework/connection/4g/ec200t/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += ec200t.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := ec200t.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c index 456f05664..67076fe44 100644 --- a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c +++ b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c @@ -142,7 +142,7 @@ out: return ret; } -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args){ return 0;} #else static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args) diff --git a/APP_Framework/Framework/connection/Makefile b/APP_Framework/Framework/connection/Makefile index cc71769af..0a33bf95f 100644 --- a/APP_Framework/Framework/connection/Makefile +++ b/APP_Framework/Framework/connection/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += adapter.c adapter_agent.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := adapter.c adapter_agent.c ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_NETWORK),y) diff --git a/APP_Framework/Framework/connection/adapter_agent.c b/APP_Framework/Framework/connection/adapter_agent.c index 344674bfb..445d83ed5 100755 --- a/APP_Framework/Framework/connection/adapter_agent.c +++ b/APP_Framework/Framework/connection/adapter_agent.c @@ -26,10 +26,10 @@ #include #include #include -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES # include #endif -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES #include #endif #define AT_CMD_MAX_LEN 128 @@ -424,26 +424,26 @@ int DeleteATAgent(ATAgentType agent) PrivClose(agent->fd); } -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES if (agent->lock.sem.semcount > 0) { printf("delete agent lock = %d\n",agent->lock.sem.semcount); PrivMutexDelete(&agent->lock); } -#elif defined ADD_RTTHREAD_FETURES +#elif defined ADD_RTTHREAD_FEATURES #else if (agent->lock) { printf("delete agent lock = %d\n",agent->lock); PrivMutexDelete(&agent->lock); } #endif -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES if (agent->entm_rx_notice) { printf("delete agent entm_rx_notice = %d\n",agent->entm_rx_notice); PrivSemaphoreDelete(&agent->entm_rx_notice); } #else #endif -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES if (agent->rsp_sem) { printf("delete agent rsp_sem = %d\n",agent->rsp_sem); PrivSemaphoreDelete(&agent->rsp_sem); @@ -518,7 +518,7 @@ static int ATAgentInit(ATAgentType agent) agent->receive_mode = DEFAULT_MODE; -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES pthread_attr_t attr = PTHREAD_ATTR_INITIALIZER; attr.priority = 18; attr.stacksize = 8192; diff --git a/APP_Framework/Framework/connection/at_agent.h b/APP_Framework/Framework/connection/at_agent.h index 42d589a0c..d3efd5edb 100755 --- a/APP_Framework/Framework/connection/at_agent.h +++ b/APP_Framework/Framework/connection/at_agent.h @@ -52,7 +52,7 @@ struct ATAgent uint32 maintain_len; uint32 maintain_max; -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES int lock; #else pthread_mutex_t lock; @@ -63,7 +63,7 @@ struct ATAgent char reply_end_last_char; char reply_end_char; uint32 reply_char_num; -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES int rsp_sem; #else sem_t rsp_sem; @@ -74,7 +74,7 @@ struct ATAgent char entm_recv_buf[ENTM_RECV_MAX]; uint32 entm_recv_len; enum ReceiveMode receive_mode; -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES int entm_rx_notice; #else sem_t entm_rx_notice; diff --git a/APP_Framework/Framework/connection/bluetooth/Makefile b/APP_Framework/Framework/connection/bluetooth/Makefile index bc7d736cd..3ee1fcaa7 100644 --- a/APP_Framework/Framework/connection/bluetooth/Makefile +++ b/APP_Framework/Framework/connection/bluetooth/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += adapter_bluetooth.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := adapter_bluetooth.c ifeq ($(CONFIG_ADAPTER_HC08),y) diff --git a/APP_Framework/Framework/connection/bluetooth/hc08/Kconfig b/APP_Framework/Framework/connection/bluetooth/hc08/Kconfig index 042cf75a0..6a6887560 100644 --- a/APP_Framework/Framework/connection/bluetooth/hc08/Kconfig +++ b/APP_Framework/Framework/connection/bluetooth/hc08/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_BLUETOOTH_HC08 string "HC08 adapter name" default "hc08" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_HC08_RECV_BUFFER_SIZE int "HC08 recv data buffer size" default "128" @@ -31,7 +31,7 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES config ADAPTER_HC08_WORK_ROLE string "HC08 work role M(MASTER) or S(SLAVER)" @@ -58,7 +58,7 @@ if ADD_NUTTX_FETURES endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES config ADAPTER_HC08_RECV_BUFFER_SIZE int "HC08 recv data buffer size" default "128" diff --git a/APP_Framework/Framework/connection/bluetooth/hc08/Makefile b/APP_Framework/Framework/connection/bluetooth/hc08/Makefile index e437a114f..f95394e46 100644 --- a/APP_Framework/Framework/connection/bluetooth/hc08/Makefile +++ b/APP_Framework/Framework/connection/bluetooth/hc08/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += hc08.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := hc08.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c index 1cbf69d44..d04b732b4 100644 --- a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c +++ b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c @@ -353,7 +353,7 @@ static int Hc08Ioctl(struct Adapter *adapter, int cmd, void *args) } PrivTaskDelay(500); - #ifdef ADD_RTTHREAD_FETURES + #ifdef ADD_RTTHREAD_FEATURES //Step3 : show hc08 device info, hc08_get send "AT+RX" response device info char device_info[HC08_RESP_DEFAULT_SIZE * 2] = {0}; if (Hc08AtConfigure(adapter->agent, HC08_AT_CMD_GET_DEVICE_INFO, NULL, device_info) < 0) { @@ -369,7 +369,7 @@ static int Hc08Ioctl(struct Adapter *adapter, int cmd, void *args) if (Hc08AtConfigure(adapter->agent, HC08_AT_CMD_GET_LUUID, NULL, NULL) < 0) { return -1; } - #ifdef ADD_RTTHREAD_FETURES + #ifdef ADD_RTTHREAD_FEATURES uint32_t suuid=1234; if (Hc08AtConfigure(adapter->agent, HC08_AT_CMD_SET_SUUID, &luuid, NULL) < 0) { return -1; diff --git a/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/Kconfig b/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/Kconfig index 808272cfa..2083a127d 100644 --- a/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/Kconfig +++ b/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_ETHERNET_HFA21 string "HFA21 ETHERNET adapter name" default "hfa21_ethernet" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_HFA21_DRIVER_EXTUART bool "Using extra uart to support ethernet" @@ -24,11 +24,11 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES config ADAPTER_HFA21_DRIVER string "HFA21 device uart driver path" default "/dev/uart3" diff --git a/APP_Framework/Framework/connection/lora/Makefile b/APP_Framework/Framework/connection/lora/Makefile index e1b055274..d35c25340 100644 --- a/APP_Framework/Framework/connection/lora/Makefile +++ b/APP_Framework/Framework/connection/lora/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += adapter_lora.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := adapter_lora.c ifeq ($(CONFIG_ADAPTER_SX1278),y) diff --git a/APP_Framework/Framework/connection/lora/adapter_lora.c b/APP_Framework/Framework/connection/lora/adapter_lora.c index dbb76bcad..0c44b76bd 100644 --- a/APP_Framework/Framework/connection/lora/adapter_lora.c +++ b/APP_Framework/Framework/connection/lora/adapter_lora.c @@ -930,7 +930,7 @@ int AdapterLoraTest(void) //create lora gateway task #ifdef AS_LORA_GATEWAY_ROLE -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES pthread_attr_t lora_gateway_attr = PTHREAD_ATTR_INITIALIZER; lora_gateway_attr.priority = 20; lora_gateway_attr.stacksize = 2048; @@ -943,7 +943,7 @@ int AdapterLoraTest(void) PrivTaskCreate(&lora_recv_data_task, &lora_gateway_attr, &LoraReceiveTask, (void *)adapter); PrivTaskStartup(&lora_recv_data_task); -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES lora_gateway_attr.priority = 19; #else lora_gateway_attr.schedparam.sched_priority = 19; @@ -953,7 +953,7 @@ int AdapterLoraTest(void) PrivTaskStartup(&lora_gateway_task); #else //AS_LORA_CLIENT_ROLE -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES pthread_attr_t lora_client_attr = PTHREAD_ATTR_INITIALIZER; lora_client_attr.priority = 20; lora_client_attr.stacksize = 2048; @@ -965,7 +965,7 @@ int AdapterLoraTest(void) PrivTaskCreate(&lora_recv_data_task, &lora_client_attr, &LoraReceiveTask, (void *)adapter); PrivTaskStartup(&lora_recv_data_task); -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES lora_client_attr.priority = 19; #else lora_client_attr.schedparam.sched_priority = 19; diff --git a/APP_Framework/Framework/connection/lora/e22/Kconfig b/APP_Framework/Framework/connection/lora/e22/Kconfig index ec61a8558..81e0cfc53 100644 --- a/APP_Framework/Framework/connection/lora/e22/Kconfig +++ b/APP_Framework/Framework/connection/lora/e22/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_LORA_E22 string "E22-400T30S adapter name" default "e22" -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES config ADAPTER_E22_M0_PATH string "E22 M0 pin device" diff --git a/APP_Framework/Framework/connection/lora/e22/Makefile b/APP_Framework/Framework/connection/lora/e22/Makefile index c0da4046f..aee122136 100644 --- a/APP_Framework/Framework/connection/lora/e22/Makefile +++ b/APP_Framework/Framework/connection/lora/e22/Makefile @@ -1,5 +1,5 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += e22.c include $(APPDIR)/Application.mk diff --git a/APP_Framework/Framework/connection/lora/e220/Kconfig b/APP_Framework/Framework/connection/lora/e220/Kconfig index 9e51b8eda..2ef8c83d4 100644 --- a/APP_Framework/Framework/connection/lora/e220/Kconfig +++ b/APP_Framework/Framework/connection/lora/e220/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_LORA_E220 string "E220-400T22S adapter name" default "e220" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_E220_M0 int "E220 M0 pin number" default "11" @@ -35,7 +35,7 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES config ADAPTER_E220_M0_PATH string "E220 M0 pin device" @@ -66,7 +66,7 @@ if ADD_NUTTX_FETURES endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES config ADAPTER_E220_M0 int "E220 M0 pin number" default "11" diff --git a/APP_Framework/Framework/connection/lora/e220/Makefile b/APP_Framework/Framework/connection/lora/e220/Makefile index 71d5454a0..0b158cdf9 100644 --- a/APP_Framework/Framework/connection/lora/e220/Makefile +++ b/APP_Framework/Framework/connection/lora/e220/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += e220.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := e220.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/connection/lora/e220/e220.c b/APP_Framework/Framework/connection/lora/e220/e220.c index 201e9417f..9a6bbf3c6 100644 --- a/APP_Framework/Framework/connection/lora/e220/e220.c +++ b/APP_Framework/Framework/connection/lora/e220/e220.c @@ -21,7 +21,7 @@ #include #define E220_GATEWAY_ADDRESS 0xFFFF -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES #define E220_CHANNEL 0x02 #else #define E220_CHANNEL 0x05 @@ -35,7 +35,7 @@ #define E220_ADDRESS ADAPTER_LORA_NET_ROLE_ID #endif -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES #define E220_UART_BAUD_RATE 9600 #else #define E220_UART_BAUD_RATE 115200 @@ -54,7 +54,7 @@ enum E220LoraMode * @param mode Lora working mode * @return NULL */ -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES static void E220LoraModeConfig(enum E220LoraMode mode) { int m0_fd, m1_fd; @@ -338,7 +338,7 @@ static int E220GetRegisterParam(uint8 *buf) * @param adapter - Lora device pointer * @return success: 0, failure: -1 */ -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES static int E220Open(struct Adapter *adapter) { /*step1: open e220 uart port*/ @@ -614,7 +614,7 @@ static void LoraOpen(void) E220Open(adapter); } -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES MSH_CMD_EXPORT(LoraOpen,Lora open test sample); static void LoraRead(void *parameter) @@ -692,7 +692,7 @@ static void LoraRead(void *parameter) #endif -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES static void LoraTest(void) { int ret; @@ -727,7 +727,7 @@ static void LoraSend(int argc, char *argv[]) PRIV_SHELL_CMD_FUNCTION(LoraSend, a lora test send sample, PRIV_SHELL_CMD_MAIN_ATTR); #endif -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES void E220LoraReceive(void) { int ret; @@ -763,7 +763,7 @@ void E220LoraSend(int argc, char *argv[]) } #endif -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES static void LoraReadStart(void) { int ret; diff --git a/APP_Framework/Framework/connection/lora/sx1278/Kconfig b/APP_Framework/Framework/connection/lora/sx1278/Kconfig index 9b9cc2b48..b574497b6 100644 --- a/APP_Framework/Framework/connection/lora/sx1278/Kconfig +++ b/APP_Framework/Framework/connection/lora/sx1278/Kconfig @@ -2,20 +2,20 @@ config ADAPTER_LORA_SX1278 string "SX1278 adapter name" default "sx1278" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_SX1278_DRIVER string "SX1278 device spi driver path" default "/dev/spi2_lora" endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES config ADAPTER_SX1278_DRIVER string "SX1278 device spi driver path" default "/dev/spi2_lora" endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES config ADAPTER_SX1278_DRIVER string "SX1278 device spi driver path" default "/dev/sx1278" diff --git a/APP_Framework/Framework/connection/lora/sx1278/Makefile b/APP_Framework/Framework/connection/lora/sx1278/Makefile index 636fa525d..2e4e0e10f 100644 --- a/APP_Framework/Framework/connection/lora/sx1278/Makefile +++ b/APP_Framework/Framework/connection/lora/sx1278/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += sx1278.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := sx1278.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/connection/lora/sx1278/sx1278.c b/APP_Framework/Framework/connection/lora/sx1278/sx1278.c index dda8b54e0..e8d92143c 100644 --- a/APP_Framework/Framework/connection/lora/sx1278/sx1278.c +++ b/APP_Framework/Framework/connection/lora/sx1278/sx1278.c @@ -20,7 +20,7 @@ #include -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES /** * @description: Sx127x_Nuttx_Write function for nuttx * @param fd - file descriptor to write to @@ -104,7 +104,7 @@ static int Sx1278Ioctl(struct Adapter *adapter, int cmd, void *args) * @param priv_net_group - priv_net_group params * @return success: 0, failure: -1 */ -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES static int Sx1278Join(struct Adapter *adapter, unsigned char *priv_net_group) { int ret; @@ -140,7 +140,7 @@ static int Sx1278Join(struct Adapter *adapter, unsigned char *priv_net_group) * @param len - data len * @return success: 0, failure: -1 */ -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES static int Sx1278Send(struct Adapter *adapter, const void *buf, size_t len) { int ret; @@ -170,7 +170,7 @@ static int Sx1278Send(struct Adapter *adapter, const void *buf, size_t len) * @param len - data len * @return success: 0, failure: -1 */ -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES static int Sx1278Recv(struct Adapter *adapter, void *buf, size_t len) { int ret; @@ -196,7 +196,7 @@ static int Sx1278Recv(struct Adapter *adapter, void *buf, size_t len) * @param priv_net_group - priv_net_group params * @return success: 0, failure: -1 */ -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES static int Sx1278Quit(struct Adapter *adapter, unsigned char *priv_net_group) { int ret; diff --git a/APP_Framework/Framework/connection/nbiot/bc28/Kconfig b/APP_Framework/Framework/connection/nbiot/bc28/Kconfig index 6897a6ae2..012901041 100644 --- a/APP_Framework/Framework/connection/nbiot/bc28/Kconfig +++ b/APP_Framework/Framework/connection/nbiot/bc28/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_NBIOT_BC28 string "BC28 adapter name" default "bc28" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_BC28_RESETPIN int "BC28 RESET pin number" default "100" @@ -31,11 +31,11 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES config ADAPTER_BC28_DRIVER string "BC28 device uart driver path" default "/dev/uart2" diff --git a/APP_Framework/Framework/connection/wifi/Makefile b/APP_Framework/Framework/connection/wifi/Makefile index 5e466adc5..c7cb23eae 100644 --- a/APP_Framework/Framework/connection/wifi/Makefile +++ b/APP_Framework/Framework/connection/wifi/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += adapter_wifi.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := adapter_wifi.c ifeq ($(CONFIG_ADAPTER_HFA21_WIFI),y) diff --git a/APP_Framework/Framework/connection/wifi/adapter_wifi.c b/APP_Framework/Framework/connection/wifi/adapter_wifi.c index 6c40f7413..ebea01232 100644 --- a/APP_Framework/Framework/connection/wifi/adapter_wifi.c +++ b/APP_Framework/Framework/connection/wifi/adapter_wifi.c @@ -297,7 +297,7 @@ int WifiRecv(int argc, char *argv[]) } PRIV_SHELL_CMD_FUNCTION(WifiRecv, a WiFi receive sample, PRIV_SHELL_CMD_MAIN_ATTR); -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES enum { diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig index 15fdda3f5..848026276 100755 --- a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig +++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_WIFI_ESP07S string "ESP07S WIFI adapter name" default "esp07s_wifi" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_ESP07S_DRIVER_EXTUART bool "Using extra uart to support wifi" @@ -24,7 +24,7 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES config ADAPTER_ESP07S_DRIVER_EXTUART bool "Using extra uart to support wifi" default n @@ -45,8 +45,8 @@ if ADD_NUTTX_FETURES endif endif -if ADD_RTTHREAD_FETURES - if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES + if ADD_RTTHREAD_FEATURES config ADAPTER_ESP07S_DRIVER_EXTUART bool "Using extra uart to support wifi" default n diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile index 53493604e..2a2819d4d 100755 --- a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile +++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += esp07s_wifi.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := esp07s_wifi.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/connection/wifi/esp8285_wifi/Kconfig b/APP_Framework/Framework/connection/wifi/esp8285_wifi/Kconfig index 6fea4cc6f..bd83eb4cc 100644 --- a/APP_Framework/Framework/connection/wifi/esp8285_wifi/Kconfig +++ b/APP_Framework/Framework/connection/wifi/esp8285_wifi/Kconfig @@ -2,13 +2,13 @@ config ADAPTER_WIFI_ESP8285 string "ESP8285 WIFI adapter name" default "esp8285_wifi" -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES config ADAPTER_ESP8285_DRIVER string "ESP8285 device uart driver path" default "/dev/ttyS1" endif -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_ESP8285_DRIVER string "ESP8285 device uart driver path" default "/dev/uart1_dev1" diff --git a/APP_Framework/Framework/connection/wifi/esp8285_wifi/Makefile b/APP_Framework/Framework/connection/wifi/esp8285_wifi/Makefile index 0431e2732..6b9fc3626 100644 --- a/APP_Framework/Framework/connection/wifi/esp8285_wifi/Makefile +++ b/APP_Framework/Framework/connection/wifi/esp8285_wifi/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += esp8285_wifi.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := esp8285_wifi.c include $(KERNEL_ROOT)/compiler.mk endif \ No newline at end of file diff --git a/APP_Framework/Framework/connection/wifi/hfa21_wifi/Kconfig b/APP_Framework/Framework/connection/wifi/hfa21_wifi/Kconfig index cc248bd79..fe0dc74bd 100755 --- a/APP_Framework/Framework/connection/wifi/hfa21_wifi/Kconfig +++ b/APP_Framework/Framework/connection/wifi/hfa21_wifi/Kconfig @@ -2,7 +2,7 @@ config ADAPTER_WIFI_HFA21 string "HFA21 WIFI adapter name" default "hfa21_wifi" -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_HFA21_DRIVER_EXTUART bool "Using extra uart to support wifi" @@ -24,11 +24,11 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES config ADAPTER_HFA21_DRIVER string "HFA21 device uart driver path" default "/dev/uart3" diff --git a/APP_Framework/Framework/connection/zigbee/Makefile b/APP_Framework/Framework/connection/zigbee/Makefile index cfd9f20c0..d4c2485bf 100644 --- a/APP_Framework/Framework/connection/zigbee/Makefile +++ b/APP_Framework/Framework/connection/zigbee/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += adapter_zigbee.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := adapter_zigbee.c ifeq ($(CONFIG_ADAPTER_E18),y) diff --git a/APP_Framework/Framework/connection/zigbee/e18/Kconfig b/APP_Framework/Framework/connection/zigbee/e18/Kconfig index 0551d4cbf..2b1efac9d 100644 --- a/APP_Framework/Framework/connection/zigbee/e18/Kconfig +++ b/APP_Framework/Framework/connection/zigbee/e18/Kconfig @@ -17,7 +17,7 @@ choice endchoice -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config ADAPTER_E18_MODEPIN int "E18 MODE pin number" default "61" @@ -46,7 +46,7 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES if ARCH_BOARD_XIDATONG_ARM32 config ADAPTER_E18_MODEPIN int "E18 MODE pin number" @@ -84,6 +84,6 @@ endif endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES endif diff --git a/APP_Framework/Framework/connection/zigbee/e18/Makefile b/APP_Framework/Framework/connection/zigbee/e18/Makefile index 1ac35b43f..6f2e1d871 100644 --- a/APP_Framework/Framework/connection/zigbee/e18/Makefile +++ b/APP_Framework/Framework/connection/zigbee/e18/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += e18.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := e18.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/connection/zigbee/e18/e18.c b/APP_Framework/Framework/connection/zigbee/e18/e18.c index b07a4c3ea..4ebc8aed9 100644 --- a/APP_Framework/Framework/connection/zigbee/e18/e18.c +++ b/APP_Framework/Framework/connection/zigbee/e18/e18.c @@ -43,7 +43,7 @@ char *cmd_set_ch = "AT+CH=11"; /*set channel as 11*/ static int E18HardwareModeGet() { -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #ifdef CONFIG_ARCH_BOARD_XIDATONG_ARM32 int ret = 0; int pin_fd; @@ -96,7 +96,7 @@ static int E18HardwareModeGet() static int E18HardwareModeSet(void) { -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES #ifdef CONFIG_ARCH_BOARD_XIDATONG_ARM32 int ret = 0; int pin_fd; @@ -227,7 +227,7 @@ static int E18NetworkModeConfig(struct Adapter *adapter) } out: -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES if(E18_AS_HEX_MODE == mode) #else if(E18_AS_AT_MODE == mode) @@ -302,7 +302,7 @@ static int E18NetRoleConfig(struct Adapter *adapter) } out: -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES if(E18_AS_HEX_MODE == mode) #else if(E18_AS_AT_MODE == mode) @@ -449,7 +449,7 @@ static int E18Join(struct Adapter *adapter, unsigned char *priv_net_group) // } if(!ret){ -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES if(E18_AS_HEX_MODE == mode) #else if(E18_AS_AT_MODE == mode) diff --git a/APP_Framework/Framework/control/ipc_protocol/modbus_uart/Kconfig b/APP_Framework/Framework/control/ipc_protocol/modbus_uart/Kconfig index bc6a0cae9..6729481c1 100755 --- a/APP_Framework/Framework/control/ipc_protocol/modbus_uart/Kconfig +++ b/APP_Framework/Framework/control/ipc_protocol/modbus_uart/Kconfig @@ -1,4 +1,4 @@ -if ADD_XIZI_FETURES +if ADD_XIZI_FEATURES config CONTROL_FRAMEWORK_UART_485_DIR int "control framework 485 direction pin number" default "2" @@ -27,11 +27,11 @@ if ADD_XIZI_FETURES endif endif -if ADD_NUTTX_FETURES +if ADD_NUTTX_FEATURES endif -if ADD_RTTHREAD_FETURES +if ADD_RTTHREAD_FEATURES endif diff --git a/APP_Framework/Framework/control/plc_protocol/melsec/Kconfig b/APP_Framework/Framework/control/plc_protocol/melsec/Kconfig index c441642b9..e26812739 100755 --- a/APP_Framework/Framework/control/plc_protocol/melsec/Kconfig +++ b/APP_Framework/Framework/control/plc_protocol/melsec/Kconfig @@ -24,7 +24,7 @@ choice endchoice if CONTROL_USING_SERIAL_485 - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config CONTROL_FRAMEWORK_UART_485_DIR int "control framework 485 direction pin number" default "2" @@ -53,11 +53,11 @@ if CONTROL_USING_SERIAL_485 endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif diff --git a/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c index aea9b553f..f3b52157e 100644 --- a/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c +++ b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c @@ -48,7 +48,7 @@ void k210_detect(char *json_file_path) return; } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES kpu_fd = PrivOpen(KPU_DEV_DRIVER, O_RDONLY); if (camera_fd < 0) { @@ -154,7 +154,7 @@ void k210_detect(char *json_file_path) } } -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES dvp_set_ai_addr( (uintptr_t)(kpurgbbuffer + detect_params.net_input_size[1] * (detect_params.net_input_size[0] - detect_params.sensor_output_size[0])), @@ -175,7 +175,7 @@ void k210_detect(char *json_file_path) #endif // Load kmodel into kpu task -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES if (kpu_load_kmodel(&detect_task, model_data_align) != 0) { printf("\nmodel init error\n"); @@ -287,7 +287,7 @@ static void *thread_detect_entry(void *parameter) while (shoot_flag == 2) PrivIoctl(camera_fd, FLAG_CHECK, &camera_cfg); -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES if (dmalock_sync_take(&dma_ch, 2000)) { printf("Fail to take DMA channel"); @@ -296,7 +296,7 @@ static void *thread_detect_entry(void *parameter) while (!g_ai_done_flag) ; dmalock_release(dma_ch); -#elif defined ADD_XIZI_FETURES +#elif defined ADD_XIZI_FEATURES struct PrivIoctlCfg kpu_cfg; kpu_cfg.args = kpurgbbuffer; kpu_cfg.ioctl_driver_type = KPU_TYPE; @@ -309,7 +309,7 @@ static void *thread_detect_entry(void *parameter) } #endif -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES float *output; size_t output_size; kpu_get_output(&detect_task, 0, (uint8_t **)&output, &output_size); @@ -335,7 +335,7 @@ static void *thread_detect_entry(void *parameter) } #ifdef BSP_USING_LCD -#ifdef ADD_RTTHREAD_FETURES +#ifdef ADD_RTTHREAD_FEATURES extern void lcd_draw_picture(uint16_t x1, uint16_t y1, uint16_t width, uint16_t height, uint32_t * ptr); lcd_draw_picture(0, 0, (uint16_t)detect_params.sensor_output_size[1] - 1, (uint16_t)detect_params.sensor_output_size[0] - 1, (uint32_t *)showbuffer); diff --git a/APP_Framework/Framework/sensor/Makefile b/APP_Framework/Framework/sensor/Makefile index 2ac3900a9..ea1294107 100644 --- a/APP_Framework/Framework/sensor/Makefile +++ b/APP_Framework/Framework/sensor/Makefile @@ -1,18 +1,18 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += sensor.c include $(APPDIR)/Application.mk endif -ifeq ($(ADD_XIZI_FETURES),y) +ifeq ($(ADD_XIZI_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += sensor.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := sensor.c ifeq ($(CONFIG_SENSOR_HCHO),y) diff --git a/APP_Framework/Framework/sensor/altitude/Kconfig b/APP_Framework/Framework/sensor/altitude/Kconfig index afbbef1f7..7e9b13aad 100644 --- a/APP_Framework/Framework/sensor/altitude/Kconfig +++ b/APP_Framework/Framework/sensor/altitude/Kconfig @@ -12,7 +12,7 @@ config SENSOR_BMP180 string "BMP180 quantity name" default "altitude_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_DEVICE_BMP180_DEV string "BMP180 device name" default "/dev/i2c1_dev0" @@ -22,11 +22,11 @@ config SENSOR_BMP180 default 0x77 endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif endif diff --git a/APP_Framework/Framework/sensor/ch4/Kconfig b/APP_Framework/Framework/sensor/ch4/Kconfig index 63011de1d..9bc386da7 100644 --- a/APP_Framework/Framework/sensor/ch4/Kconfig +++ b/APP_Framework/Framework/sensor/ch4/Kconfig @@ -12,7 +12,7 @@ config SENSOR_AS830 string "as830 quantity name" default "ch4_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_AS830_DRIVER_EXTUART bool "Using extra uart to support as830" default y @@ -33,7 +33,7 @@ config SENSOR_AS830 endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_AS830_DEV string "as830 device uart path" default "/dev/ttyS1" @@ -42,7 +42,7 @@ config SENSOR_AS830 endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES config SENSOR_AS830_DRIVER_EXTUART bool "Using extra uart to support as830" default y diff --git a/APP_Framework/Framework/sensor/ch4/as830/Makefile b/APP_Framework/Framework/sensor/ch4/as830/Makefile index 5d661e31b..a8c591811 100644 --- a/APP_Framework/Framework/sensor/ch4/as830/Makefile +++ b/APP_Framework/Framework/sensor/ch4/as830/Makefile @@ -1,11 +1,11 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += as830.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := as830.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/co2/Kconfig b/APP_Framework/Framework/sensor/co2/Kconfig index 78a965e8d..8ae2dcf68 100644 --- a/APP_Framework/Framework/sensor/co2/Kconfig +++ b/APP_Framework/Framework/sensor/co2/Kconfig @@ -12,7 +12,7 @@ config SENSOR_ZG09 string "zg09 quantity name" default "co2_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_ZG09_DRIVER_EXTUART bool "Using extra uart to support zg09" default y @@ -33,7 +33,7 @@ config SENSOR_ZG09 endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_ZG09_DEV string "CO2 device name" default "/dev/ttyS1" @@ -42,7 +42,7 @@ config SENSOR_ZG09 endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES config SENSOR_ZG09_DRIVER_EXTUART bool "Using extra uart to support zg09" default y @@ -78,7 +78,7 @@ config SENSOR_G8S string "g8-s quantity name" default "co2_2" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_G8S_DRIVER_EXTUART bool "Using extra uart to support g8-s" default n @@ -99,7 +99,7 @@ config SENSOR_G8S endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_G8S_DEV string "CO2 device name" default "/dev/ttyS3" @@ -107,7 +107,7 @@ config SENSOR_G8S If USART1 is selected, then fill in /dev/ttyS1 here. endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif endif diff --git a/APP_Framework/Framework/sensor/co2/g8s/Makefile b/APP_Framework/Framework/sensor/co2/g8s/Makefile index e4b77f31a..293a243fb 100644 --- a/APP_Framework/Framework/sensor/co2/g8s/Makefile +++ b/APP_Framework/Framework/sensor/co2/g8s/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += g8s.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := g8s.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/co2/zg09/Makefile b/APP_Framework/Framework/sensor/co2/zg09/Makefile index 1a3e79d52..8ff1c1d27 100644 --- a/APP_Framework/Framework/sensor/co2/zg09/Makefile +++ b/APP_Framework/Framework/sensor/co2/zg09/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += zg09.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := zg09.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/hcho/Kconfig b/APP_Framework/Framework/sensor/hcho/Kconfig index cd87003b6..aad01deb1 100644 --- a/APP_Framework/Framework/sensor/hcho/Kconfig +++ b/APP_Framework/Framework/sensor/hcho/Kconfig @@ -12,7 +12,7 @@ config SENSOR_TB600B_WQ_HCHO1OS string "tb600b wq_hcho1os quantity name" default "hcho_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_TB600B_WQ_HCHO1OS_DRIVER_EXTUART bool "Using extra uart to support tb600b wq_hcho1os" default y @@ -33,7 +33,7 @@ config SENSOR_TB600B_WQ_HCHO1OS endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_TB600B_WQ_HCHO1OS_DEV string "tb600b wq_hcho1os device uart path" default "/dev/ttyS1" @@ -42,7 +42,7 @@ config SENSOR_TB600B_WQ_HCHO1OS endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES config SENSOR_TB600B_WQ_HCHO1OS_DRIVER_EXTUART bool "Using extra uart to support tb600b wq_hcho1os" default y diff --git a/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/Makefile b/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/Makefile index 9e7dd4863..3049e5223 100644 --- a/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/Makefile +++ b/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += tb600b_wq_hcho1os.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := tb600b_wq_hcho1os.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/humidity/Kconfig b/APP_Framework/Framework/sensor/humidity/Kconfig index a38a74125..8909f03e3 100644 --- a/APP_Framework/Framework/sensor/humidity/Kconfig +++ b/APP_Framework/Framework/sensor/humidity/Kconfig @@ -12,7 +12,7 @@ config SENSOR_HS300X_HUMIDITY string "HS300x quantity name" default "humidity_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_DEVICE_HS300X_DEV string "HS300x device name" default "/dev/i2c1_dev0" @@ -23,7 +23,7 @@ config SENSOR_HS300X_HUMIDITY endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_HS300X_DEV string "HS300x device name" default "/dev/i2c1_dev0" @@ -34,7 +34,7 @@ config SENSOR_HS300X_HUMIDITY endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES config SENSOR_DEVICE_HS300X_DEV string "HS300x device name" default "/dev/i2c1" diff --git a/APP_Framework/Framework/sensor/humidity/hs300x_humi/Makefile b/APP_Framework/Framework/sensor/humidity/hs300x_humi/Makefile index 58f85b1ef..0dc12429d 100644 --- a/APP_Framework/Framework/sensor/humidity/hs300x_humi/Makefile +++ b/APP_Framework/Framework/sensor/humidity/hs300x_humi/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += hs300x_humi.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := hs300x_humi.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/sensor/iaq/Kconfig b/APP_Framework/Framework/sensor/iaq/Kconfig index 6b52c1db1..209911950 100644 --- a/APP_Framework/Framework/sensor/iaq/Kconfig +++ b/APP_Framework/Framework/sensor/iaq/Kconfig @@ -12,7 +12,7 @@ config SENSOR_TB600B_IAQ10 string "tb600b iaq10 quantity name" default "iaq_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_TB600B_IAQ10_DRIVER_EXTUART bool "Using extra uart to support tb600b iaq10" default y @@ -33,7 +33,7 @@ config SENSOR_TB600B_IAQ10 endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_TB600B_IAQ10_DEV string "tb600b iaq10 device uart path" default "/dev/ttyS1" @@ -42,7 +42,7 @@ config SENSOR_TB600B_IAQ10 endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif endif diff --git a/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Makefile b/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Makefile index 39da6a6bb..600f7e2fc 100644 --- a/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Makefile +++ b/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += tb600b_iaq10.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := tb600b_iaq10.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/pm/Kconfig b/APP_Framework/Framework/sensor/pm/Kconfig index 5c9d7069c..328f06455 100644 --- a/APP_Framework/Framework/sensor/pm/Kconfig +++ b/APP_Framework/Framework/sensor/pm/Kconfig @@ -38,7 +38,7 @@ config SENSOR_PS5308 default "pm10_1" endif - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_PS5308_DRIVER_EXTUART bool "Using extra uart to support PS5308" default y @@ -59,7 +59,7 @@ config SENSOR_PS5308 endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_PS5308_DEV string "PS5308 device name" default "/dev/ttyS1" @@ -68,7 +68,7 @@ config SENSOR_PS5308 endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif endif diff --git a/APP_Framework/Framework/sensor/pm/ps5308/Makefile b/APP_Framework/Framework/sensor/pm/ps5308/Makefile index 960968dd2..96ae6cc99 100644 --- a/APP_Framework/Framework/sensor/pm/ps5308/Makefile +++ b/APP_Framework/Framework/sensor/pm/ps5308/Makefile @@ -1,11 +1,11 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += ps5308.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := ps5308.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/temperature/Kconfig b/APP_Framework/Framework/sensor/temperature/Kconfig index aa170103b..64584f8bf 100644 --- a/APP_Framework/Framework/sensor/temperature/Kconfig +++ b/APP_Framework/Framework/sensor/temperature/Kconfig @@ -12,7 +12,7 @@ config SENSOR_HS300X_TEMPERATURE string "HS300x quantity name" default "temperature_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_DEVICE_HS300X_DEV string "HS300x device name" default "/dev/i2c1_dev0" @@ -22,7 +22,7 @@ config SENSOR_HS300X_TEMPERATURE default 0x44 endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_HS300X_DEV string "HS300x device name" default "/dev/i2c1_dev0" @@ -33,7 +33,7 @@ config SENSOR_HS300X_TEMPERATURE endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES config SENSOR_DEVICE_HS300X_DEV string "HS300x device name" default "/dev/i2c1" diff --git a/APP_Framework/Framework/sensor/temperature/hs300x_temp/Makefile b/APP_Framework/Framework/sensor/temperature/hs300x_temp/Makefile index 047981e4b..dc0382316 100644 --- a/APP_Framework/Framework/sensor/temperature/hs300x_temp/Makefile +++ b/APP_Framework/Framework/sensor/temperature/hs300x_temp/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += hs300x_temp.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := hs300x_temp.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/tvoc/Kconfig b/APP_Framework/Framework/sensor/tvoc/Kconfig index b667e4801..60d062363 100644 --- a/APP_Framework/Framework/sensor/tvoc/Kconfig +++ b/APP_Framework/Framework/sensor/tvoc/Kconfig @@ -12,7 +12,7 @@ config SENSOR_TB600B_TVOC10 string "tb600b tvoc10 quantity name" default "tvoc_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_TB600B_TVOC10_DRIVER_EXTUART bool "Using extra uart to support tb600b tvoc10" default y @@ -33,7 +33,7 @@ config SENSOR_TB600B_TVOC10 endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_TB600B_TVOC10_DEV string "tb600b tvoc10 device uart path" default "/dev/ttyS1" @@ -42,7 +42,7 @@ config SENSOR_TB600B_TVOC10 endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif endif diff --git a/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/Makefile b/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/Makefile index 7fb2cadbd..b5467d0ad 100644 --- a/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/Makefile +++ b/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += tb600b_tvoc10.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := tb600b_tvoc10.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/voice/Kconfig b/APP_Framework/Framework/sensor/voice/Kconfig index 87a8c213f..e2b56743e 100644 --- a/APP_Framework/Framework/sensor/voice/Kconfig +++ b/APP_Framework/Framework/sensor/voice/Kconfig @@ -12,7 +12,7 @@ config SENSOR_D124 string "D124 quantity voice name" default "voice_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_D124_DRIVER_EXTUART bool "Using extra uart to support D124" default y @@ -33,7 +33,7 @@ config SENSOR_D124 endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_D124_DEV string "D124 device name" default "/dev/ttyS1" @@ -42,7 +42,7 @@ config SENSOR_D124 endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES config SENSOR_D124_DRIVER_EXTUART bool "Using extra uart to support D124" default y diff --git a/APP_Framework/Framework/sensor/voice/d124/Makefile b/APP_Framework/Framework/sensor/voice/d124/Makefile index 18f5d991a..7686ec3ec 100644 --- a/APP_Framework/Framework/sensor/voice/d124/Makefile +++ b/APP_Framework/Framework/sensor/voice/d124/Makefile @@ -1,12 +1,12 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += d124.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := d124.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/voice/d124/d124.c b/APP_Framework/Framework/sensor/voice/d124/d124.c index 1e204806d..232680c21 100644 --- a/APP_Framework/Framework/sensor/voice/d124/d124.c +++ b/APP_Framework/Framework/sensor/voice/d124/d124.c @@ -51,7 +51,7 @@ static void *ReadTask(void *parameter) * @param sdev - sensor device pointer * @return success: 1 , failure: other */ -#ifdef ADD_NUTTX_FETURES +#ifdef ADD_NUTTX_FEATURES static int SensorDeviceOpen(struct SensorDevice *sdev) { int result = 0; diff --git a/APP_Framework/Framework/sensor/winddirection/Kconfig b/APP_Framework/Framework/sensor/winddirection/Kconfig index 7fdbd7bd4..11c59f174 100644 --- a/APP_Framework/Framework/sensor/winddirection/Kconfig +++ b/APP_Framework/Framework/sensor/winddirection/Kconfig @@ -12,7 +12,7 @@ config SENSOR_QS_FX string "qs-fx quantity name" default "winddirection_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_QS_FX_DRIVER_EXTUART bool "Using extra uart to support qs-fx" default y @@ -41,7 +41,7 @@ config SENSOR_QS_FX endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_QS_FX_DEV string "qs-fx device name" default "/dev/ttyS1" @@ -50,7 +50,7 @@ config SENSOR_QS_FX endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif endif diff --git a/APP_Framework/Framework/sensor/winddirection/qs-fx/Makefile b/APP_Framework/Framework/sensor/winddirection/qs-fx/Makefile index e45522588..ff3f83ad6 100644 --- a/APP_Framework/Framework/sensor/winddirection/qs-fx/Makefile +++ b/APP_Framework/Framework/sensor/winddirection/qs-fx/Makefile @@ -1,11 +1,11 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += qs-fx.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := qs-fx.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c b/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c index 3a9e1eed5..d26c44e80 100644 --- a/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c +++ b/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c @@ -69,7 +69,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) return result; } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES static int PinOpen(void){ int pin_fd = PrivOpen(SENSOR_DEVICE_QS_FX_PIN_DEV, O_RDWR); if (pin_fd < 0) { @@ -106,7 +106,7 @@ static int PinOpen(void){ */ static int SensorDeviceRead(struct SensorDevice *sdev, size_t len) { -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES int pin_fd=PinOpen(); struct PinStat pin_dir; pin_dir.pin = SENSOR_DEVICE_QS_FX_PIN_NUMBER; @@ -120,7 +120,7 @@ static int SensorDeviceRead(struct SensorDevice *sdev, size_t len) return -1; PrivTaskDelay(20); -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES pin_dir.val = GPIO_LOW; if (PrivWrite(pin_fd,&pin_dir,0) < 0) // pull-down pin to configure as rx mode return -1; diff --git a/APP_Framework/Framework/sensor/windspeed/Kconfig b/APP_Framework/Framework/sensor/windspeed/Kconfig index 96dfabf27..a8247f5e2 100644 --- a/APP_Framework/Framework/sensor/windspeed/Kconfig +++ b/APP_Framework/Framework/sensor/windspeed/Kconfig @@ -12,7 +12,7 @@ config SENSOR_QS_FS string "qs-fs quantity name" default "windspeed_1" - if ADD_XIZI_FETURES + if ADD_XIZI_FEATURES config SENSOR_QS_FS_DRIVER_EXTUART bool "Using extra uart to support qs-fx" default y @@ -41,7 +41,7 @@ config SENSOR_QS_FS endif endif - if ADD_NUTTX_FETURES + if ADD_NUTTX_FEATURES config SENSOR_DEVICE_QS_FS_DEV string "qs-fx device name" default "/dev/ttyS1" @@ -50,7 +50,7 @@ config SENSOR_QS_FS endif - if ADD_RTTHREAD_FETURES + if ADD_RTTHREAD_FEATURES endif endif diff --git a/APP_Framework/Framework/sensor/windspeed/qs-fs/Makefile b/APP_Framework/Framework/sensor/windspeed/qs-fs/Makefile index a6872570e..479e73cc5 100644 --- a/APP_Framework/Framework/sensor/windspeed/qs-fs/Makefile +++ b/APP_Framework/Framework/sensor/windspeed/qs-fs/Makefile @@ -1,11 +1,11 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs CSRCS += qs-fs.c include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES := qs-fs.c include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c b/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c index 151e70c91..ff8651fcb 100644 --- a/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c +++ b/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c @@ -68,7 +68,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) return result; } -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES static int PinOpen(void){ int pin_fd = PrivOpen(SENSOR_DEVICE_QS_FS_PIN_DEV, O_RDWR); if (pin_fd < 0) { @@ -106,7 +106,7 @@ static int PinOpen(void){ */ static int SensorDeviceRead(struct SensorDevice *sdev, size_t len) { -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES int pin_fd=PinOpen(); struct PinStat pin_dir; pin_dir.pin = SENSOR_DEVICE_QS_FS_PIN_NUMBER; @@ -121,7 +121,7 @@ static int SensorDeviceRead(struct SensorDevice *sdev, size_t len) return -1; PrivTaskDelay(20); -#ifdef ADD_XIZI_FETURES +#ifdef ADD_XIZI_FEATURES pin_dir.val = GPIO_LOW; if (PrivWrite(pin_fd,&pin_dir,0) < 0) // pull-down pin to configure as rx mode return -1; diff --git a/APP_Framework/Framework/transform_layer/Makefile b/APP_Framework/Framework/transform_layer/Makefile index 6a6d096f8..46204ebe2 100644 --- a/APP_Framework/Framework/transform_layer/Makefile +++ b/APP_Framework/Framework/transform_layer/Makefile @@ -1,6 +1,6 @@ SRC_DIR := -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_DIR += xizi endif diff --git a/APP_Framework/Makefile b/APP_Framework/Makefile index 3a832911b..2b9d30849 100644 --- a/APP_Framework/Makefile +++ b/APP_Framework/Makefile @@ -1,10 +1,10 @@ include $(KERNEL_ROOT)/.config -ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y) include $(APPDIR)/Make.defs include $(APPDIR)/Application.mk endif -ifeq ($(CONFIG_ADD_XIZI_FETURES),y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_DIR := Applications Framework lib include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/lib/lorawan/Kconfig b/APP_Framework/lib/lorawan/Kconfig index ec6f54332..be88cbf5d 100644 --- a/APP_Framework/lib/lorawan/Kconfig +++ b/APP_Framework/lib/lorawan/Kconfig @@ -5,6 +5,18 @@ menuconfig LIB_USING_LORAWAN default n if LIB_USING_LORAWAN + menuconfig LIB_USING_LORAWAN_GATEWAY_SC + help + Please add "source "$APP_DIR/lib/lorawan/lorawan_gateway_single_channel/Kconfig"" when using lorawan_gateway_single_channel + bool "LoRaWan using lorawan_gateway for single channel(SX126x/SX127x) lib" + default n + select LIB_USING_LORA_RADIO + select BSP_USING_LWIP + + if LIB_USING_LORAWAN_GATEWAY_SC + + endif + menuconfig LIB_USING_LORAWAN_ED_STACK help Please add "source "$APP_DIR/lib/lorawan/lorawan_devicenode/Kconfig"" when using lorawan_devicenode @@ -21,6 +33,7 @@ menuconfig LIB_USING_LORAWAN Please add "source "$APP_DIR/lib/lorawan/lora_radio_driver/Kconfig"" when using lora_radio_driver bool "LoRaWan using lora-radio-driver lib" default n + select BSP_USING_SPI if LIB_USING_LORA_RADIO diff --git a/APP_Framework/lib/lorawan/Makefile b/APP_Framework/lib/lorawan/Makefile index dd6c0721f..98b176f19 100644 --- a/APP_Framework/lib/lorawan/Makefile +++ b/APP_Framework/lib/lorawan/Makefile @@ -8,4 +8,8 @@ ifeq ($(CONFIG_LIB_USING_LORAWAN_ED_STACK),y) SRC_DIR += lorawan_devicenode endif +ifeq ($(CONFIG_LIB_USING_LORAWAN_GATEWAY_SC),y) + SRC_DIR += lorawan_gateway_single_channel +endif + include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/lib/lorawan/README.md b/APP_Framework/lib/lorawan/README.md index 7fb6c76e2..bff82e90b 100644 --- a/APP_Framework/lib/lorawan/README.md +++ b/APP_Framework/lib/lorawan/README.md @@ -1,16 +1,17 @@ # lorawan子模块调试说明 -矽璓工业物联操作系统XiUOS目前支持lorawan相关开源库，通过子模块形式管理，该目录主要内容是包含**lora_radio_driver**、**lorawan_devicenode**等。 +矽璓工业物联操作系统XiUOS目前支持lorawan相关开源库，通过子模块形式管理，该目录主要内容是包含**lora_radio_driver**、**lorawan_devicenode**、**lorawan_gateway_single_channel**等。 ## 目录内容 ``` xiuos/APP_Framework/lib/lorawan ├── README.md - ├── lora_radio_driver lora_radio驱动库 - ├── lorawan_devicenode lorawan节点协议栈 - ├── Kconfig lorawan Kconfig配置 - └── Makefile lorawan Makefile + ├── lora_radio_driver lora_radio驱动库 + ├── lorawan_devicenode lorawan节点协议栈 + ├── lorawan_gateway_single_channel lorawan单通道网关协议栈 + ├── Kconfig lorawan Kconfig配置 + └── Makefile lorawan Makefile ``` ## 使用 @@ -24,7 +25,16 @@ git submodule init git submodule update APP_Framework/lib/lorawan/lora_radio_driver git submodule update APP_Framework/lib/lorawan/lorawan_devicenode -# 进入 APP_Framework/lib/lorawan/Kconfig 配置，增加子模块source路径 +# 进入 APP_Framework/lib/lorawan/Kconfig 配置，增加子模块source路径，从而编译时可找到相应lib的配置 +menuconfig LIB_USING_LORAWAN_GATEWAY_SC + bool "LoRaWan using lorawan_gateway for single channel(SX126x、SX127x) lib" + default n + select LIB_USING_LORA_RADIO + +if LIB_USING_LORAWAN_GATEWAY_SC + source "$APP_DIR/lib/lorawan/lorawan_gateway_single_channel/Kconfig" +endif + menuconfig LIB_USING_LORAWAN_ED_STACK bool "LoRaWan using lorawan_ed_stack lib" default n diff --git a/APP_Framework/lib/lorawan/lora_radio_driver b/APP_Framework/lib/lorawan/lora_radio_driver index bc03d64f4..d21965b1c 160000 --- a/APP_Framework/lib/lorawan/lora_radio_driver +++ b/APP_Framework/lib/lorawan/lora_radio_driver @@ -1 +1 @@ -Subproject commit bc03d64f4b7408f85512735064dc5569431d6c8d +Subproject commit d21965b1cbcfa99b2d36acd029a37f3f2eba612e diff --git a/APP_Framework/lib/lorawan/lorawan_gateway_single_channel b/APP_Framework/lib/lorawan/lorawan_gateway_single_channel new file mode 160000 index 000000000..ac1c6516e --- /dev/null +++ b/APP_Framework/lib/lorawan/lorawan_gateway_single_channel @@ -0,0 +1 @@ +Subproject commit ac1c6516ec9b2998c0c50796a4e5a8b78781dc8c diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-arm32-board/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-arm32-board/configs/nsh/defconfig index 697a70852..06623fbae 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-arm32-board/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-arm32-board/configs/nsh/defconfig @@ -9,7 +9,7 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="aiit-arm32-board" CONFIG_ARCH_BOARD_STM32F4_AIIT=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-riscv64-board/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-riscv64-board/configs/nsh/defconfig index 641746360..b6214968f 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-riscv64-board/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/aiit-riscv64-board/configs/nsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="aiit-riscv64-board" CONFIG_ARCH_BOARD_AIIT_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/lorae22nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/lorae22nsh/defconfig index 8beb3aa76..18e17f54e 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/lorae22nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/lorae22nsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="edu-riscv64" CONFIG_ARCH_BOARD_EDU_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/loransh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/loransh/defconfig index 882bfd930..b68627f4f 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/loransh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/loransh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="edu-riscv64" CONFIG_ARCH_BOARD_EDU_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/nsh/defconfig index c93933657..4293cb647 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/nsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="edu-riscv64" CONFIG_ARCH_BOARD_EDU_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/usbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/usbnsh/defconfig index fbe6ee65d..ee5ba82a5 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/usbnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/usbnsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="edu-riscv64" CONFIG_ARCH_BOARD_EDU_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/wifinsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/wifinsh/defconfig index 83a523fcf..dfc7f4901 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/wifinsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/edu-riscv64/configs/wifinsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="edu-riscv64" CONFIG_ARCH_BOARD_EDU_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/hc32f4a0/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/hc32f4a0/configs/nsh/defconfig index 513eca924..85bcadd17 100755 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/hc32f4a0/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/hc32f4a0/configs/nsh/defconfig @@ -9,7 +9,7 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_ARMV7M=y CONFIG_ARCH_CORTEXM4=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/elf/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/elf/defconfig index b0c8add40..909a58c09 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/elf/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/elf/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sabre-lite" CONFIG_ARCH_BOARD_SABRE_LITE=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/knsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/knsh/defconfig index 5d1a8916c..3b15c1260 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/knsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/knsh/defconfig @@ -6,7 +6,7 @@ # modifications. # # CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_ADDRENV=y CONFIG_ARCH_BOARD="sabre-lite" diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/nsh/defconfig index 5588f4a47..8624d9db1 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/nsh/defconfig @@ -6,7 +6,7 @@ # modifications. # # CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sabre-lite" CONFIG_ARCH_BOARD_SABRE_LITE=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/posix_spawn/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/posix_spawn/defconfig index 50f16f7a7..77ffec5f1 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/posix_spawn/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/posix_spawn/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sabre-lite" CONFIG_ARCH_BOARD_SABRE_LITE=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/smp/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/smp/defconfig index 430c983cc..2fed4ea83 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/smp/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/sabre-lite/configs/smp/defconfig @@ -6,7 +6,7 @@ # modifications. # # CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sabre-lite" CONFIG_ARCH_BOARD_SABRE_LITE=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/4gnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/4gnsh/defconfig index e77bb4385..60de6af8a 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/4gnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/4gnsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/btnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/btnsh/defconfig index 9b7af5b16..a8b10a612 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/btnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/btnsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/lcdnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/lcdnsh/defconfig index 3219e42d0..463b56ad4 100755 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/lcdnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/lcdnsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/loransh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/loransh/defconfig index b13f681e5..c921ad8b4 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/loransh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/loransh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/mmnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/mmnsh/defconfig index e38a4d7e5..5cd70cefe 100755 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/mmnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/mmnsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/muslnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/muslnsh/defconfig index 9b1048d9e..0aed0f5c7 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/muslnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/muslnsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/netnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/netnsh/defconfig index 18e37d804..f51869369 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/netnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/netnsh/defconfig @@ -6,7 +6,7 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/nsh/defconfig index 9bbac573a..332888ba3 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/nsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/sdionsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/sdionsh/defconfig index 09b581648..366f58951 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/sdionsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/sdionsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/usbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/usbnsh/defconfig index fbb2ab1d2..5aadd5c2f 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/usbnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/usbnsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/wifinsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/wifinsh/defconfig index 2d1625113..f5de9941f 100755 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/wifinsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/wifinsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/zbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/zbnsh/defconfig index f2bb2dd5a..3aad755ea 100755 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/zbnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/zbnsh/defconfig @@ -5,7 +5,7 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xidatong-arm32" CONFIG_ARCH_BOARD_XIDATONG_ARM32=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/4gnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/4gnsh/defconfig index 9f8bf526d..c2764380a 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/4gnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/4gnsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/btnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/btnsh/defconfig index d22793b51..33ce3dd95 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/btnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/btnsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/cannsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/cannsh/defconfig index d0df672e4..8d552684b 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/cannsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/cannsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/ch376nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/ch376nsh/defconfig index b9aefbaa3..25aabdfa7 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/ch376nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/ch376nsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/lcdnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/lcdnsh/defconfig index 588b67f60..6525d7e4c 100755 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/lcdnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/lcdnsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/loransh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/loransh/defconfig index d86e29dfb..562195c42 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/loransh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/loransh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/nsh/defconfig index aaad9d7a0..6a930ff44 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/nsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/touchnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/touchnsh/defconfig index 09d0c7329..c02b6aaec 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/touchnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/touchnsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/w5500nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/w5500nsh/defconfig index 6075ce1b8..380fef511 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/w5500nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/w5500nsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/wifinsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/wifinsh/defconfig index 327ac8b74..389d01ec1 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/wifinsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/wifinsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/zbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/zbnsh/defconfig index 2eef08514..94962951a 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/zbnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-riscv64/configs/zbnsh/defconfig @@ -7,7 +7,7 @@ # # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="xidatong-riscv64" CONFIG_ARCH_BOARD_XIDATONG_RISCV64=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/iaqnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/iaqnsh/defconfig index 004a0a38b..bccc666e1 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/iaqnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/iaqnsh/defconfig @@ -9,7 +9,7 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig index e5288e75b..addd8965e 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig @@ -9,7 +9,7 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig index 5ca3887cc..3902a9e1c 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig @@ -9,7 +9,7 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/tempnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/tempnsh/defconfig index 7522834e8..614fb27a8 100644 --- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/tempnsh/defconfig +++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/tempnsh/defconfig @@ -9,7 +9,7 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ADD_NUTTX_FETURES=y +CONFIG_ADD_NUTTX_FEATURES=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/.config b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/.config index aa01305c9..5decf02ef 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/.config +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/.config @@ -313,9 +313,9 @@ CONFIG_USB_DEVICE_NAME="usb_dev" # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -# CONFIG_ADD_XIZI_FETURES is not set -# CONFIG_ADD_NUTTX_FETURES is not set -CONFIG_ADD_RTTHREAD_FETURES=y +# CONFIG_ADD_XIZI_FEATURES is not set +# CONFIG_ADD_NUTTX_FEATURES is not set +CONFIG_ADD_RTTHREAD_FEATURES=y # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set CONFIG_SUPPORT_CONNECTION_FRAMEWORK=y CONFIG_CONNECTION_FRAMEWORK_DEBUG=y diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/rtconfig.h b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/rtconfig.h index e71dc1826..b755526d1 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/rtconfig.h +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/rtconfig.h @@ -190,7 +190,7 @@ /* Framework */ #define TRANSFORM_LAYER_ATTRIUBUTE -#define ADD_RTTHREAD_FETURES +#define ADD_RTTHREAD_FEATURES #define SUPPORT_CONNECTION_FRAMEWORK #define CONNECTION_FRAMEWORK_DEBUG #define ADAPTER_HFA21_DRIVER "/dev/uart3" diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/.config b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/.config index a35ce48a2..781d0905f 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/.config +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/.config @@ -327,9 +327,9 @@ CONFIG_PKG_KENDRYTE_SDK_VERNUM=0x0055 # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -# CONFIG_ADD_XIZI_FETURES is not set -# CONFIG_ADD_NUTTX_FETURES is not set -CONFIG_ADD_RTTHREAD_FETURES=y +# CONFIG_ADD_XIZI_FEATURES is not set +# CONFIG_ADD_NUTTX_FEATURES is not set +CONFIG_ADD_RTTHREAD_FEATURES=y CONFIG_SUPPORT_SENSOR_FRAMEWORK=y CONFIG_SENSOR_HCHO=y CONFIG_SENSOR_TB600B_WQ_HCHO1OS=y diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/rtconfig.h b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/rtconfig.h index 714ab891e..7377e8ac0 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/rtconfig.h +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/rtconfig.h @@ -206,7 +206,7 @@ /* Framework */ #define TRANSFORM_LAYER_ATTRIUBUTE -#define ADD_RTTHREAD_FETURES +#define ADD_RTTHREAD_FEATURES #define SUPPORT_SENSOR_FRAMEWORK #define SENSOR_HCHO #define SENSOR_TB600B_WQ_HCHO1OS diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/.config b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/.config index 335c45a54..81e2f5a1f 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/.config +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/.config @@ -465,9 +465,9 @@ CONFIG_OV2640_Y_IMAGE_WINDOWS_SIZE=400 # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set CONFIG_SUPPORT_KNOWING_FRAMEWORK=y diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/rtconfig.h b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/rtconfig.h index 437cca660..bb838bb57 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/rtconfig.h +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/rtconfig.h @@ -318,7 +318,7 @@ /* Framework */ #define TRANSFORM_LAYER_ATTRIUBUTE -#define ADD_XIZI_FETURES +#define ADD_XIZI_FEATURES #define SUPPORT_KNOWING_FRAMEWORK #define USING_KPU_PROCESSING #define USING_YOLOV2 diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/.config b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/.config index 80c549734..36a8c9ccd 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/.config +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/.config @@ -482,9 +482,9 @@ CONFIG_OV2640_Y_IMAGE_WINDOWS_SIZE=400 # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set CONFIG_SUPPORT_SENSOR_FRAMEWORK=y # CONFIG_SENSOR_HCHO is not set # CONFIG_SENSOR_TVOC is not set diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/rtconfig.h b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/rtconfig.h index 01651642e..6829561cd 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/rtconfig.h +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core/rtconfig.h @@ -311,7 +311,7 @@ /* Framework */ #define TRANSFORM_LAYER_ATTRIUBUTE -#define ADD_XIZI_FETURES +#define ADD_XIZI_FEATURES #define SUPPORT_SENSOR_FRAMEWORK #define SENSOR_VOICE #define SENSOR_D124 diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/.config b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/.config index 0f63cb237..658492e7a 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/.config +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/.config @@ -324,9 +324,9 @@ CONFIG_BSP_USING_USBD=y # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/rtconfig.h b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/rtconfig.h index 8ebd6580e..1fb0f5228 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/rtconfig.h +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32h743_openmv_h7plus/rtconfig.h @@ -193,7 +193,7 @@ /* Framework */ #define TRANSFORM_LAYER_ATTRIUBUTE -#define ADD_XIZI_FETURES +#define ADD_XIZI_FEATURES /* Security */ diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/.config b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/.config index a17f65d9d..6074e05ac 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/.config +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/.config @@ -389,9 +389,9 @@ CONFIG_PHY_RESET_PIN=3 # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -# CONFIG_ADD_XIZI_FETURES is not set -# CONFIG_ADD_NUTTX_FETURES is not set -CONFIG_ADD_RTTHREAD_FETURES=y +# CONFIG_ADD_XIZI_FEATURES is not set +# CONFIG_ADD_NUTTX_FEATURES is not set +CONFIG_ADD_RTTHREAD_FEATURES=y # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/rtconfig.h b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/rtconfig.h index 964d9ebdc..f4203c863 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/rtconfig.h +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-arm32/rtconfig.h @@ -248,7 +248,7 @@ /* Framework */ #define TRANSFORM_LAYER_ATTRIUBUTE -#define ADD_RTTHREAD_FETURES +#define ADD_RTTHREAD_FEATURES /* Security */ diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/.config b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/.config index e12d40794..561d84c00 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/.config +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/.config @@ -352,9 +352,9 @@ CONFIG_PKG_WIZNET_VER="latest" # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -# CONFIG_ADD_XIZI_FETURES is not set -# CONFIG_ADD_NUTTX_FETURES is not set -CONFIG_ADD_RTTHREAD_FETURES=y +# CONFIG_ADD_XIZI_FEATURES is not set +# CONFIG_ADD_NUTTX_FEATURES is not set +CONFIG_ADD_RTTHREAD_FEATURES=y # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/rtconfig.h b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/rtconfig.h index eee446b17..0c87387ec 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/rtconfig.h +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/rtconfig.h @@ -217,7 +217,7 @@ /* Framework */ #define TRANSFORM_LAYER_ATTRIUBUTE -#define ADD_RTTHREAD_FETURES +#define ADD_RTTHREAD_FEATURES /* Security */ diff --git a/Ubiquitous/XiZi_IIoT/arch/risc-v/gap8/gap8.h b/Ubiquitous/XiZi_IIoT/arch/risc-v/gap8/gap8.h index 78bdaed19..8f1d72598 100755 --- a/Ubiquitous/XiZi_IIoT/arch/risc-v/gap8/gap8.h +++ b/Ubiquitous/XiZi_IIoT/arch/risc-v/gap8/gap8.h @@ -37,7 +37,7 @@ /** * @file gap8.h -* @brief support gap8 chip fetures +* @brief support gap8 chip features * @version 1.0 * @author AIIT XUOS Lab * @date 2021-09-02 @@ -45,7 +45,7 @@ /************************************************* File name: gap8.h -Description: support gap8 chip fetures +Description: support gap8 chip features Others: take nuttx/arch/risc-v/src/gap8/gap8.h for references https://github.com/apache/incubator-nuttx.git History: diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig index ed725c23c..90e7fce5f 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig @@ -179,9 +179,9 @@ CONFIG_LIB_NEWLIB=y # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/XiZi_IIoT/board/gd32vf103-rvstar/.defconfig b/Ubiquitous/XiZi_IIoT/board/gd32vf103-rvstar/.defconfig index 9d6d6b972..165bf6a29 100644 --- a/Ubiquitous/XiZi_IIoT/board/gd32vf103-rvstar/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/gd32vf103-rvstar/.defconfig @@ -181,9 +181,9 @@ CONFIG_FS_VFS=n # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/.defconfig b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/.defconfig index 761c3df3d..aff17c060 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/.defconfig @@ -191,9 +191,9 @@ CONFIG_FS_VFS_FATFS=y # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/Kconfig b/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/Kconfig index 5753d8854..7e37be3cd 100755 --- a/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/Kconfig +++ b/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/Kconfig @@ -6,3 +6,6 @@ config BOARD_NETWORK_USE_1G_ENET_PORT bool "Enable 1000M Enet Port" default y +config LWIP_REASSEMBLY_FRAG + bool + default y \ No newline at end of file diff --git a/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/enet_ethernetif.c b/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/enet_ethernetif.c index 641c66436..b7bf34f03 100644 --- a/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/enet_ethernetif.c +++ b/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/ethernet/enet_ethernetif.c @@ -211,9 +211,10 @@ void ethernetif_phy_init(struct ethernetif *ethernetif, * * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input(struct netif *netif) +void ethernetif_input(void *netif_arg) { struct pbuf *p; + struct netif *netif = (struct netif *)netif_arg; LWIP_ASSERT("netif != NULL", (netif != NULL)); diff --git a/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/include/enet_ethernetif.h b/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/include/enet_ethernetif.h index ca5ade06b..6c552e28c 100644 --- a/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/include/enet_ethernetif.h +++ b/Ubiquitous/XiZi_IIoT/board/imxrt1176-sbc/third_party_driver/include/enet_ethernetif.h @@ -159,7 +159,7 @@ err_t ethernetif1_init(struct netif *netif); * * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input( struct netif *netif); +void ethernetif_input( void *netif_arg); int ETH_BSP_Config(void); void *ethernetif_config_enet_set(uint8_t enet_port); diff --git a/Ubiquitous/XiZi_IIoT/board/ok1052-c/.defconfig b/Ubiquitous/XiZi_IIoT/board/ok1052-c/.defconfig index 555b84bcf..b46ec4679 100644 --- a/Ubiquitous/XiZi_IIoT/board/ok1052-c/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/ok1052-c/.defconfig @@ -223,9 +223,9 @@ CONFIG_FS_VFS_FATFS=y # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/ethernet/enet_ethernetif.c b/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/ethernet/enet_ethernetif.c index 764637188..47039f742 100755 --- a/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/ethernet/enet_ethernetif.c +++ b/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/ethernet/enet_ethernetif.c @@ -198,9 +198,10 @@ void ethernetif_phy_init(struct ethernetif *ethernetif, * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input(struct netif *netif) +void ethernetif_input(void *netif_arg) { struct pbuf *p; + struct netif *netif = (struct netif *)netif_arg; err_t ret = 0; LWIP_ASSERT("netif != NULL", (netif != NULL)); diff --git a/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/include/enet_ethernetif.h b/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/include/enet_ethernetif.h index 1a8abf2ab..7b8c20c95 100755 --- a/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/include/enet_ethernetif.h +++ b/Ubiquitous/XiZi_IIoT/board/ok1052-c/third_party_driver/include/enet_ethernetif.h @@ -179,7 +179,7 @@ err_t ethernetif1_init(struct netif *netif); * * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input( struct netif *netif); +void ethernetif_input( void *netif_arg); void ETH_BSP_Config(void); void *ethernetif_config_enet_set(uint8_t enet_port); diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/.defconfig b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/.defconfig index ad4f5b2b4..fd991b36b 100644 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/.defconfig @@ -223,9 +223,9 @@ CONFIG_FS_VFS_FATFS=y # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif.c b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif.c index 1b32163dd..292ee307b 100755 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif.c +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif.c @@ -201,9 +201,10 @@ void ethernetif_phy_init(struct ethernetif *ethernetif, * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input(struct netif *netif) +void ethernetif_input(void *netif_arg) { struct pbuf *p; + struct netif *netif = (struct netif *)netif_arg; err_t ret = 0; LWIP_ASSERT("netif != NULL", (netif != NULL)); diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/enet_ethernetif.h b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/enet_ethernetif.h index fc96b93a2..7978b36b6 100755 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/enet_ethernetif.h +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/enet_ethernetif.h @@ -179,7 +179,7 @@ err_t ethernetif1_init(struct netif *netif); * * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input( struct netif *netif); +void ethernetif_input( void *netif_arg); int ETH_BSP_Config(void); void *ethernetif_config_enet_set(uint8_t enet_port); diff --git a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/.defconfig b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/.defconfig index 3c7407613..fb21f4d68 100644 --- a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/.defconfig @@ -223,9 +223,9 @@ CONFIG_FS_VFS_FATFS=y # Framework # CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y -CONFIG_ADD_XIZI_FETURES=y -# CONFIG_ADD_NUTTX_FETURES is not set -# CONFIG_ADD_RTTHREAD_FETURES is not set +CONFIG_ADD_XIZI_FEATURES=y +# CONFIG_ADD_NUTTX_FEATURES is not set +# CONFIG_ADD_RTTHREAD_FEATURES is not set # CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set # CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set diff --git a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/config.mk b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/config.mk index 53f596df6..a9bcb3314 100644 --- a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/config.mk +++ b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/config.mk @@ -5,15 +5,29 @@ export AFLAGS := -c -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections ### if use USB function, use special lds file because USB uses ITCM -ifeq ($(CONFIG_BSP_USING_USB),y) -export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_xidatong.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-usb.lds +ifeq ($(CONFIG_LIB_MUSLLIB), y) +export LFLAGS += -nostdlib -nostdinc # -fno-builtin -nodefaultlibs +export LIBCC := -lgcc +export LINK_MUSLLIB := $(KERNEL_ROOT)/lib/musllib/libmusl.a +endif + +ifeq ($(CONFIG_RESOURCES_LWIP), y) +export LINK_LWIP := $(KERNEL_ROOT)/resources/ethernet/LwIP/liblwip.a +endif + +ifeq ($(CONFIG_MCUBOOT_BOOTLOADER),y) +export LFLAGS += -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-xiwangtong-arm32-boot.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-bootloader.lds +else ifeq ($(CONFIG_MCUBOOT_APPLICATION),y) +export LFLAGS += -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-xiwangtong-arm32-app.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-application.lds +else ifeq ($(CONFIG_BSP_USING_USB),y) +export LFLAGS += -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-xiwangtong-arm32.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-usb.lds else -export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_xidatong.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS += -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-xiwangtong-arm32.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds endif export CXXFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -export APPLFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DCPU_MIMXRT1052CVL5B -DSKIP_SYSCLK_INIT -DEVK_MCIMXRM -DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 -DXIP_EXTERNAL_FLASH=1 -D__STARTUP_INITIALIZE_NONCACHEDATA -D__STARTUP_CLEAR_BSS diff --git a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/include/board.h b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/include/board.h index 9e9e12d44..99deb8f14 100755 --- a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/include/board.h +++ b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/include/board.h @@ -51,6 +51,8 @@ void InitBoardHardware(void); /*! @brief The board name */ #define BOARD_NAME "IMXRT1050" +#define configMAC_ADDR {0x02, 0x12, 0x13, 0x10, 0x15, 0x11} + #define NVIC_PRIORITYGROUP_0 0x00000007U /*!< 0 bits for pre-emption priority 4 bits for subpriority */ #define NVIC_PRIORITYGROUP_1 0x00000006U /*!< 1 bits for pre-emption priority diff --git a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/ethernet/enet_ethernetif.c b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/ethernet/enet_ethernetif.c index 31d211a37..292ee307b 100755 --- a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/ethernet/enet_ethernetif.c +++ b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/ethernet/enet_ethernetif.c @@ -66,7 +66,7 @@ #include "netif/ethernet.h" #include "enet_ethernetif.h" #include "enet_ethernetif_priv.h" - +#include #include "fsl_enet.h" #include "fsl_phy.h" #include "fsl_gpio.h" @@ -92,6 +92,20 @@ void Time_Update_LwIP(void) { } +ethernetif_config_t enet_cfg = { + .phyAddress = BOARD_ENET0_PHY_ADDRESS, + .clockName = kCLOCK_CoreSysClk, + .macAddress = configMAC_ADDR, +#if defined(FSL_FEATURE_SOC_LPC_ENET_COUNT) && (FSL_FEATURE_SOC_LPC_ENET_COUNT > 0) + .non_dma_memory = non_dma_memory, +#endif /* FSL_FEATURE_SOC_LPC_ENET_COUNT */ +}; + +void *ethernetif_config_enet_set(uint8_t enet_port) +{ + return (void *)&enet_cfg; +} + void ethernetif_clk_init(void) { const clock_enet_pll_config_t config = {.enableClkOutput = true, .enableClkOutput25M = false, .loopDivider = 1}; @@ -113,7 +127,7 @@ void ethernetif_gpio_init(void) GPIO_WritePinOutput(GPIO1, 3, 1); } -void ETH_BSP_Config(void) +int ETH_BSP_Config(void) { static int flag = 0; if(flag == 0) @@ -122,6 +136,7 @@ void ETH_BSP_Config(void) ethernetif_gpio_init(); flag = 1; } + return 0; } void ethernetif_phy_init(struct ethernetif *ethernetif, @@ -186,9 +201,10 @@ void ethernetif_phy_init(struct ethernetif *ethernetif, * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input(struct netif *netif) +void ethernetif_input(void *netif_arg) { struct pbuf *p; + struct netif *netif = (struct netif *)netif_arg; err_t ret = 0; LWIP_ASSERT("netif != NULL", (netif != NULL)); diff --git a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/connect_ethernet.h b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/connect_ethernet.h index 376c004fe..49f92d4c8 100755 --- a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/connect_ethernet.h +++ b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/connect_ethernet.h @@ -21,11 +21,13 @@ #ifndef __CONNECT_ETHERNET_H_ #define __CONNECT_ETHERNET_H_ +#include "enet_ethernetif.h" +#include "enet_ethernetif_priv.h" + #ifdef __cplusplus extern "C" { #endif - #ifndef sourceClock #define sourceClock CLOCK_GetFreq(kCLOCK_CoreSysClk) #endif diff --git a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/enet_ethernetif.h b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/enet_ethernetif.h index 8416d75bc..7978b36b6 100755 --- a/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/enet_ethernetif.h +++ b/Ubiquitous/XiZi_IIoT/board/xiwangtong-arm32/third_party_driver/include/enet_ethernetif.h @@ -179,12 +179,14 @@ err_t ethernetif1_init(struct netif *netif); * * @param netif the lwip network interface structure for this ethernetif */ -void ethernetif_input( struct netif *netif); - -void ETH_BSP_Config(void); +void ethernetif_input( void *netif_arg); +int ETH_BSP_Config(void); +void *ethernetif_config_enet_set(uint8_t enet_port); int32 lwip_obtain_semaphore(struct netif *netif); +#define NETIF_ENET0_INIT_FUNC ethernetif0_init + #if defined(__cplusplus) } #endif /* __cplusplus */ diff --git a/Ubiquitous/XiZi_IIoT/path_app.mk b/Ubiquitous/XiZi_IIoT/path_app.mk index 131191ffb..78427f764 100644 --- a/Ubiquitous/XiZi_IIoT/path_app.mk +++ b/Ubiquitous/XiZi_IIoT/path_app.mk @@ -9,7 +9,7 @@ ifeq ($(CONFIG_APP_SELECT_NEWLIB), y) endif -ifeq ($(CONFIG_ADD_XIZI_FETURES), y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES), y) APPPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/transform_layer/xizi \ -I$(KERNEL_ROOT)/../../APP_Framework/Framework/transform_layer/xizi/user_api/switch_api \ -I$(KERNEL_ROOT)/../../APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include # diff --git a/Ubiquitous/XiZi_IIoT/path_kernel.mk b/Ubiquitous/XiZi_IIoT/path_kernel.mk index 6736938db..d97b59204 100755 --- a/Ubiquitous/XiZi_IIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_IIoT/path_kernel.mk @@ -436,18 +436,18 @@ KERNELPATHS +=-I$(KERNEL_ROOT)/fs/compatibility_ch376 # endif ifeq ($(CONFIG_TRANSFORM_LAYER_ATTRIUBUTE), y) -ifeq ($(CONFIG_ADD_XIZI_FETURES), y) +ifeq ($(CONFIG_ADD_XIZI_FEATURES), y) ifeq ($(CONFIG_LIB_MUSLLIB), ) KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include # endif KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/transform_layer/xizi # endif -ifeq ($(CONFIG_ADD_NUTTX_FETURES), y) +ifeq ($(CONFIG_ADD_NUTTX_FEATURES), y) # endif -ifeq ($(CONFIG_ADD_RTTHREAD_FETURES), y) +ifeq ($(CONFIG_ADD_RTTHREAD_FEATURES), y) # endif @@ -533,6 +533,10 @@ KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lorawan_deviceno 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 + +ifeq ($(CONFIG_LIB_USING_LORAWAN_GATEWAY_SC),y) +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/lorawan/lorawan_gateway_single_channel/inc # +endif endif ifeq ($(CONFIG_CRYPTO), y) diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h index 5bbd27f95..6409f50f1 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h @@ -30,6 +30,8 @@ #ifndef __LWIPOPTS_H__ #define __LWIPOPTS_H__ +#include + /* ---------- Debug options ---------- */ #ifndef LWIP_DEBUG #define LWIP_DEBUG 1 diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c index 281ad1f56..e491c5cb1 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c @@ -318,7 +318,6 @@ ip4_addr_t gw; void lwip_config_input(struct netif *net) { sys_thread_t th_id = 0; - extern void ethernetif_input(void *netif_arg); th_id = sys_thread_new("eth_input", ethernetif_input, net, LWIP_TASK_STACK_SIZE, 20); if (th_id >= 0) {