support plc demo

Ubiquitous/XiUOS/path_kernel.mk

@@ -259,6 +259,7 @@ endif
 ifeq ($(CONFIG_SUPPORT_CONTROL_FRAMEWORK), y)
 KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/control #
 KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/control/plc/interoperability/opcua #
+KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/control/plc/shared #
 KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/cJSON
 endif
 

Ubiquitous/XiUOS/resources/ethernet/LwIP/arch/lwipopts.h

@@ -216,7 +216,7 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums
 #define DEFAULT_THREAD_STACKSIZE        1024
 
 #define TCPIP_THREAD_NAME               "tcp"
-#define TCPIP_THREAD_STACKSIZE          8192
+#define TCPIP_THREAD_STACKSIZE          4096
 #define TCPIP_MBOX_SIZE                 10
 #define TCPIP_THREAD_PRIO               15
 

Ubiquitous/XiUOS/resources/ethernet/LwIP/arch/sys_arch.c

@@ -454,8 +454,7 @@ void lwip_config_input(struct netif *net)
 {
   sys_thread_t th_id = 0;
 
-  th_id = sys_thread_new("eth_input", lwip_input_thread, net, LWIP_TASK_STACK_SIZE,
-    LWIP_DEMO_TASK_PRIO);
+  th_id = sys_thread_new("eth_input", lwip_input_thread, net, LWIP_TASK_STACK_SIZE, 15);
 
   if (th_id >= 0) {
     lw_print("%s %d successfully!\n", __func__, th_id);
@@ -479,6 +478,8 @@ void lwip_config_net(char *ip, char *mask, char *gw)
 #endif /* FSL_FEATURE_SOC_LPC_ENET_COUNT */
   };
 
+  ETH_BSP_Config();
+
   if(chk_lwip_bit(LWIP_INIT_FLAG))
   {
     lw_print("lw: [%s] already ...\n", __func__);
@@ -541,6 +542,8 @@ void lwip_config_tcp(char *ip, char *mask, char *gw)
 #endif /* FSL_FEATURE_SOC_LPC_ENET_COUNT */
   };
 
+  ETH_BSP_Config();
+
   if(chk_lwip_bit(LWIP_INIT_FLAG))
   {
     lw_print("lw: [%s] already ...\n", __func__);

Ubiquitous/XiUOS/resources/ethernet/LwIP/include/lwip/opt.h

@@ -1763,7 +1763,7 @@
  * sys_thread_new() when the thread is created.
  */
 #if !defined TCPIP_THREAD_PRIO || defined __DOXYGEN__
-#define TCPIP_THREAD_PRIO               25
+#define TCPIP_THREAD_PRIO               15
 #endif
 
 /**

Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_config_demo.c

@@ -60,7 +60,6 @@
 
 static void *lwip_config_test(void *param)
 {
-    ETH_BSP_Config();
     lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
 }
 

Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c

@@ -138,8 +138,6 @@ void lwip_dhcp_test(void)
     static int flag = 0;
     char ip_addr[4] = {0, 0, 0, 0};
 
-    ETH_BSP_Config();
-
     lwip_config_net(ip_addr, ip_addr, ip_addr);
     set_lwip_bit(LWIP_PRINT_FLAG);
 

Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_ping_demo.c

@@ -94,7 +94,6 @@ void lwip_ping_thread(int argc, char *argv[])
     lw_print("lw: [%s] argc %d\n", __func__, argc);
 
     IP4_ADDR(&ping_addr, lwip_gwaddr[0], lwip_gwaddr[1], lwip_gwaddr[2], lwip_gwaddr[3]);
-    ETH_BSP_Config();
     lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
     ping_init(&ping_addr);
 }

Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_tcp_demo.c

@@ -102,7 +102,6 @@ void lwip_tcp_send_run(int argc, char *argv[])
         sscanf(argv[2], "%d.%d.%d.%d", &tcp_target[0], &tcp_target[1], &tcp_target[2], &tcp_target[3]);
     }
 
-    ETH_BSP_Config();
     lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
     sys_thread_new("tcp send", lwip_tcp_send_thread, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO);
 }
@@ -112,7 +111,6 @@ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) |
 
 void lwip_tcp_recv_run(void)
 {
-    ETH_BSP_Config();
     lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
     tcpecho_raw_init();
 }

Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_udp_demo.c

@@ -114,7 +114,6 @@ void *lwip_udp_send_run(int argc, char *argv[])
     }
     lw_print("lw: [%s] gw %d.%d.%d.%d\n", __func__, udp_target[0], udp_target[1], udp_target[2], udp_target[3]);
 
-    ETH_BSP_Config();
     lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
     sys_thread_new("udp socket send", lwip_udp_send, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO);
 }
@@ -177,8 +176,6 @@ void udpecho_raw_init(void)
 
 void lwip_udp_server(void)
 {
-    lw_print("lwip_udp_server\r\n");
-    ETH_BSP_Config();
     lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
     udpecho_raw_init();
 }