From b17494c22302b2216224aba288ed77ed7451ac28 Mon Sep 17 00:00:00 2001 From: Alex Lisitsyn Date: Sat, 8 Oct 2022 19:08:14 +0800 Subject: [PATCH] example/modbus_master: fix the assert for uart_set_pin (backport v4.1) --- examples/protocols/modbus/serial/mb_master/main/master.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/protocols/modbus/serial/mb_master/main/master.c b/examples/protocols/modbus/serial/mb_master/main/master.c index da9c58c792..701b744d88 100644 --- a/examples/protocols/modbus/serial/mb_master/main/master.c +++ b/examples/protocols/modbus/serial/mb_master/main/master.c @@ -242,14 +242,14 @@ static esp_err_t master_init(void) // Set UART pin numbers err = uart_set_pin(MB_PORT_NUM, CONFIG_MB_UART_TXD, CONFIG_MB_UART_RXD, CONFIG_MB_UART_RTS, UART_PIN_NO_CHANGE); + MASTER_CHECK((err == ESP_OK), ESP_ERR_INVALID_STATE, + "mb serial set pin failure, uart_set_pin() returned (0x%x).", (uint32_t)err); err = mbc_master_start(); MASTER_CHECK((err == ESP_OK), ESP_ERR_INVALID_STATE, "mb controller start fail, returns(0x%x).", (uint32_t)err); - MASTER_CHECK((err == ESP_OK), ESP_ERR_INVALID_STATE, - "mb serial set pin failure, uart_set_pin() returned (0x%x).", (uint32_t)err); // Set driver mode to Half Duplex err = uart_set_mode(MB_PORT_NUM, UART_MODE_RS485_HALF_DUPLEX); MASTER_CHECK((err == ESP_OK), ESP_ERR_INVALID_STATE,