espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/freemodbus_fix_event_processing_after_destroy_backport40' into 'release/v4.0'

Browse Source 
freemodbus: fix event processing failure after destroy (backport v4.0)

See merge request espressif/esp-idf!9323
This commit is contained in:
Jiang Jiang Jian
2021-05-10 08:30:45 +00:00
parent 1ce0d7bcf4 940e108c4b
commit ce99b662c2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/freemodbus/port/portevent_m.c
View File

@@ -274,7 +274,12 @@ eMBMasterReqErrCode eMBMasterWaitRequestFinish( void ) {
} }
} else { } else {
ESP_LOGE(MB_PORT_TAG,"%s: Incorrect event or timeout xRecvedEvent = 0x%x", __func__, uxBits); ESP_LOGE(MB_PORT_TAG,"%s: Incorrect event or timeout xRecvedEvent = 0x%x", __func__, uxBits);
assert(0); // https://github.com/espressif/esp-idf/issues/5275
// if a no event is received, that means vMBMasterPortEventClose()
// has been closed, so event group has been deleted by FreeRTOS, which
// triggers the send of 0 value to the event group to unlock this task
// waiting on it. For this patch, handles it as a time out without assert.
eErrStatus = MB_MRE_TIMEDOUT;
} }
return eErrStatus; return eErrStatus;
} }