diff --git a/APP_Framework/Applications/app_test/Kconfig b/APP_Framework/Applications/app_test/Kconfig index 74b6d0973..5a0d46740 100644 --- a/APP_Framework/Applications/app_test/Kconfig +++ b/APP_Framework/Applications/app_test/Kconfig @@ -281,6 +281,7 @@ menu "test app" menuconfig USER_TEST_MQTTCLIENT bool "Config test mqtt client" default n + select LIB_USING_CJSON menuconfig USER_TEST_FTPCLIENT bool "Config test ftp client" diff --git a/APP_Framework/Applications/app_test/Makefile b/APP_Framework/Applications/app_test/Makefile index c15e802a4..5416c3304 100644 --- a/APP_Framework/Applications/app_test/Makefile +++ b/APP_Framework/Applications/app_test/Makefile @@ -150,7 +150,9 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) endif ifeq ($(CONFIG_USER_TEST_FTPCLIENT_RISCV),y) - SRC_FILES += test_ftpclient_riscv/test_ftpclient_riscv.c + ifeq ($(CONFIG_BSP_USING_W5500),y) + SRC_FILES += test_ftpclient_riscv/test_ftpclient_riscv.c + endif endif ifeq ($(CONFIG_USER_TEST_LORA_P2P),y) diff --git a/APP_Framework/Applications/app_test/test_ethernet.c b/APP_Framework/Applications/app_test/test_ethernet.c index 9f4a4ce8f..59ef761c8 100644 --- a/APP_Framework/Applications/app_test/test_ethernet.c +++ b/APP_Framework/Applications/app_test/test_ethernet.c @@ -22,6 +22,7 @@ #include #ifdef ADD_XIZI_FEATURES +#ifdef BSP_USING_W5500 #include #define BUFF_SIZE 128 @@ -189,6 +190,6 @@ PRIV_SHELL_CMD_FUNCTION(TestSocketAsClient, a w5500 client-ip-port-msg test samp #endif - +#endif #endif \ No newline at end of file diff --git a/APP_Framework/Applications/app_test/test_loraE220.c b/APP_Framework/Applications/app_test/test_loraE220.c index 90682c990..7fa2ace08 100644 --- a/APP_Framework/Applications/app_test/test_loraE220.c +++ b/APP_Framework/Applications/app_test/test_loraE220.c @@ -98,6 +98,7 @@ void TestLora(int argc, char *argv[]) uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ; uart_cfg.serial_timeout = 1000; uart_cfg.is_ext_uart = 0; + uart_cfg.dev_recv_callback = NULL; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; ioctl_cfg.args = (void *)&uart_cfg; diff --git a/APP_Framework/Applications/app_test/test_lora_net_final/lora_driver/e220.c b/APP_Framework/Applications/app_test/test_lora_net_final/lora_driver/e220.c index db094a145..be667f49d 100755 --- a/APP_Framework/Applications/app_test/test_lora_net_final/lora_driver/e220.c +++ b/APP_Framework/Applications/app_test/test_lora_net_final/lora_driver/e220.c @@ -62,6 +62,7 @@ static struct SerialDataCfg serial_cfg = .serial_buffer_size = SERIAL_RB_BUFSZ, .serial_timeout = E220_DAFAULT_SERIAL_TIMEOUT, // 串口超时配置 .is_ext_uart = 0, + .dev_recv_callback = NULL, }; enum LoraMode current_mode = -1; // 当前模块处于什么模式 diff --git a/APP_Framework/Applications/app_test/test_rs485_arm.c b/APP_Framework/Applications/app_test/test_rs485_arm.c index 0b562359c..de9571bbb 100644 --- a/APP_Framework/Applications/app_test/test_rs485_arm.c +++ b/APP_Framework/Applications/app_test/test_rs485_arm.c @@ -138,6 +138,7 @@ void Test485(void) uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ; uart_cfg.serial_timeout = -1; uart_cfg.is_ext_uart = 0; + uart_cfg.dev_recv_callback = NULL; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; ioctl_cfg.args = (void *)&uart_cfg; diff --git a/APP_Framework/Applications/app_test/test_rs485_riscv.c b/APP_Framework/Applications/app_test/test_rs485_riscv.c index a31035ebc..5c52ccce8 100644 --- a/APP_Framework/Applications/app_test/test_rs485_riscv.c +++ b/APP_Framework/Applications/app_test/test_rs485_riscv.c @@ -70,6 +70,7 @@ void Test485(void) uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ; uart_cfg.serial_timeout = 1000; uart_cfg.is_ext_uart = 0; + uart_cfg.dev_recv_callback = NULL; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; ioctl_cfg.args = (void *)&uart_cfg; diff --git a/APP_Framework/Applications/app_test/test_uart.c b/APP_Framework/Applications/app_test/test_uart.c index c714269ab..46624d355 100644 --- a/APP_Framework/Applications/app_test/test_uart.c +++ b/APP_Framework/Applications/app_test/test_uart.c @@ -68,6 +68,7 @@ void TestUart(int argc, char* argv[]) uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ; uart_cfg.serial_timeout = -1; uart_cfg.is_ext_uart = 0; + uart_cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c index 92f687303..7c8c71014 100644 --- a/APP_Framework/Framework/connection/4g/ec200t/ec200t.c +++ b/APP_Framework/Framework/connection/4g/ec200t/ec200t.c @@ -175,6 +175,7 @@ static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.ext_uart_no = ADAPTER_EC200T_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif + serial_cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c index d04b732b4..cb620679c 100644 --- a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c +++ b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c @@ -268,6 +268,7 @@ static int Hc08Open(struct Adapter *adapter) serial_cfg.ext_uart_no = ADAPTER_HC08_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif + serial_cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; @@ -326,6 +327,7 @@ static int Hc08Ioctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.ext_uart_no = ADAPTER_HC08_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif + serial_cfg.dev_recv_callback = NULL; serial_cfg.serial_timeout = -1; diff --git a/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c b/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c index cb8a31040..a29d4bfe6 100644 --- a/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c +++ b/APP_Framework/Framework/connection/ethernet/hfa21_ethernet/hfa21_ethernet.c @@ -407,6 +407,7 @@ static int Hfa21EthernetIoctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.ext_uart_no = ADAPTER_HFA21_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif + serial_cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/connection/lora/e22/e22.c b/APP_Framework/Framework/connection/lora/e22/e22.c index 677c02083..4cf16f88f 100644 --- a/APP_Framework/Framework/connection/lora/e22/e22.c +++ b/APP_Framework/Framework/connection/lora/e22/e22.c @@ -290,6 +290,7 @@ static int E22Open(struct Adapter *adapter) //serial receive wait forever cfg.serial_timeout = -1; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/connection/lora/e220/e220.c b/APP_Framework/Framework/connection/lora/e220/e220.c index 9a6bbf3c6..a94f24623 100644 --- a/APP_Framework/Framework/connection/lora/e220/e220.c +++ b/APP_Framework/Framework/connection/lora/e220/e220.c @@ -374,6 +374,7 @@ static int E220Open(struct Adapter *adapter) //serial receive wait forever cfg.serial_timeout = -1; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; @@ -428,6 +429,7 @@ static int E220Open(struct Adapter *adapter) //serial receive wait forever cfg.serial_timeout = -1; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/connection/nbiot/bc28/bc28.c b/APP_Framework/Framework/connection/nbiot/bc28/bc28.c index fb2887d7a..03eca2666 100644 --- a/APP_Framework/Framework/connection/nbiot/bc28/bc28.c +++ b/APP_Framework/Framework/connection/nbiot/bc28/bc28.c @@ -63,6 +63,7 @@ static int BC28UartOpen(struct Adapter *adapter) cfg.ext_uart_no = ADAPTER_BC28_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c b/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c index 4a1aa830d..7c49dc539 100755 --- a/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c +++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c @@ -81,6 +81,7 @@ static int Esp07sUartOpen(struct Adapter *adapter) cfg.ext_uart_no = ADAPTER_ESP07S_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; @@ -527,6 +528,7 @@ static int Esp07sWifiIoctl(struct Adapter *adapter, int cmd, void *args) cfg.serial_invert_mode = NRZ_NORMAL; cfg.serial_buffer_size = SERIAL_RB_BUFSZ; cfg.is_ext_uart = 0; + cfg.dev_recv_callback = NULL; #ifdef ADAPTER_ESP07S_DRIVER_EXT_PORT cfg.is_ext_uart = 1; cfg.ext_uart_no = ADAPTER_ESP07S_DRIVER_EXT_PORT; diff --git a/APP_Framework/Framework/connection/wifi/esp8285_wifi/esp8285_wifi.c b/APP_Framework/Framework/connection/wifi/esp8285_wifi/esp8285_wifi.c index 3c87225f1..32aa23933 100644 --- a/APP_Framework/Framework/connection/wifi/esp8285_wifi/esp8285_wifi.c +++ b/APP_Framework/Framework/connection/wifi/esp8285_wifi/esp8285_wifi.c @@ -81,6 +81,7 @@ static int Esp8285UartOpen(struct Adapter *adapter) cfg.ext_uart_no = ADAPTER_ESP8285_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; @@ -507,6 +508,7 @@ static int Esp8285WifiIoctl(struct Adapter *adapter, int cmd, void *args) cfg.serial_invert_mode = NRZ_NORMAL; cfg.serial_buffer_size = SERIAL_RB_BUFSZ; cfg.is_ext_uart = 0; + cfg.dev_recv_callback = NULL; #ifdef ADAPTER_ESP8285_DRIVER_EXT_PORT cfg.is_ext_uart = 1; cfg.ext_uart_no = ADAPTER_ESP8285_DRIVER_EXT_PORT; diff --git a/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c b/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c index 82545d96a..048a52f94 100755 --- a/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c +++ b/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c @@ -479,6 +479,7 @@ static int Hfa21WifiIoctl(struct Adapter *adapter, int cmd, void *args) serial_cfg.ext_uart_no = ADAPTER_HFA21_DRIVER_EXT_PORT; serial_cfg.port_configure = PORT_CFG_INIT; #endif + serial_cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/connection/zigbee/e18/e18.c b/APP_Framework/Framework/connection/zigbee/e18/e18.c index 4ebc8aed9..f7fd7c74d 100644 --- a/APP_Framework/Framework/connection/zigbee/e18/e18.c +++ b/APP_Framework/Framework/connection/zigbee/e18/e18.c @@ -160,6 +160,7 @@ static int E18UartOpen(struct Adapter *adapter) cfg.ext_uart_no = ADAPTER_E18_DRIVER_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/control/shared/control_io.c b/APP_Framework/Framework/control/shared/control_io.c index f66917152..d99d4b03f 100644 --- a/APP_Framework/Framework/control/shared/control_io.c +++ b/APP_Framework/Framework/control/shared/control_io.c @@ -97,6 +97,7 @@ void Uart485Init(uint32_t baud_rate, uint8_t data_bits, uint8_t stop_bits, uint8 cfg.port_configure = PORT_CFG_INIT; #endif cfg.serial_timeout = 10000; + cfg.dev_recv_callback = NULL; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; ioctl_cfg.args = &cfg; diff --git a/APP_Framework/Framework/sensor/ch4/as830/as830.c b/APP_Framework/Framework/sensor/ch4/as830/as830.c index 50b3a1c5c..9afb24000 100644 --- a/APP_Framework/Framework/sensor/ch4/as830/as830.c +++ b/APP_Framework/Framework/sensor/ch4/as830/as830.c @@ -58,6 +58,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_AS830_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/sensor/co2/g8s/g8s.c b/APP_Framework/Framework/sensor/co2/g8s/g8s.c index e0764c4b3..6a45081b2 100644 --- a/APP_Framework/Framework/sensor/co2/g8s/g8s.c +++ b/APP_Framework/Framework/sensor/co2/g8s/g8s.c @@ -62,6 +62,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_G8S_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/sensor/co2/zg09/zg09.c b/APP_Framework/Framework/sensor/co2/zg09/zg09.c index 3f5bcb925..852287757 100644 --- a/APP_Framework/Framework/sensor/co2/zg09/zg09.c +++ b/APP_Framework/Framework/sensor/co2/zg09/zg09.c @@ -62,6 +62,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_ZG09_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c b/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c index d1b0d3d28..2ef38611f 100644 --- a/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c +++ b/APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/tb600b_wq_hcho1os.c @@ -59,6 +59,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_TB600B_WQ_HCHO1OS_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c b/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c index 4d0a99ed3..1b97653f4 100644 --- a/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c +++ b/APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c @@ -67,6 +67,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_TB600B_IAQ10_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c b/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c index e1c405c0d..651c4705a 100644 --- a/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c +++ b/APP_Framework/Framework/sensor/pm/ps5308/ps5308.c @@ -77,6 +77,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_PS5308_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; result = PrivIoctl(sdev->fd, OPE_INT, &cfg); diff --git a/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c b/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c index 136597121..53a21f457 100644 --- a/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c +++ b/APP_Framework/Framework/sensor/tvoc/tb600b_tvoc10/tb600b_tvoc10.c @@ -59,6 +59,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_TB600B_TVOC10_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; diff --git a/APP_Framework/Framework/sensor/voice/d124/d124.c b/APP_Framework/Framework/sensor/voice/d124/d124.c index cdbf3895e..7032ad208 100644 --- a/APP_Framework/Framework/sensor/voice/d124/d124.c +++ b/APP_Framework/Framework/sensor/voice/d124/d124.c @@ -107,6 +107,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_D124_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; 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 d26c44e80..e3af110ad 100644 --- a/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c +++ b/APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c @@ -60,6 +60,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_QS_FX_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE; 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 ff8651fcb..a2d304377 100644 --- a/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c +++ b/APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c @@ -59,6 +59,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev) cfg.ext_uart_no = SENSOR_DEVICE_QS_FS_DEV_EXT_PORT; cfg.port_configure = PORT_CFG_INIT; #endif + cfg.dev_recv_callback = NULL; struct PrivIoctlCfg ioctl_cfg; ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;