espressif/esp-modbus
1
0
Fork 1
mirror of https://github.com/espressif/esp-modbus.git synced 2025-09-26 22:50:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/modbus_serial_fsm_fix_address_offset' into 'master'

Browse Source 
Bugfix/modbus serial fsm fix address offset

See merge request idf/esp-modbus!18
This commit is contained in:
Alex Lisitsyn
2022-07-16 01:02:27 +08:00
parent db34247764 29254b2b86
commit 72c889b2c9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,7 +437,8 @@ xMBMasterASCIITransmitFSM( void )
/* Notify the task which called eMBMasterASCIISend that the frame has /* Notify the task which called eMBMasterASCIISend that the frame has
* been sent. */ * been sent. */
case STATE_M_TX_NOTIFY: case STATE_M_TX_NOTIFY:
xFrameIsBroadcast = ( ucMasterASCIISndBuf[MB_SER_PDU_ADDR_OFF] == MB_ADDRESS_BROADCAST ) ? TRUE : FALSE; xFrameIsBroadcast = ( ucMasterASCIISndBuf[MB_SEND_BUF_PDU_OFF - MB_SER_PDU_PDU_OFF]
== MB_ADDRESS_BROADCAST ) ? TRUE : FALSE;
vMBMasterRequestSetType( xFrameIsBroadcast ); vMBMasterRequestSetType( xFrameIsBroadcast );
eSndState = STATE_M_TX_XFWR; eSndState = STATE_M_TX_XFWR;
/* If the frame is broadcast ,master will enable timer of convert delay, /* If the frame is broadcast ,master will enable timer of convert delay,

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

@@ -350,7 +350,8 @@ xMBMasterRTUTransmitFSM( void )
} }
else else
{ {
xFrameIsBroadcast = ( ucMasterRTUSndBuf[MB_SER_PDU_ADDR_OFF] == MB_ADDRESS_BROADCAST ) ? TRUE : FALSE; xFrameIsBroadcast = ( ucMasterRTUSndBuf[MB_SEND_BUF_PDU_OFF - MB_SER_PDU_PDU_OFF]
== MB_ADDRESS_BROADCAST ) ? TRUE : FALSE;
vMBMasterRequestSetType( xFrameIsBroadcast ); vMBMasterRequestSetType( xFrameIsBroadcast );
eSndState = STATE_M_TX_XFWR; eSndState = STATE_M_TX_XFWR;
/* If the frame is broadcast ,master will enable timer of convert delay, /* If the frame is broadcast ,master will enable timer of convert delay,