diff --git a/CMakePresets.json b/CMakePresets.json index 265fc9b..acf600c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -44,7 +44,7 @@ "BUILD_MOTOR": "ON", "BUILD_PAINT_ROBOT_NEW": "ON", "USE_LUA_ST": true, - "USE_TALNET": false, + "USE_TALNET": true, "USE_LWIP": true, "USE_PRINT": true, "PRINT_ID": "3", diff --git a/LWIP/App/lwip.c b/LWIP/App/lwip.c index 0b9d438..65b8031 100644 --- a/LWIP/App/lwip.c +++ b/LWIP/App/lwip.c @@ -65,7 +65,7 @@ void MX_LWIP_Init(void) /* IP addresses initialization */ IP_ADDRESS[0] = 192; IP_ADDRESS[1] = 168; - IP_ADDRESS[2] = 1; + IP_ADDRESS[2] = 144; IP_ADDRESS[3] = 98; NETMASK_ADDRESS[0] = 255; NETMASK_ADDRESS[1] = 255; @@ -73,7 +73,7 @@ void MX_LWIP_Init(void) NETMASK_ADDRESS[3] = 0; GATEWAY_ADDRESS[0] = 192; GATEWAY_ADDRESS[1] = 168; - GATEWAY_ADDRESS[2] = 1; + GATEWAY_ADDRESS[2] = 144; GATEWAY_ADDRESS[3] = 1; /* USER CODE BEGIN IP_ADDRESSES */ diff --git a/robot b/robot index 52bb829..b80d448 160000 --- a/robot +++ b/robot @@ -1 +1 @@ -Subproject commit 52bb8290c210c8a3c7404a5a7863427bdaf0cb87 +Subproject commit b80d44894ff5bf2135372500b4c0f16b6cfea5dd diff --git a/robot_h743.ioc b/robot_h743.ioc index 6d9151e..1e1099d 100644 --- a/robot_h743.ioc +++ b/robot_h743.ioc @@ -363,9 +363,9 @@ LWIP.BSP.number=1 LWIP.DEFAULT_ACCEPTMBOX_SIZE=6 LWIP.DEFAULT_TCP_RECVMBOX_SIZE=6 LWIP.ETHARP_DEBUG=LWIP_DBG_OFF -LWIP.GATEWAY_ADDRESS=192.168.001.001 +LWIP.GATEWAY_ADDRESS=192.168.144.001 LWIP.IPParameters=LWIP_DHCP,IP_ADDRESS,NETMASK_ADDRESS,GATEWAY_ADDRESS,LWIP_STATS,LWIP_STATS_DISPLAY,TCPIP_THREAD_STACKSIZE,TCP_DEBUG,SOCKETS_DEBUG,NETIF_DEBUG,ETHARP_DEBUG,LWIP_DBG_TYPES_ON,DEFAULT_ACCEPTMBOX_SIZE,DEFAULT_TCP_RECVMBOX_SIZE,LWIP_RAM_HEAP_POINTER -LWIP.IP_ADDRESS=192.168.001.098 +LWIP.IP_ADDRESS=192.168.144.098 LWIP.LWIP_DBG_TYPES_ON=LWIP_DBG_OFF LWIP.LWIP_DHCP=0 LWIP.LWIP_RAM_HEAP_POINTER=0x30008000