alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_12998_v5.2' into 'release/v5.2'

Browse Source 
fix(twai): TWAI_GENERAL_CONFIG_DEFAULT initialize controller_id (GitHub PR) (v5.2)

See merge request espressif/esp-idf!28572
This commit is contained in:
morris 2024-02-06 21:30:26 +08:00
commit cc649ea869
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/driver/twai/include/driver/twai.h
View File

@ -22,16 +22,26 @@ extern "C" {
/** /**
* @brief Initializer macro for general configuration structure. * @brief Initializer macro for general configuration structure.
* *
* This initializer macros allows the TX GPIO, RX GPIO, and operating mode to be * This initializer macros allows the controller ID, TX GPIO, RX GPIO, and operating
* configured. The other members of the general configuration structure are * mode to be configured. The other members of the general configuration structure are
* assigned default values. * assigned default values.
*/ */
#define TWAI_GENERAL_CONFIG_DEFAULT(tx_io_num, rx_io_num, op_mode) {.mode = op_mode, .tx_io = tx_io_num, .rx_io = rx_io_num, \ #define TWAI_GENERAL_CONFIG_DEFAULT_V2(controller_num, tx_io_num, rx_io_num, op_mode) {.controller_id = controller_num, \
.mode = op_mode, .tx_io = tx_io_num, .rx_io = rx_io_num, \
.clkout_io = TWAI_IO_UNUSED, .bus_off_io = TWAI_IO_UNUSED, \ .clkout_io = TWAI_IO_UNUSED, .bus_off_io = TWAI_IO_UNUSED, \
.tx_queue_len = 5, .rx_queue_len = 5, \ .tx_queue_len = 5, .rx_queue_len = 5, \
.alerts_enabled = TWAI_ALERT_NONE, .clkout_divider = 0, \ .alerts_enabled = TWAI_ALERT_NONE, .clkout_divider = 0, \
.intr_flags = ESP_INTR_FLAG_LEVEL1} .intr_flags = ESP_INTR_FLAG_LEVEL1}
/**
* @brief Initializer macro for general configuration structure.
*
* This initializer macros allows the TX GPIO, RX GPIO, and operating mode to be
* configured. Controller ID is set to 0 and he other members of the general configuration
* structure are assigned default values.
*/
#define TWAI_GENERAL_CONFIG_DEFAULT(tx_io_num, rx_io_num, op_mode) TWAI_GENERAL_CONFIG_DEFAULT_V2(0, tx_io_num, rx_io_num, op_mode)
/** /**
* @brief Alert flags * @brief Alert flags
* *