espressif/esp-modbus
1
0
Fork 1
mirror of https://github.com/espressif/esp-modbus.git synced 2025-07-30 10:27:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/master_rtu_ascii_fix_deadlock_when_null_received' into 'master'

Browse Source 
Bugfix/master rtu ascii fix deadlock when null received

Closes IDFGH-9942

See merge request idf/esp-modbus!40
This commit is contained in:
Alex Lisitsyn
2023-06-15 23:43:37 +08:00
parent e943cec30f 7cdafc2468
commit 680d2cb4a8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
freemodbus/modbus/ascii/mbascii_m.c
View File

@ -274,8 +274,8 @@ xMBMasterASCIIReceiveFSM( void )
usMasterRcvBufferPos = 0; usMasterRcvBufferPos = 0;
eBytePos = BYTE_HIGH_NIBBLE; eBytePos = BYTE_HIGH_NIBBLE;
eRcvState = STATE_M_RX_RCV; eRcvState = STATE_M_RX_RCV;
eSndState = STATE_M_TX_IDLE;
} }
eSndState = STATE_M_TX_IDLE;
break; break;
/* A new character is received. If the character is a ':' the input /* A new character is received. If the character is a ':' the input

2
freemodbus/modbus/rtu/mbrtu_m.c
View File

@ -284,12 +284,12 @@ xMBMasterRTUReceiveFSM( void )
* Disable timer of respond timeout and change the transmiter state to idle. * Disable timer of respond timeout and change the transmiter state to idle.
*/ */
vMBMasterPortTimersDisable( ); vMBMasterPortTimersDisable( );
eSndState = STATE_M_TX_IDLE;
usMasterRcvBufferPos = 0; usMasterRcvBufferPos = 0;
if( xStatus && ucByte ) { if( xStatus && ucByte ) {
ucMasterRTURcvBuf[usMasterRcvBufferPos++] = ucByte; ucMasterRTURcvBuf[usMasterRcvBufferPos++] = ucByte;
eRcvState = STATE_M_RX_RCV; eRcvState = STATE_M_RX_RCV;
eSndState = STATE_M_TX_IDLE;
} }
/* Enable t3.5 timers. */ /* Enable t3.5 timers. */