alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-02 13:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/freemodbus_fix_clang_warnings' into 'master'

Browse Source 
freemodbus: fix clang warnings of freemodbus stack

See merge request espressif/esp-idf!5193
This commit is contained in:
Angus Gratton
2019-11-28 07:06:19 +08:00
parent a9b7f74f7f 6e14b6265b
commit ecaf816c0b
8 changed files with 72 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,18 +119,18 @@ xMBMasterPortEventGet( eMBMasterEventType * eEvent)
EventBits_t uxBits;
BOOL xEventHappened = FALSE;
uxBits = xEventGroupWaitBits(
xEventGroupMasterHdl, // The event group being tested.
MB_EVENT_POLL_MASK, // The bits within the event group to wait for.
pdTRUE, // Masked bits should be cleared before returning.
pdFALSE, // Don't wait for both bits, either bit will do.
portMAX_DELAY); // Wait forever for either bit to be set.
xEventGroupMasterHdl, // The event group being tested.
MB_EVENT_POLL_MASK, // The bits within the event group to wait for.
pdTRUE, // Masked bits should be cleared before returning.
pdFALSE, // Don't wait for both bits, either bit will do.
portMAX_DELAY); // Wait forever for either bit to be set.
// Check if poll event is correct
if (uxBits & MB_EVENT_POLL_MASK) {
*eEvent = (eMBMasterEventType)(uxBits);
xEventHappened = TRUE;
} else {
ESP_LOGE(MB_PORT_TAG,"%s: Incorrect event triggered.", __func__);
ESP_LOGE(MB_PORT_TAG,"%s: Incorrect event triggered = %d.", __func__, uxBits);
xEventHappened = FALSE;
}
return xEventHappened;