new lwip 2 for service soft

service_hw/Commands/bt_6701_commands.c

@@ -22,7 +22,7 @@
 #include "stm32f4x7_eth_bsp.h"
 #include "http_server.h"
 #include "rtc.h"
-#include "sntp.h"
+#include "sntp_api.h"
 #include "d_inouts.h"
 #include "config_service.h"
 #include "usart.h"

service_hw/Console/port_microrl.c

@@ -14,7 +14,7 @@
 #include "port_microrl.h"
 #include "microrl.h"
 #include "config.h"
-#include "sntp.h"
+#include "sntp_api.h"
 #include "gpio.h"
 #include "bt_6701_settings.h"
 #include "commands_api.h"

service_hw/Ethernet/netconf.c

@@ -51,6 +51,7 @@ void LwIP_Init(void)
 	
   netif_add(&xnetif, &ipaddr, &netmask, &gw, NULL, &ethernetif_init, &tcpip_input);
   netif_set_default(&xnetif);
+  netif_set_link_up(&xnetif);
   netif_set_up(&xnetif); 
     	  
   /* Проверяем наличие линка */
@@ -73,6 +74,7 @@ void LwIP_DHCP_task(void * pvParameters)
   struct ip4_addr gw;
   uint8_t DHCP_state;  
   DHCP_state = DHCP_START;
+  static uint8_t dhcpTry = 0;
 
   for (;;)
   {
@@ -120,7 +122,7 @@ void LwIP_DHCP_task(void * pvParameters)
         else
         {
           /* DHCP timeout */
-          if (xnetif.dhcp->tries > MAX_DHCP_TRIES)
+          if (dhcpTry++ > MAX_DHCP_TRIES)
           {
             DHCP_state = DHCP_TIMEOUT;
 

service_hw/Ethernet/sntp.c → service_hw/Ethernet/sntp_api.c

@@ -1,7 +1,14 @@
-#include "sntp.h"
+#include "sntp_api.h"
 #include "rtc.h"
 #include "settings_api.h"
 
+#include "FreeRTOS.h"
+#include "task.h"
+#include "semphr.h"
+
+#include "tcpip.h"
+#include "udp.h"
+
 #include <string.h>
 #include <time.h>
 #ifdef PRINTF_STDLIB
@@ -37,7 +44,7 @@ struct sntp_packet
 
 static unsigned int timeout;
 static struct udp_pcb* upcb;
-static struct ip_addr server;
+static struct ip4_addr server;
 static int port = 123;
 
 extern bool ntpResult;

service_hw/Ethernet/sntp.h → service_hw/Ethernet/sntp_api.h

@@ -1,13 +1,13 @@
-#ifndef __SNTP_H__
-#define __SNTP_H__
+#ifndef __SNTP_API_H__
+#define __SNTP_API_H__
 
-#include "lwip/udp.h"
+/*#include "lwip/udp.h"
 #include "lwip/def.h"
 #include "lwip/timers.h"
 #include "lwip/udp.h"
 #include "lwip/dns.h"
 #include "lwip/ip_addr.h"
-#include "lwip/pbuf.h"
+#include "lwip/pbuf.h"*/
 
 #include "stdbool.h"
 
@@ -36,4 +36,4 @@ void sntp_stop(void);
 #endif
 */
 
-#endif /* __SNTP_H__ */
+#endif /* __SNTP_API_H__ */

service_hw/Makefile

@@ -76,10 +76,13 @@ CSRC += $(wildcard ../thirdparty/FreeRTOS/portable/MemMang/heap_4.c)
     INCLUDES += -I../thirdparty/lwip/src/include
     INCLUDES += -I../thirdparty/lwip/src/include/netif
     INCLUDES += -I../thirdparty/lwip/src/include/lwip
-    INCLUDES += -I../thirdparty/lwip/src/include/ipv4
-    INCLUDES += -I../thirdparty/lwip/src/netif/ppp
+    INCLUDES += -I../thirdparty/lwip/src/include/lwip/apps
+    INCLUDES += -I../thirdparty/lwip/src/include/netif
+#    INCLUDES += -I../thirdparty/lwip/src/netif/ppp
     INCLUDES += -I../thirdparty/lwip/port
     INCLUDES += -I../thirdparty/lwip/port/FreeRTOS
+    INCLUDES += -I../thirdparty/lwip/system
+    INCLUDES += -I../thirdparty/lwip/system/arch
     INCLUDES += -IEthernet
  # INCLUDES += -I../stm32/stm32f4x7_ethernet 
  	INCLUDES += -I../modules/STM32F4x7_ETH_Driver
@@ -92,7 +95,7 @@ CSRC += $(wildcard ../thirdparty/FreeRTOS/portable/MemMang/heap_4.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/core/ipv4/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/core/snmp/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/netif/*.c)
-    CSRC += $(wildcard ../thirdparty/lwip/src/netif/ppp/*.c)
+    #CSRC += $(wildcard ../thirdparty/lwip/src/netif/ppp/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/port/FreeRTOS/*.c)
     CSRC += $(wildcard Ethernet/*.c)
   #  CSRC += $(wildcard ../stm32/stm32f4x7_ethernet/*.c)