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

Merge branch 'feature/sync_subrepo_with_esp_idf' into 'master'

Browse Source 
fix synchronization issues of subrepo in esp-idf

Closes IDFCI-1541

See merge request idf/esp-modbus!23
This commit is contained in:
Alex Lisitsyn
2022-12-08 22:54:28 +08:00
parent 77c2646f53 e18c4fb329
commit 0e1fe58fbf
9 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
freemodbus/modbus/mb_m.c
View File

@ -363,8 +363,8 @@ eMBMasterPoll( void )
MB_PORT_CHECK(ucMBRcvFrame, MB_EILLSTATE, "Receive buffer initialization fail.");
MB_PORT_CHECK(ucMBSendFrame, MB_EILLSTATE, "Send buffer initialization fail.");
// Check if the frame is for us. If not ,send an error process event.
if ( ( eStatus == MB_ENOERR ) && ( ucRcvAddress == ucMBMasterGetDestAddress() ) )
{
if ( ( eStatus == MB_ENOERR ) && ( ( ucRcvAddress == ucMBMasterGetDestAddress() )
|| ( ucRcvAddress == MB_TCP_PSEUDO_ADDRESS) ) ) {
if ( ( ucMBRcvFrame[MB_PDU_FUNC_OFF] & ~MB_FUNC_ERROR ) == ( ucMBSendFrame[MB_PDU_FUNC_OFF] ) ) {
ESP_LOGD(MB_PORT_TAG, "%s: Packet data received successfully (%u).", __func__, eStatus);
ESP_LOG_BUFFER_HEX_LEVEL("POLL receive buffer", (void*)ucMBRcvFrame, (uint16_t)usLength, ESP_LOG_DEBUG);
@ -376,9 +376,7 @@ eMBMasterPoll( void )
vMBMasterSetErrorType(EV_ERROR_RECEIVE_DATA);
( void ) xMBMasterPortEventPost( EV_MASTER_ERROR_PROCESS );
}
}
else
{
} else {
vMBMasterSetErrorType(EV_ERROR_RECEIVE_DATA);
( void ) xMBMasterPortEventPost( EV_MASTER_ERROR_PROCESS );
ESP_LOGD( MB_PORT_TAG, "%s: Packet data receive failed (addr=%u)(%u).",

2
idf_component.yml
View File

@ -1,4 +1,4 @@
version: "1.0.6"
version: "1.0.7"
description: ESP-MODBUS is the official Modbus library for Espressif SoCs.
url: https://github.com/espressif/esp-modbus
dependencies: