espressif/esp-modbus
1
0
Fork 1
mirror of https://github.com/espressif/esp-modbus.git synced 2026-08-03 20:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_mbm_resource_release_timeout_on_delete' into 'main'

Browse Source 
fix mbm resource release timeout on delete

See merge request idf/esp-modbus!144
This commit is contained in:
Alex Lisitsyn
2026-05-14 05:39:40 +01:00
parent 5ef84de69b ed28c11244
commit 5ebc458fd9
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modbus/mb_controller/common/mbc_master.h
+1
View File
@@ -31,6 +31,7 @@ extern "C" {
// Set the maximum resource waiting time, the actual time of resource release
// will be dependent on response time set by timer + conversion time if the command is received
#define MB_MAX_RESP_DELAY_MS (3000)
#define MB_MIN_RESP_DELAY_MS (300)
/**
* @brief Modbus controller handler structure
modbus/mb_controller/serial/mbc_serial_master.c
+3
View File
@@ -116,6 +116,9 @@ static esp_err_t mbc_serial_master_delete(void *ctx)
mbm_opts->task_handle = NULL;
vEventGroupDelete(mbm_opts->event_group_handle);
mbm_opts->event_group_handle = NULL;
if (xSemaphoreTake(mbm_opts->mbm_sema, pdMS_TO_TICKS(MB_MIN_RESP_DELAY_MS)) == pdTRUE) {
(void)xSemaphoreGive(mbm_opts->mbm_sema);
}
vSemaphoreDelete(mbm_opts->mbm_sema);
mbm_opts->mbm_sema = NULL;
// delete mb_base instance and all its allocations
modbus/mb_controller/tcp/mbc_tcp_master.c
+3
View File
@@ -573,6 +573,9 @@ static esp_err_t mbc_tcp_master_delete(void *ctx)
mbm_opts->task_handle = NULL;
vEventGroupDelete(mbm_opts->event_group_handle);
mbm_opts->event_group_handle = NULL;
if (xSemaphoreTake(mbm_opts->mbm_sema, pdMS_TO_TICKS(MB_MIN_RESP_DELAY_MS)) == pdTRUE) {
(void)xSemaphoreGive(mbm_opts->mbm_sema);
}
vSemaphoreDelete(mbm_opts->mbm_sema);
mbm_opts->mbm_sema = NULL;
mb_error = mbm_iface->mb_base->delete (mbm_iface->mb_base);