From 6e4d1fae2a422725b40b36d7e81a3945a16966e0 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Fri, 20 Oct 2017 12:53:18 +0800 Subject: [修改]: stm32f429-apollo 3.0 修改。 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32f429-apollo/.config | 129 ++++++++++++++++++------ bsp/stm32f429-apollo/KConfig | 64 ++++++++++++ bsp/stm32f429-apollo/applications/application.c | 2 +- bsp/stm32f429-apollo/drivers/drv_eth.c | 11 ++ bsp/stm32f429-apollo/rtconfig.h | 125 +++++++++++++++++------ bsp/stm32f429-apollo/rtconfig.py | 1 + 6 files changed, 267 insertions(+), 65 deletions(-) diff --git a/bsp/stm32f429-apollo/.config b/bsp/stm32f429-apollo/.config index 6e19a928f3..8fdc9ee5b8 100644 --- a/bsp/stm32f429-apollo/.config +++ b/bsp/stm32f429-apollo/.config @@ -26,6 +26,7 @@ CONFIG_RT_USING_MUTEX=y CONFIG_RT_USING_EVENT=y CONFIG_RT_USING_MAILBOX=y CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_SIGNALS is not set # # Memory Management @@ -60,33 +61,33 @@ CONFIG_RT_USING_COMPONENTS_INIT=y # Command shell # CONFIG_RT_USING_FINSH=y +CONFIG_FINSH_USING_HISTORY=y CONFIG_FINSH_USING_SYMTAB=y CONFIG_FINSH_USING_DESCRIPTION=y +CONFIG_FINSH_THREAD_PRIORITY=20 CONFIG_FINSH_THREAD_STACK_SIZE=2048 +CONFIG_FINSH_CMD_SIZE=80 # CONFIG_FINSH_USING_AUTH is not set -CONFIG_FINSH_DEFAULT_PASSWORD="rtthread" # CONFIG_FINSH_USING_MSH is not set -# CONFIG_FINSH_USING_MSH_DEFAULT is not set -# CONFIG_FINSH_USING_MSH_ONLY is not set # # Device virtual file system # CONFIG_RT_USING_DFS=y -# CONFIG_DFS_USING_WORKDIR is not set -CONFIG_DFS_FILESYSTEMS_MAX=4 -CONFIG_DFS_FD_MAX=16 +CONFIG_DFS_USING_WORKDIR=y +CONFIG_DFS_FILESYSTEMS_MAX=2 +CONFIG_DFS_FD_MAX=4 CONFIG_RT_USING_DFS_ELMFAT=y CONFIG_RT_DFS_ELM_CODE_PAGE=437 CONFIG_RT_DFS_ELM_WORD_ACCESS=y -# CONFIG_RT_DFS_ELM_USE_LFN_0 is not set +CONFIG_RT_DFS_ELM_USE_LFN_0=y # CONFIG_RT_DFS_ELM_USE_LFN_1 is not set # CONFIG_RT_DFS_ELM_USE_LFN_2 is not set -CONFIG_RT_DFS_ELM_USE_LFN_3=y -CONFIG_RT_DFS_ELM_USE_LFN=3 +# CONFIG_RT_DFS_ELM_USE_LFN_3 is not set +CONFIG_RT_DFS_ELM_USE_LFN=0 CONFIG_RT_DFS_ELM_MAX_LFN=255 CONFIG_RT_DFS_ELM_DRIVES=2 -CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=4096 +CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 # CONFIG_RT_DFS_ELM_USE_ERASE is not set CONFIG_RT_DFS_ELM_REENTRANT=y CONFIG_RT_USING_DFS_DEVFS=y @@ -105,27 +106,20 @@ CONFIG_RT_USING_I2C_BITOPS=y # CONFIG_RT_USING_PIN is not set # CONFIG_RT_USING_MTD_NOR is not set CONFIG_RT_USING_MTD_NAND=y -CONFIG_RT_MTD_NAND_DEBUG=y +# CONFIG_RT_MTD_NAND_DEBUG is not set CONFIG_RT_USING_RTC=y -CONFIG_RT_USING_SDIO=y -CONFIG_RT_USING_SPI=y -CONFIG_RT_USING_SFUD=y -CONFIG_RT_SFUD_USING_SFDP=y -CONFIG_RT_SFUD_USING_FLASH_INFO_TABLE=y -CONFIG_RT_SFUD_DEBUG=y -# CONFIG_RT_USING_W25QXX is not set -# CONFIG_RT_USING_GD is not set -# CONFIG_RT_USING_ENC28J60 is not set -# CONFIG_RT_USING_SPI_WIFI is not set +# CONFIG_RT_USING_SDIO is not set +# CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_WDT is not set # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set # -# libc +# POSIX layer and C standard library # CONFIG_RT_USING_LIBC=y # CONFIG_RT_USING_PTHREADS is not set +# CONFIG_RT_USING_POSIX is not set # # Network stack @@ -134,47 +128,99 @@ CONFIG_RT_USING_LIBC=y # # light weight TCP/IP stack # -# CONFIG_RT_USING_LWIP is not set +CONFIG_RT_USING_LWIP=y +CONFIG_RT_USING_LWIP141=y +# CONFIG_RT_USING_LWIP202 is not set +# CONFIG_RT_LWIP_IGMP is not set +CONFIG_RT_LWIP_ICMP=y +# CONFIG_RT_LWIP_SNMP is not set +CONFIG_RT_LWIP_DNS=y +CONFIG_RT_LWIP_DHCP=y +CONFIG_IP_SOF_BROADCAST=1 +CONFIG_IP_SOF_BROADCAST_RECV=1 +CONFIG_LWIP_USING_DHCPD=y +CONFIG_RT_LWIP_UDP=y +CONFIG_RT_LWIP_TCP=y +# CONFIG_RT_LWIP_RAW is not set +# CONFIG_RT_LWIP_PPP is not set +# CONFIG_RT_LWIP_PPPOE is not set +# CONFIG_RT_LWIP_PPPOS is not set +CONFIG_RT_LWIP_PBUF_NUM=16 +CONFIG_RT_LWIP_RAW_PCB_NUM=4 +CONFIG_RT_LWIP_UDP_PCB_NUM=4 +CONFIG_RT_LWIP_TCP_PCB_NUM=4 +CONFIG_RT_LWIP_TCP_SEG_NUM=40 +CONFIG_RT_LWIP_TCP_SND_BUF=8196 +CONFIG_RT_LWIP_TCP_WND=8196 +CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=10 +CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=8 +CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=1024 +CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=12 +CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=1024 +CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=8 +# CONFIG_RT_LWIP_REASSEMBLY_FRAG is not set +CONFIG_LWIP_NETIF_STATUS_CALLBACK=1 +CONFIG_SO_REUSE=1 +CONFIG_LWIP_SO_RCVTIMEO=1 +CONFIG_LWIP_SO_SNDTIMEO=1 +CONFIG_LWIP_SO_RCVBUF=1 # # Modbus master and slave stack # # CONFIG_RT_USING_MODBUS is not set +# CONFIG_RT_USING_NETUTILS is not set + +# +# RT-Thread UI Engine +# +# CONFIG_RT_USING_GUIENGINE is not set # # RT-Thread online packages # +# +# system packages +# +# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_SQLITE is not set + # # IoT - internet of things # # CONFIG_PKG_USING_CJSON is not set -# CONFIG_PKG_USING_PAHOMQTT is not set +CONFIG_PKG_USING_PAHOMQTT=y +CONFIG_PKG_PAHOMQTT_PATH="/packages/iot/pahomqtt" +CONFIG_PKG_PAHOMQTT_VER="v1.0.0" # CONFIG_PKG_USING_WEBCLIENT is not set +# CONFIG_PKG_USING_MONGOOSE is not set +# CONFIG_PKG_USING_WEBTERMINAL is not set # -# language packages +# security packages # -# CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MBEDTLS is not set # -# miscellaneous packages +# language packages # -# CONFIG_PKG_USING_HELLO is not set +# CONFIG_PKG_USING_JERRYSCRIPT is not set # # multimedia packages # # -# security packages +# tools packages # +# CONFIG_PKG_USING_CMBACKTRACE is not set +# CONFIG_PKG_USING_EASYLOGGER is not set # -# system packages +# miscellaneous packages # -# CONFIG_PKG_USING_CMBACKTRACE is not set -# CONFIG_PKG_USING_PARTITION is not set +# CONFIG_PKG_USING_HELLO is not set # # BSP_SPECIAL CONFIG @@ -185,3 +231,22 @@ CONFIG_RT_USING_UART1=y CONFIG_RT_USING_UART2=y CONFIG_RT_USING_UART3=y CONFIG_RT_USING_SPI5=y + +# +# BSP_LWIP CONFIG +# +CONFIG_RT_LWIP_IPADDR0=192 +CONFIG_RT_LWIP_IPADDR1=168 +CONFIG_RT_LWIP_IPADDR2=1 +CONFIG_RT_LWIP_IPADDR3=201 +CONFIG_RT_LWIP_GWADDR0=192 +CONFIG_RT_LWIP_GWADDR1=168 +CONFIG_RT_LWIP_GWADDR2=1 +CONFIG_RT_LWIP_GWADDR3=1 +CONFIG_RT_LWIP_MSKADDR0=255 +CONFIG_RT_LWIP_MSKADDR1=255 +CONFIG_RT_LWIP_MSKADDR2=255 +CONFIG_RT_LWIP_MSKADDR3=0 +CONFIG_CHECKSUM_CHECK_TCP=0 +CONFIG_CHECKSUM_CHECK_IP=0 +CONFIG_CHECKSUM_CHECK_UDP=0 diff --git a/bsp/stm32f429-apollo/KConfig b/bsp/stm32f429-apollo/KConfig index 1ca578f6d2..e155d26cba 100644 --- a/bsp/stm32f429-apollo/KConfig +++ b/bsp/stm32f429-apollo/KConfig @@ -46,6 +46,70 @@ config RT_USING_SPI5 endmenu +menu "BSP_LWIP CONFIG" + +config RT_LWIP_IPADDR0 + int "RT_LWIP_IPADDR0" + default 192 + +config RT_LWIP_IPADDR1 + int "RT_LWIP_IPADDR1" + default 168 + +config RT_LWIP_IPADDR2 + int "RT_LWIP_IPADDR2" + default 1 + +config RT_LWIP_IPADDR3 + int "RT_LWIP_IPADDR3" + default 201 + +config RT_LWIP_GWADDR0 + int "RT_LWIP_GWADDR0" + default 192 + +config RT_LWIP_GWADDR1 + int "RT_LWIP_GWADDR1" + default 168 + +config RT_LWIP_GWADDR2 + int "RT_LWIP_GWADDR2" + default 1 + +config RT_LWIP_GWADDR3 + int "RT_LWIP_GWADDR3" + default 1 + +config RT_LWIP_MSKADDR0 + int "RT_LWIP_MSKADDR0" + default 255 + +config RT_LWIP_MSKADDR1 + int "RT_LWIP_MSKADDR1" + default 255 + +config RT_LWIP_MSKADDR2 + int "RT_LWIP_MSKADDR2" + default 255 + +config RT_LWIP_MSKADDR3 + int "RT_LWIP_MSKADDR3" + default 0 + +config CHECKSUM_CHECK_TCP + int "CHECKSUM_CHECK_TCP" + default 0 + +config CHECKSUM_CHECK_IP + int "The CHECKSUM_CHECK_IP" + default 0 + +config CHECKSUM_CHECK_UDP + int "The CHECKSUM_CHECK_UDP" + default 0 + +endmenu + diff --git a/bsp/stm32f429-apollo/applications/application.c b/bsp/stm32f429-apollo/applications/application.c index a3201a0034..50d83efac1 100644 --- a/bsp/stm32f429-apollo/applications/application.c +++ b/bsp/stm32f429-apollo/applications/application.c @@ -20,7 +20,7 @@ #include "time.h" #ifdef RT_USING_DFS /* dfs init */ -#include + /* dfs filesystem:ELM filesystem init */ #include /* dfs Filesystem APIs */ diff --git a/bsp/stm32f429-apollo/drivers/drv_eth.c b/bsp/stm32f429-apollo/drivers/drv_eth.c index c5538d1c80..e1c9f0365a 100644 --- a/bsp/stm32f429-apollo/drivers/drv_eth.c +++ b/bsp/stm32f429-apollo/drivers/drv_eth.c @@ -117,6 +117,17 @@ void HAL_ETH_ErrorCallback(ETH_HandleTypeDef *heth) { rt_kprintf("eth err\n"); } +static void delay_ms(rt_uint32_t ms) +{ + if (ms < 1000 / RT_TICK_PER_SECOND) + { + rt_thread_delay(1); + } + else + { + rt_thread_delay(ms/(1000 / RT_TICK_PER_SECOND)); + } +} static void phy_pin_reset(void) { diff --git a/bsp/stm32f429-apollo/rtconfig.h b/bsp/stm32f429-apollo/rtconfig.h index f8b3a5a6c1..26ab08807b 100644 --- a/bsp/stm32f429-apollo/rtconfig.h +++ b/bsp/stm32f429-apollo/rtconfig.h @@ -25,6 +25,7 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* RT_USING_SIGNALS is not set */ /* Memory Management */ @@ -54,32 +55,32 @@ /* Command shell */ #define RT_USING_FINSH +#define FINSH_USING_HISTORY #define FINSH_USING_SYMTAB #define FINSH_USING_DESCRIPTION +#define FINSH_THREAD_PRIORITY 20 #define FINSH_THREAD_STACK_SIZE 2048 +#define FINSH_CMD_SIZE 80 /* FINSH_USING_AUTH is not set */ -#define FINSH_DEFAULT_PASSWORD "rtthread" /* FINSH_USING_MSH is not set */ -/* FINSH_USING_MSH_DEFAULT is not set */ -/* FINSH_USING_MSH_ONLY is not set */ /* Device virtual file system */ #define RT_USING_DFS -/* DFS_USING_WORKDIR is not set */ -#define DFS_FILESYSTEMS_MAX 4 -#define DFS_FD_MAX 16 +#define DFS_USING_WORKDIR +#define DFS_FILESYSTEMS_MAX 2 +#define DFS_FD_MAX 4 #define RT_USING_DFS_ELMFAT #define RT_DFS_ELM_CODE_PAGE 437 #define RT_DFS_ELM_WORD_ACCESS -/* RT_DFS_ELM_USE_LFN_0 is not set */ +#define RT_DFS_ELM_USE_LFN_0 /* RT_DFS_ELM_USE_LFN_1 is not set */ /* RT_DFS_ELM_USE_LFN_2 is not set */ -#define RT_DFS_ELM_USE_LFN_3 -#define RT_DFS_ELM_USE_LFN 3 +/* RT_DFS_ELM_USE_LFN_3 is not set */ +#define RT_DFS_ELM_USE_LFN 0 #define RT_DFS_ELM_MAX_LFN 255 #define RT_DFS_ELM_DRIVES 2 -#define RT_DFS_ELM_MAX_SECTOR_SIZE 4096 +#define RT_DFS_ELM_MAX_SECTOR_SIZE 512 /* RT_DFS_ELM_USE_ERASE is not set */ #define RT_DFS_ELM_REENTRANT #define RT_USING_DFS_DEVFS @@ -97,61 +98,103 @@ /* RT_USING_PIN is not set */ /* RT_USING_MTD_NOR is not set */ #define RT_USING_MTD_NAND -#define RT_MTD_NAND_DEBUG +/* RT_MTD_NAND_DEBUG is not set */ #define RT_USING_RTC -#define RT_USING_SDIO -#define RT_USING_SPI -#define RT_USING_SFUD -#define RT_SFUD_USING_SFDP -#define RT_SFUD_USING_FLASH_INFO_TABLE -#define RT_SFUD_DEBUG -/* RT_USING_W25QXX is not set */ -/* RT_USING_GD is not set */ -/* RT_USING_ENC28J60 is not set */ -/* RT_USING_SPI_WIFI is not set */ +/* RT_USING_SDIO is not set */ +/* RT_USING_SPI is not set */ /* RT_USING_WDT is not set */ /* RT_USING_USB_HOST is not set */ /* RT_USING_USB_DEVICE is not set */ -/* libc */ +/* POSIX layer and C standard library */ #define RT_USING_LIBC /* RT_USING_PTHREADS is not set */ +/* RT_USING_POSIX is not set */ /* Network stack */ /* light weight TCP/IP stack */ -/* RT_USING_LWIP is not set */ +#define RT_USING_LWIP +#define RT_USING_LWIP141 +/* RT_USING_LWIP202 is not set */ +/* RT_LWIP_IGMP is not set */ +#define RT_LWIP_ICMP +/* RT_LWIP_SNMP is not set */ +#define RT_LWIP_DNS +#define RT_LWIP_DHCP +#define IP_SOF_BROADCAST 1 +#define IP_SOF_BROADCAST_RECV 1 +#define LWIP_USING_DHCPD +#define RT_LWIP_UDP +#define RT_LWIP_TCP +/* RT_LWIP_RAW is not set */ +/* RT_LWIP_PPP is not set */ +/* RT_LWIP_PPPOE is not set */ +/* RT_LWIP_PPPOS is not set */ +#define RT_LWIP_PBUF_NUM 16 +#define RT_LWIP_RAW_PCB_NUM 4 +#define RT_LWIP_UDP_PCB_NUM 4 +#define RT_LWIP_TCP_PCB_NUM 4 +#define RT_LWIP_TCP_SEG_NUM 40 +#define RT_LWIP_TCP_SND_BUF 8196 +#define RT_LWIP_TCP_WND 8196 +#define RT_LWIP_TCPTHREAD_PRIORITY 10 +#define RT_LWIP_TCPTHREAD_MBOX_SIZE 8 +#define RT_LWIP_TCPTHREAD_STACKSIZE 1024 +#define RT_LWIP_ETHTHREAD_PRIORITY 12 +#define RT_LWIP_ETHTHREAD_STACKSIZE 1024 +#define RT_LWIP_ETHTHREAD_MBOX_SIZE 8 +/* RT_LWIP_REASSEMBLY_FRAG is not set */ +#define LWIP_NETIF_STATUS_CALLBACK 1 +#define SO_REUSE 1 +#define LWIP_SO_RCVTIMEO 1 +#define LWIP_SO_SNDTIMEO 1 +#define LWIP_SO_RCVBUF 1 /* Modbus master and slave stack */ /* RT_USING_MODBUS is not set */ +/* RT_USING_NETUTILS is not set */ + +/* RT-Thread UI Engine */ + +/* RT_USING_GUIENGINE is not set */ /* RT-Thread online packages */ +/* system packages */ + +/* PKG_USING_PARTITION is not set */ +/* PKG_USING_SQLITE is not set */ + /* IoT - internet of things */ /* PKG_USING_CJSON is not set */ -/* PKG_USING_PAHOMQTT is not set */ +#define PKG_USING_PAHOMQTT /* PKG_USING_WEBCLIENT is not set */ +/* PKG_USING_MONGOOSE is not set */ +/* PKG_USING_WEBTERMINAL is not set */ -/* language packages */ +/* security packages */ -/* PKG_USING_JERRYSCRIPT is not set */ +/* PKG_USING_MBEDTLS is not set */ -/* miscellaneous packages */ +/* language packages */ -/* PKG_USING_HELLO is not set */ +/* PKG_USING_JERRYSCRIPT is not set */ /* multimedia packages */ -/* security packages */ - -/* system packages */ +/* tools packages */ /* PKG_USING_CMBACKTRACE is not set */ -/* PKG_USING_PARTITION is not set */ +/* PKG_USING_EASYLOGGER is not set */ + +/* miscellaneous packages */ + +/* PKG_USING_HELLO is not set */ /* BSP_SPECIAL CONFIG */ @@ -162,4 +205,22 @@ #define RT_USING_UART3 #define RT_USING_SPI5 +/* BSP_LWIP CONFIG */ + +#define RT_LWIP_IPADDR0 192 +#define RT_LWIP_IPADDR1 168 +#define RT_LWIP_IPADDR2 1 +#define RT_LWIP_IPADDR3 201 +#define RT_LWIP_GWADDR0 192 +#define RT_LWIP_GWADDR1 168 +#define RT_LWIP_GWADDR2 1 +#define RT_LWIP_GWADDR3 1 +#define RT_LWIP_MSKADDR0 255 +#define RT_LWIP_MSKADDR1 255 +#define RT_LWIP_MSKADDR2 255 +#define RT_LWIP_MSKADDR3 0 +#define CHECKSUM_CHECK_TCP 0 +#define CHECKSUM_CHECK_IP 0 +#define CHECKSUM_CHECK_UDP 0 + #endif diff --git a/bsp/stm32f429-apollo/rtconfig.py b/bsp/stm32f429-apollo/rtconfig.py index 50b58434d9..16cd658809 100644 --- a/bsp/stm32f429-apollo/rtconfig.py +++ b/bsp/stm32f429-apollo/rtconfig.py @@ -1,4 +1,5 @@ import os +import scons_config # toolchains options ARCH='arm' -- cgit v1.3.1 From 9ebae26b7f3b83b619af988fec0f7642baaa5838 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Fri, 20 Oct 2017 14:25:31 +0800 Subject: update .config rtconfig.h --- bsp/stm32f429-apollo/.config | 4 +--- bsp/stm32f429-apollo/rtconfig.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bsp/stm32f429-apollo/.config b/bsp/stm32f429-apollo/.config index 8fdc9ee5b8..2ef2e51258 100644 --- a/bsp/stm32f429-apollo/.config +++ b/bsp/stm32f429-apollo/.config @@ -190,9 +190,7 @@ CONFIG_LWIP_SO_RCVBUF=1 # IoT - internet of things # # CONFIG_PKG_USING_CJSON is not set -CONFIG_PKG_USING_PAHOMQTT=y -CONFIG_PKG_PAHOMQTT_PATH="/packages/iot/pahomqtt" -CONFIG_PKG_PAHOMQTT_VER="v1.0.0" +# CONFIG_PKG_USING_PAHOMQTT is not set # CONFIG_PKG_USING_WEBCLIENT is not set # CONFIG_PKG_USING_MONGOOSE is not set # CONFIG_PKG_USING_WEBTERMINAL is not set diff --git a/bsp/stm32f429-apollo/rtconfig.h b/bsp/stm32f429-apollo/rtconfig.h index 26ab08807b..b825fd2acb 100644 --- a/bsp/stm32f429-apollo/rtconfig.h +++ b/bsp/stm32f429-apollo/rtconfig.h @@ -172,7 +172,7 @@ /* IoT - internet of things */ /* PKG_USING_CJSON is not set */ -#define PKG_USING_PAHOMQTT +/* PKG_USING_PAHOMQTT is not set */ /* PKG_USING_WEBCLIENT is not set */ /* PKG_USING_MONGOOSE is not set */ /* PKG_USING_WEBTERMINAL is not set */ -- cgit v1.3.1 From 23ee66c63c66006e8bee3c033902631ef2dfcaec Mon Sep 17 00:00:00 2001 From: SummerGift Date: Fri, 20 Oct 2017 15:02:42 +0800 Subject: update rtconfig.py --- bsp/stm32f429-apollo/rtconfig.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bsp/stm32f429-apollo/rtconfig.py b/bsp/stm32f429-apollo/rtconfig.py index 16cd658809..50b58434d9 100644 --- a/bsp/stm32f429-apollo/rtconfig.py +++ b/bsp/stm32f429-apollo/rtconfig.py @@ -1,5 +1,4 @@ import os -import scons_config # toolchains options ARCH='arm' -- cgit v1.3.1 From a98fc2909af32b0ba9470763e91c404c013bff33 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Fri, 20 Oct 2017 18:33:05 +0800 Subject: update apollo bsp --- bsp/stm32f429-apollo/.config | 22 +++---------- bsp/stm32f429-apollo/KConfig | 58 ---------------------------------- bsp/stm32f429-apollo/drivers/drv_eth.c | 2 +- bsp/stm32f429-apollo/rtconfig.h | 22 +++---------- 4 files changed, 9 insertions(+), 95 deletions(-) diff --git a/bsp/stm32f429-apollo/.config b/bsp/stm32f429-apollo/.config index 2ef2e51258..5d12c9fcc0 100644 --- a/bsp/stm32f429-apollo/.config +++ b/bsp/stm32f429-apollo/.config @@ -129,8 +129,8 @@ CONFIG_RT_USING_LIBC=y # light weight TCP/IP stack # CONFIG_RT_USING_LWIP=y -CONFIG_RT_USING_LWIP141=y -# CONFIG_RT_USING_LWIP202 is not set +# CONFIG_RT_USING_LWIP141 is not set +CONFIG_RT_USING_LWIP202=y # CONFIG_RT_LWIP_IGMP is not set CONFIG_RT_LWIP_ICMP=y # CONFIG_RT_LWIP_SNMP is not set @@ -189,11 +189,12 @@ CONFIG_LWIP_SO_RCVBUF=1 # # IoT - internet of things # -# CONFIG_PKG_USING_CJSON is not set # CONFIG_PKG_USING_PAHOMQTT is not set # CONFIG_PKG_USING_WEBCLIENT is not set # CONFIG_PKG_USING_MONGOOSE is not set # CONFIG_PKG_USING_WEBTERMINAL is not set +# CONFIG_PKG_USING_CJSON is not set +# CONFIG_PKG_USING_EZXML is not set # # security packages @@ -233,18 +234,3 @@ CONFIG_RT_USING_SPI5=y # # BSP_LWIP CONFIG # -CONFIG_RT_LWIP_IPADDR0=192 -CONFIG_RT_LWIP_IPADDR1=168 -CONFIG_RT_LWIP_IPADDR2=1 -CONFIG_RT_LWIP_IPADDR3=201 -CONFIG_RT_LWIP_GWADDR0=192 -CONFIG_RT_LWIP_GWADDR1=168 -CONFIG_RT_LWIP_GWADDR2=1 -CONFIG_RT_LWIP_GWADDR3=1 -CONFIG_RT_LWIP_MSKADDR0=255 -CONFIG_RT_LWIP_MSKADDR1=255 -CONFIG_RT_LWIP_MSKADDR2=255 -CONFIG_RT_LWIP_MSKADDR3=0 -CONFIG_CHECKSUM_CHECK_TCP=0 -CONFIG_CHECKSUM_CHECK_IP=0 -CONFIG_CHECKSUM_CHECK_UDP=0 diff --git a/bsp/stm32f429-apollo/KConfig b/bsp/stm32f429-apollo/KConfig index e155d26cba..434acdc7eb 100644 --- a/bsp/stm32f429-apollo/KConfig +++ b/bsp/stm32f429-apollo/KConfig @@ -48,65 +48,7 @@ endmenu menu "BSP_LWIP CONFIG" -config RT_LWIP_IPADDR0 - int "RT_LWIP_IPADDR0" - default 192 - -config RT_LWIP_IPADDR1 - int "RT_LWIP_IPADDR1" - default 168 - -config RT_LWIP_IPADDR2 - int "RT_LWIP_IPADDR2" - default 1 - -config RT_LWIP_IPADDR3 - int "RT_LWIP_IPADDR3" - default 201 - -config RT_LWIP_GWADDR0 - int "RT_LWIP_GWADDR0" - default 192 - -config RT_LWIP_GWADDR1 - int "RT_LWIP_GWADDR1" - default 168 - -config RT_LWIP_GWADDR2 - int "RT_LWIP_GWADDR2" - default 1 - -config RT_LWIP_GWADDR3 - int "RT_LWIP_GWADDR3" - default 1 -config RT_LWIP_MSKADDR0 - int "RT_LWIP_MSKADDR0" - default 255 - -config RT_LWIP_MSKADDR1 - int "RT_LWIP_MSKADDR1" - default 255 - -config RT_LWIP_MSKADDR2 - int "RT_LWIP_MSKADDR2" - default 255 - -config RT_LWIP_MSKADDR3 - int "RT_LWIP_MSKADDR3" - default 0 - -config CHECKSUM_CHECK_TCP - int "CHECKSUM_CHECK_TCP" - default 0 - -config CHECKSUM_CHECK_IP - int "The CHECKSUM_CHECK_IP" - default 0 - -config CHECKSUM_CHECK_UDP - int "The CHECKSUM_CHECK_UDP" - default 0 endmenu diff --git a/bsp/stm32f429-apollo/drivers/drv_eth.c b/bsp/stm32f429-apollo/drivers/drv_eth.c index e1c9f0365a..257e34f701 100644 --- a/bsp/stm32f429-apollo/drivers/drv_eth.c +++ b/bsp/stm32f429-apollo/drivers/drv_eth.c @@ -125,7 +125,7 @@ static void delay_ms(rt_uint32_t ms) } else { - rt_thread_delay(ms/(1000 / RT_TICK_PER_SECOND)); + rt_thread_delay(rt_tick_from_millisecond(ms)); } } diff --git a/bsp/stm32f429-apollo/rtconfig.h b/bsp/stm32f429-apollo/rtconfig.h index b825fd2acb..65a347ded1 100644 --- a/bsp/stm32f429-apollo/rtconfig.h +++ b/bsp/stm32f429-apollo/rtconfig.h @@ -117,8 +117,8 @@ /* light weight TCP/IP stack */ #define RT_USING_LWIP -#define RT_USING_LWIP141 -/* RT_USING_LWIP202 is not set */ +/* RT_USING_LWIP141 is not set */ +#define RT_USING_LWIP202 /* RT_LWIP_IGMP is not set */ #define RT_LWIP_ICMP /* RT_LWIP_SNMP is not set */ @@ -171,11 +171,12 @@ /* IoT - internet of things */ -/* PKG_USING_CJSON is not set */ /* PKG_USING_PAHOMQTT is not set */ /* PKG_USING_WEBCLIENT is not set */ /* PKG_USING_MONGOOSE is not set */ /* PKG_USING_WEBTERMINAL is not set */ +/* PKG_USING_CJSON is not set */ +/* PKG_USING_EZXML is not set */ /* security packages */ @@ -207,20 +208,5 @@ /* BSP_LWIP CONFIG */ -#define RT_LWIP_IPADDR0 192 -#define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 1 -#define RT_LWIP_IPADDR3 201 -#define RT_LWIP_GWADDR0 192 -#define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 1 -#define RT_LWIP_GWADDR3 1 -#define RT_LWIP_MSKADDR0 255 -#define RT_LWIP_MSKADDR1 255 -#define RT_LWIP_MSKADDR2 255 -#define RT_LWIP_MSKADDR3 0 -#define CHECKSUM_CHECK_TCP 0 -#define CHECKSUM_CHECK_IP 0 -#define CHECKSUM_CHECK_UDP 0 #endif -- cgit v1.3.1 From 70059232cf4555120f0c8fd6ec14344cae0d7555 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Fri, 20 Oct 2017 18:37:03 +0800 Subject: update KConfig --- bsp/stm32f429-apollo/KConfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bsp/stm32f429-apollo/KConfig b/bsp/stm32f429-apollo/KConfig index 434acdc7eb..1ca578f6d2 100644 --- a/bsp/stm32f429-apollo/KConfig +++ b/bsp/stm32f429-apollo/KConfig @@ -46,12 +46,6 @@ config RT_USING_SPI5 endmenu -menu "BSP_LWIP CONFIG" - - - -endmenu - -- cgit v1.3.1 From cf094b6afc3d3682bddb3a9c87afb999d55fb86f Mon Sep 17 00:00:00 2001 From: SummerGift Date: Fri, 20 Oct 2017 18:42:30 +0800 Subject: update apollo bsp --- bsp/stm32f429-apollo/.config | 4 ---- bsp/stm32f429-apollo/rtconfig.h | 3 --- 2 files changed, 7 deletions(-) diff --git a/bsp/stm32f429-apollo/.config b/bsp/stm32f429-apollo/.config index 5d12c9fcc0..6b924d225b 100644 --- a/bsp/stm32f429-apollo/.config +++ b/bsp/stm32f429-apollo/.config @@ -230,7 +230,3 @@ CONFIG_RT_USING_UART1=y CONFIG_RT_USING_UART2=y CONFIG_RT_USING_UART3=y CONFIG_RT_USING_SPI5=y - -# -# BSP_LWIP CONFIG -# diff --git a/bsp/stm32f429-apollo/rtconfig.h b/bsp/stm32f429-apollo/rtconfig.h index 65a347ded1..755c342cec 100644 --- a/bsp/stm32f429-apollo/rtconfig.h +++ b/bsp/stm32f429-apollo/rtconfig.h @@ -206,7 +206,4 @@ #define RT_USING_UART3 #define RT_USING_SPI5 -/* BSP_LWIP CONFIG */ - - #endif -- cgit v1.3.1