办公室电脑0308最后的提交
This commit is contained in:
parent
c43f1a010c
commit
61a567b3b7
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
@ -12,12 +12,16 @@
|
||||
"idf.openOcdConfigs": [
|
||||
"board/esp32s3-builtin.cfg"
|
||||
],
|
||||
"idf.portWin": "COM6",
|
||||
"idf.portWin": "COM5",
|
||||
"idf.flashType": "UART",
|
||||
"files.associations": {
|
||||
"ledc.h": "c",
|
||||
"gpio.h": "c",
|
||||
"sdmmc_host.h": "c",
|
||||
"modbus_params.h": "c"
|
||||
"modbus_params.h": "c",
|
||||
"array": "c",
|
||||
"string": "c",
|
||||
"string_view": "c",
|
||||
"span": "c"
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@ const uint16_t num_device_parameters = (sizeof(device_parameters)/sizeof(device_
|
||||
|
||||
esp_err_t modbus_master_init(void)
|
||||
{
|
||||
|
||||
// Initialize and start Modbus controller
|
||||
mb_communication_info_t comm = {
|
||||
.port = MB_PORT_NUM,
|
||||
@ -26,6 +27,7 @@ esp_err_t modbus_master_init(void)
|
||||
void* master_handler = NULL;
|
||||
|
||||
esp_err_t err = mbc_master_init(MB_PORT_SERIAL_MASTER, &master_handler);
|
||||
/*´íÎó¼ì²é*/
|
||||
MB_RETURN_ON_FALSE((master_handler != NULL), ESP_ERR_INVALID_STATE, TAG,
|
||||
"mb controller initialization fail.");
|
||||
MB_RETURN_ON_FALSE((err == ESP_OK), ESP_ERR_INVALID_STATE, TAG,
|
||||
@ -54,7 +56,12 @@ esp_err_t modbus_master_init(void)
|
||||
MB_RETURN_ON_FALSE((err == ESP_OK), ESP_ERR_INVALID_STATE, TAG,
|
||||
"mb controller set descriptor fail, returns(0x%x).", (int)err);
|
||||
ESP_LOGI(TAG, "Modbus master stack initialized...");
|
||||
ESP_LOGI(TAG, "Modbus master initialized...");
|
||||
return err;
|
||||
|
||||
uint8_t data=0;
|
||||
mbc_master_get_parameter(device_parameters->cid,device_parameters->param_key,&data,0);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -464,7 +464,7 @@ void app_main(void)
|
||||
button_init();
|
||||
|
||||
/*初始化Modbus*/
|
||||
//modbus_master_init();
|
||||
ESP_ERROR_CHECK(modbus_master_init());
|
||||
|
||||
// Lock the mutex due to the LVGL APIs are not thread-safe
|
||||
if (example_lvgl_lock(-1)) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user