diff --git a/app/Middlewares/lwip/arch/lwip_comm.c b/app/Middlewares/lwip/arch/lwip_comm.c index 89bb7c4..fc59616 100644 --- a/app/Middlewares/lwip/arch/lwip_comm.c +++ b/app/Middlewares/lwip/arch/lwip_comm.c @@ -304,7 +304,7 @@ void lwip_periodic_handle(void *argument) g_lwipdev.gateway[0] = (uint8_t)(gw); printf("通过DHCP获取到的默认网关..........%d.%d.%d.%d\r\n", g_lwipdev.gateway[0], g_lwipdev.gateway[1], g_lwipdev.gateway[2], g_lwipdev.gateway[3]); - g_lwipdev.lwip_display_fn(2); + g_lwipdev.lwip_display_fn(); } } else @@ -325,7 +325,7 @@ void lwip_periodic_handle(void *argument) sprintf((char *)iptxt, "%s", ip4addr_ntoa(netif_ip4_addr(netif))); printf ("DHCP Timeout !! \r\n"); printf ("Static IP address: %s\r\n", iptxt); - g_lwipdev.lwip_display_fn(2); + g_lwipdev.lwip_display_fn(); } } } diff --git a/app/Middlewares/lwip/arch/lwip_comm.h b/app/Middlewares/lwip/arch/lwip_comm.h index b614557..9886664 100644 --- a/app/Middlewares/lwip/arch/lwip_comm.h +++ b/app/Middlewares/lwip/arch/lwip_comm.h @@ -43,7 +43,7 @@ /* DHCP服务器最大重试次数 */ #define LWIP_MAX_DHCP_TRIES (uint8_t) 4 -typedef void (*display_fn)(uint8_t index); +typedef void (*display_fn)(); /*lwip控制结构体*/ typedef struct diff --git a/app/User/freertos_demo.c b/app/User/freertos_demo.c index 1112e45..3139267 100644 --- a/app/User/freertos_demo.c +++ b/app/User/freertos_demo.c @@ -68,37 +68,28 @@ void led_task(void* pvParameters); /* 任务函数 */ * bit1:0,不加载;1,加载后半部分UI * @retval 无 */ -void lwip_test_ui(uint8_t mode) { +void lwip_test_ui(void) { uint8_t speed; uint8_t buf[30]; - if (mode & 1 << 0) { - printf("STM32\r\n"); - printf("lwIP UDPBroadcastTest\r\n"); - printf("ATOM@ALIENTEK\r\n"); - } - - if (mode & 1 << 1) { - // lcd_fill(5, 110, lcddev.width,lcddev.height, WHITE); - printf("lwIP Init Successed\r\n"); + printf("lwIP Init Successed\r\n"); - if (g_lwipdev.dhcpstatus == 2) { - sprintf((char*)buf, "DHCP IP:%d.%d.%d.%d", g_lwipdev.ip[0], g_lwipdev.ip[1], g_lwipdev.ip[2], - g_lwipdev.ip[3]); /* 显示动态IP地址 */ - } else { - sprintf((char*)buf, "Static IP:%d.%d.%d.%d", g_lwipdev.ip[0], g_lwipdev.ip[1], g_lwipdev.ip[2], - g_lwipdev.ip[3]); /* 打印静态IP地址 */ - } + if (g_lwipdev.dhcpstatus == 2) { + sprintf((char*)buf, "DHCP IP:%d.%d.%d.%d", g_lwipdev.ip[0], g_lwipdev.ip[1], g_lwipdev.ip[2], + g_lwipdev.ip[3]); /* 显示动态IP地址 */ + } else { + sprintf((char*)buf, "Static IP:%d.%d.%d.%d", g_lwipdev.ip[0], g_lwipdev.ip[1], g_lwipdev.ip[2], + g_lwipdev.ip[3]); /* 打印静态IP地址 */ + } - printf("%s\r\n", (char*)buf); + printf("%s\r\n", (char*)buf); - speed = ethernet_chip_get_speed(); /* 得到网速 */ + speed = ethernet_chip_get_speed(); /* 得到网速 */ - if (speed) { - printf("Ethernet Speed:100M\r\n"); - } else { - printf("Ethernet Speed:10M\r\n"); - } + if (speed) { + printf("Ethernet Speed:100M\r\n"); + } else { + printf("Ethernet Speed:10M\r\n"); } } @@ -129,8 +120,6 @@ void start_task(void* pvParameters) { g_lwipdev.lwip_display_fn = lwip_test_ui; - lwip_test_ui(1); /* 加载后前部分UI */ - while (lwip_comm_init() != 0) { printf("lwIP Init failed!!\r\n"); delay_ms(500);