feedc0de/esp-modbus
1
0
Fork 0
forked from espressif/esp-modbus
Code Pull Requests Activity

fix for closing tcp connections and watchdog timeout

Browse Source 
Signed-off-by: aleks <aleks@espressif.com>
This commit is contained in:
Floris Romeijn
2023-12-14 14:53:18 +01:00
committed by Alex Lisitsyn
parent f0e78b6d27
commit 135a8f8165
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
freemodbus/tcp_master/port/port_tcp_master.c
View File

@ -236,7 +236,6 @@ static BOOL xMBTCPPortMasterCloseConnection(MbSlaveInfo_t *pxInfo)
static void xMBTCPPortMasterShutdown(void) static void xMBTCPPortMasterShutdown(void)
{ {
xSemaphoreGive(xShutdownSema); xSemaphoreGive(xShutdownSema);
vTaskDelete(NULL);
xMbPortConfig.xMbTcpTaskHandle = NULL; xMbPortConfig.xMbTcpTaskHandle = NULL;
for (USHORT ucCnt = 0; ucCnt < MB_TCP_PORT_MAX_CONN; ucCnt++) { for (USHORT ucCnt = 0; ucCnt < MB_TCP_PORT_MAX_CONN; ucCnt++) {
@ -251,6 +250,7 @@ static void xMBTCPPortMasterShutdown(void)
} }
} }
free(xMbPortConfig.pxMbSlaveInfo); free(xMbPortConfig.pxMbSlaveInfo);
vTaskDelete(NULL);
} }
void vMBTCPPortMasterSetNetOpt(void *pvNetIf, eMBPortIpVer xIpVersion, eMBPortProto xProto) void vMBTCPPortMasterSetNetOpt(void *pvNetIf, eMBPortIpVer xIpVersion, eMBPortProto xProto)
@ -754,6 +754,7 @@ static void vMBTCPPortMasterTask(void *pvParameters)
break; break;
} }
putchar(ucDot); putchar(ucDot);
vTaskDelay(pdMS_TO_TICKS(100)); /* if we don't yield we run the risk of hogging CPU */
xErr = xMBTCPPortMasterConnect(pxInfo); xErr = xMBTCPPortMasterConnect(pxInfo);
switch(xErr) switch(xErr)
{ {