From ab77fe8a09e98f7dcc942ac5fbcf1c37207cbef0 Mon Sep 17 00:00:00 2001 From: ambrumf <421653227@qq.com> Date: Mon, 23 Oct 2023 15:06:13 +0800 Subject: [PATCH] update ftpclient --- APP_Framework/Applications/app_test/Kconfig | 66 ++++++++++-------- APP_Framework/Applications/app_test/Makefile | 4 ++ .../README.md} | 2 +- .../img/01.png | Bin .../img/02.png | Bin .../img/03.png | Bin .../img/04.png | Bin .../img/05.png | Bin .../img/06.png | Bin .../img/07.png | Bin .../img/08.png | Bin .../img/09.png | Bin .../img/10.png | Bin .../test_ftpclient_riscv.c} | 2 +- .../test_ftpclient_riscv.h} | 0 15 files changed, 41 insertions(+), 33 deletions(-) rename APP_Framework/Applications/app_test/{test_ftp/readme.md => test_ftpclient_riscv/README.md} (95%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/01.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/02.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/03.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/04.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/05.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/06.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/07.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/08.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/09.png (100%) rename APP_Framework/Applications/app_test/{test_ftp => test_ftpclient_riscv}/img/10.png (100%) rename APP_Framework/Applications/app_test/{test_ftp/test_ftp.c => test_ftpclient_riscv/test_ftpclient_riscv.c} (99%) rename APP_Framework/Applications/app_test/{test_ftp/test_ftp.h => test_ftpclient_riscv/test_ftpclient_riscv.h} (100%) diff --git a/APP_Framework/Applications/app_test/Kconfig b/APP_Framework/Applications/app_test/Kconfig index 5afee6e45..74b6d0973 100644 --- a/APP_Framework/Applications/app_test/Kconfig +++ b/APP_Framework/Applications/app_test/Kconfig @@ -1,10 +1,10 @@ menu "test app" - config USER_TEST + menuconfig USER_TEST bool "Enable application test function " default n if USER_TEST - config USER_TEST_ADC + menuconfig USER_TEST_ADC bool "Config test adc" default n if USER_TEST_ADC @@ -15,7 +15,7 @@ menu "test app" endif endif - config USER_TEST_DAC + menuconfig USER_TEST_DAC bool "Config test dac" default n if USER_TEST_DAC @@ -26,7 +26,7 @@ menu "test app" endif endif - config USER_TEST_FS + menuconfig USER_TEST_FS bool "Config test fs with sd or usb" default n if USER_TEST_FS @@ -38,7 +38,7 @@ menu "test app" endif - config USER_TEST_GPIO + menuconfig USER_TEST_GPIO select BSP_USING_GPIO select RESOURCES_PIN select BSP_USING_LED @@ -53,7 +53,7 @@ menu "test app" endif endif - config USER_TEST_LORA + menuconfig USER_TEST_LORA select BSP_USING_UART select BSP_USING_GPIO select RESOURCES_PIN @@ -72,12 +72,12 @@ menu "test app" endif endif - config USER_TEST_SOCKET + menuconfig USER_TEST_SOCKET select BSP_USING_LWIP bool "Config test socket(lwip)" default n - config USER_TEST_UART + menuconfig USER_TEST_UART select BSP_USING_UART select BSP_USING_UART6 bool "Config test uart" @@ -90,7 +90,7 @@ menu "test app" endif endif - config USER_TEST_RS485 + menuconfig USER_TEST_RS485 select BSP_USING_UART select BSP_USING_GPIO select RESOURCES_PIN @@ -108,7 +108,7 @@ menu "test app" endif endif - config USER_TEST_RTC + menuconfig USER_TEST_RTC select BSP_USING_RTC bool "Config test rtc" default n @@ -120,7 +120,7 @@ menu "test app" endif endif - config USER_TEST_HWTIMER + menuconfig USER_TEST_HWTIMER select BSP_USING_HWTIMER select BSP_USING_GPIO select RESOURCES_PIN @@ -138,7 +138,7 @@ menu "test app" endif endif - config USER_TEST_WDT + menuconfig USER_TEST_WDT select BSP_USING_WDT0 bool "Config test watchdog" default n @@ -150,7 +150,7 @@ menu "test app" endif endif - config USER_TEST_LCD_EDU + menuconfig USER_TEST_LCD_EDU select BSP_USING_LCD bool "Config test lcd in PrivOpen" default n @@ -162,7 +162,7 @@ menu "test app" endif endif - config USER_TEST_TOUCH + menuconfig USER_TEST_TOUCH select BSP_USING_TOUCH bool "Config test touch" default n @@ -177,7 +177,7 @@ menu "test app" endif endif - config USER_TEST_I2C + menuconfig USER_TEST_I2C select BSP_USING_I2C bool "Config test i2c" default n @@ -189,7 +189,7 @@ menu "test app" endif endif - config USER_TEST_CAN + menuconfig USER_TEST_CAN select BSP_USING_CAN bool "Config test can" default n @@ -201,7 +201,7 @@ menu "test app" endif endif - config USER_TEST_CAMERA + menuconfig USER_TEST_CAMERA select BSP_USING_CAMERA select BSP_USING_LCD bool "Config test camera with lcd" @@ -225,7 +225,7 @@ menu "test app" bool "Config test lcd device" default n - config USER_TEST_ETHERNET + menuconfig USER_TEST_ETHERNET bool "Config test ethernet only for edu-riscv64" default n if USER_TEST_ETHERNET @@ -243,7 +243,7 @@ menu "test app" endif endif - config USER_TEST_FLASH + menuconfig USER_TEST_FLASH bool "Config test w25q128 device" default n if USER_TEST_FLASH @@ -254,51 +254,55 @@ menu "test app" endif endif - config USER_TEST_TIMER + menuconfig USER_TEST_TIMER bool "Config test soft timer" default n - config USER_TEST_HASH + menuconfig USER_TEST_HASH bool "Config test hash" default n - config USER_TEST_RADIX + menuconfig USER_TEST_RADIX bool "Config test radix tree" default n - config USER_TEST_RBTREE + menuconfig USER_TEST_RBTREE bool "Config test red black tree" default n - config USER_TEST_MODBUS_TCP + menuconfig USER_TEST_MODBUS_TCP bool "Config test modbus_tcp" default n - config USER_TEST_WEBSERVER + menuconfig USER_TEST_WEBSERVER bool "Config test webserver" default n - config USER_TEST_MQTTCLIENT + menuconfig USER_TEST_MQTTCLIENT bool "Config test mqtt client" default n - config USER_TEST_FTPCLIENT + menuconfig USER_TEST_FTPCLIENT bool "Config test ftp client" default n - config USER_TEST_LORA_P2P + menuconfig USER_TEST_FTPCLIENT_RISCV + bool "Config test ftp client on riscv" + default n + + menuconfig USER_TEST_LORA_P2P bool "Config test lora p2p" default n - config USER_TEST_LORAWAN_SINGLEGW + menuconfig USER_TEST_LORAWAN_SINGLEGW bool "Config test lorawan single channel gateway" default n - config USER_TEST_CANOPEN + menuconfig USER_TEST_CANOPEN bool "Config test CanOpen" default n - config USER_TEST_USB_CAMERA + menuconfig USER_TEST_USB_CAMERA bool "Config test usb camera" default n diff --git a/APP_Framework/Applications/app_test/Makefile b/APP_Framework/Applications/app_test/Makefile index 47ead8787..6dc87c22c 100644 --- a/APP_Framework/Applications/app_test/Makefile +++ b/APP_Framework/Applications/app_test/Makefile @@ -141,6 +141,10 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) SRC_FILES += endif + ifeq ($(CONFIG_USER_TEST_FTPCLIENT_RISCV),y) + SRC_FILES += tes_ftpclient_riscv/test_ftpclient_riscv.c + endif + ifeq ($(CONFIG_USER_TEST_LORA_P2P),y) SRC_FILES += endif diff --git a/APP_Framework/Applications/app_test/test_ftp/readme.md b/APP_Framework/Applications/app_test/test_ftpclient_riscv/README.md similarity index 95% rename from APP_Framework/Applications/app_test/test_ftp/readme.md rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/README.md index b2d1fb59f..9d6949470 100644 --- a/APP_Framework/Applications/app_test/test_ftp/readme.md +++ b/APP_Framework/Applications/app_test/test_ftpclient_riscv/README.md @@ -1,4 +1,4 @@ -# 基于矽璓已实现的Lwip，在Riscv上实现FTP协议的Client功能 # +# 基于矽璓已实现的W5500网卡驱动，在Riscv上实现FTP协议的Client功能 # ## 1. 简介 利用w5500网络编程的api实现了ftp客户端的功能，具体功能包括向ftp服务器发送指定命令，根据用户名登陆ftp服务器，获取文件大小，下载指定文件并保存至sd卡内，并提供了测试函数模拟从ftp服务器上下载10个4KB文件的过程 diff --git a/APP_Framework/Applications/app_test/test_ftp/img/01.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/01.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/01.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/01.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/02.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/02.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/02.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/02.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/03.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/03.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/03.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/03.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/04.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/04.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/04.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/04.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/05.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/05.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/05.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/05.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/06.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/06.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/06.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/06.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/07.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/07.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/07.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/07.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/08.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/08.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/08.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/08.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/09.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/09.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/09.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/09.png diff --git a/APP_Framework/Applications/app_test/test_ftp/img/10.png b/APP_Framework/Applications/app_test/test_ftpclient_riscv/img/10.png similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/img/10.png rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/img/10.png diff --git a/APP_Framework/Applications/app_test/test_ftp/test_ftp.c b/APP_Framework/Applications/app_test/test_ftpclient_riscv/test_ftpclient_riscv.c similarity index 99% rename from APP_Framework/Applications/app_test/test_ftp/test_ftp.c rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/test_ftpclient_riscv.c index 4639ce124..876788358 100644 --- a/APP_Framework/Applications/app_test/test_ftp/test_ftp.c +++ b/APP_Framework/Applications/app_test/test_ftpclient_riscv/test_ftpclient_riscv.c @@ -16,7 +16,7 @@ http://license.coscl.org.cn/MulanPSL2 #include #include #include -#include "test_ftp.h" +#include "test_ftpclient_riscv.h" #define SOCKET_DATA 2 #define SOCKET_CMD 3 char sendBuffer[1024]; diff --git a/APP_Framework/Applications/app_test/test_ftp/test_ftp.h b/APP_Framework/Applications/app_test/test_ftpclient_riscv/test_ftpclient_riscv.h similarity index 100% rename from APP_Framework/Applications/app_test/test_ftp/test_ftp.h rename to APP_Framework/Applications/app_test/test_ftpclient_riscv/test_ftpclient_riscv.h