feedc0de/esp-modbus
1
0 Fork 0
forked from espressif/esp-modbus
Code Pull Requests Activity

fix modbus handling of disabled comm modes

Browse Source
This commit is contained in:
aleks committed 2025-01-03 11:39:32 +01:00
1 parent 3117942fe3
commit 5c0d66a8c0
4 files changed
+45 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modbus/mb_controller/serial/mbc_serial_master.c
+12
View File
@@ -693,11 +693,23 @@ esp_err_t mbc_serial_master_create(mb_communication_info_t *config, void **ctx)
if (pcomm_info->mode == MB_RTU)
{
#if ( CONFIG_FMB_COMM_MODE_RTU_EN )
err = mbm_rtu_create(pcomm_info, &pinst);
#else
ESP_LOGE(TAG, "RTU mode is not enabled in the configuration.");
ret = ESP_ERR_NOT_SUPPORTED;
goto error;
#endif // CONFIG_FMB_COMM_MODE_RTU_EN
}
else if (pcomm_info->mode == MB_ASCII)
{
#if ( CONFIG_FMB_COMM_MODE_ASCII_EN )
err = mbm_ascii_create(pcomm_info, &pinst);
#else
ESP_LOGE(TAG, "ASCII mode is not enabled in the configuration.");
ret = ESP_ERR_NOT_SUPPORTED;
goto error;
#endif // CONFIG_FMB_COMM_MODE_ASCII_EN
}
MB_GOTO_ON_FALSE((err == MB_ENOERR), ESP_ERR_INVALID_STATE, error, TAG,
"mb object create returns (0x%x).", (int)err);
modbus/mb_controller/serial/mbc_serial_slave.c
+13 -1
View File
@@ -255,11 +255,23 @@ esp_err_t mbc_serial_slave_create(mb_communication_info_t *config, void **ctx)
// Initialize Modbus stack using mbcontroller parameters
if (pcomm_info->mode == MB_RTU)
{
#if (CONFIG_FMB_COMM_MODE_RTU_EN)
err = mbs_rtu_create(pcomm_info, &pinst);
#else
ESP_LOGE(TAG, "RTU mode is not enabled in the configuration.");
ret = ESP_ERR_NOT_SUPPORTED;
goto error;
#endif
}
else if (pcomm_info->mode == MB_ASCII)
{
#if (CONFIG_FMB_COMM_MODE_ASCII_EN)
err = mbs_ascii_create(pcomm_info, &pinst);
#else
ESP_LOGE(TAG, "ASCII mode is not enabled in the configuration.");
ret = ESP_ERR_NOT_SUPPORTED;
goto error;
#endif // CONFIG_FMB_COMM_MODE_ASCII_EN
}
MB_GOTO_ON_FALSE((err == MB_ENOERR), ESP_ERR_INVALID_STATE, error, TAG,
"mbs create returns (0x%x).", (int)err);
@@ -290,4 +302,4 @@ error:
return ret;
}
#endif
#endif // #if (CONFIG_FMB_COMM_MODE_ASCII_EN || CONFIG_FMB_COMM_MODE_RTU_EN)