Skip to content

fix(serial): deadlock on tx failure (EPROT-66) #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QSmally wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(serial): deadlock on tx failure (EPROT-66) #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions modbus/mb_ports/serial/port_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,18 +327,26 @@ bool mb_port_ser_send_data(mb_port_base_t *inst, uint8_t *p_ser_frame, uint16_t
mb_port_ser_rx_flush(inst);
count = uart_write_bytes(port_obj->ser_opts.port, p_ser_frame, ser_length);
// Waits while UART sending the packet
esp_err_t status = uart_wait_tx_done(port_obj->ser_opts.port, MB_SERIAL_TX_TOUT_TICKS);
esp_err_t ret = uart_wait_tx_done(port_obj->ser_opts.port, MB_SERIAL_TX_TOUT_TICKS);
ESP_LOGD(TAG, "%s, tx buffer sent: (%d) bytes.", inst->descr.parent_name, (int)count);
MB_RETURN_ON_FALSE((status == ESP_OK), false, TAG, "%s, mb serial sent buffer failure.",
inst->descr.parent_name);
MB_GOTO_ON_FALSE((ret == ESP_OK), MB_EILLSTATE, error, TAG,
"%s, mb serial sent buffer failure.",
inst->descr.parent_name);
MB_PRT_BUF(inst->descr.parent_name, ":PORT_SEND", p_ser_frame, ser_length, ESP_LOG_DEBUG);
port_obj->send_time_stamp = esp_timer_get_time();
res = true;
} else {
ESP_LOGE(TAG, "%s, send fail state:%d, %p, %u. ", inst->descr.parent_name, (int)port_obj->tx_state_en, p_ser_frame, (unsigned)ser_length);
}
mb_port_ser_bus_sema_release(inst);

if (res) {
mb_port_ser_bus_sema_release(inst);
}
return res;

error:
mb_port_ser_bus_sema_release(inst);
return false;
}

#endif