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

Merge branch 'contrib/github_pr_15144_v5.4' into 'release/v5.4'

Browse Source 
fix(twai): TWAI_GENERAL_CONFIG_DEFAULT_V2 initialize general_flags (GitHub PR) (v5.4)

See merge request espressif/esp-idf!36323
This commit is contained in:
morris
2025-01-15 12:26:58 +08:00
parent 3b41c1a5a0 6af9dc6934
commit bd5c6b0645
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ extern "C" {
.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, .general_flags = {0}}
/** /**
* @brief Initializer macro for general configuration structure. * @brief Initializer macro for general configuration structure.
@@ -119,6 +119,7 @@ typedef struct {
By this approach, the system can power off TWAI's power domain. By this approach, the system can power off TWAI's power domain.
This can save power, but at the expense of more RAM being consumed. */ This can save power, but at the expense of more RAM being consumed. */
} general_flags; /**< General flags */ } general_flags; /**< General flags */
// Ensure TWAI_GENERAL_CONFIG_DEFAULT_V2 is updated and in order if new fields are added
} twai_general_config_t; } twai_general_config_t;
/** /**

4
tools/test_apps/system/cxx_build_test/main/CMakeLists.txt
View File

@@ -7,6 +7,10 @@ if(CONFIG_SOC_I2C_SUPPORTED)
list(APPEND srcs test_i2c_lcd.cpp) list(APPEND srcs test_i2c_lcd.cpp)
endif() endif()
if(CONFIG_SOC_TWAI_SUPPORTED)
list(APPEND srcs test_twai.cpp)
endif()
idf_component_register(SRCS "${srcs}" idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "." INCLUDE_DIRS "."
PRIV_REQUIRES driver esp_lcd PRIV_REQUIRES driver esp_lcd

15
tools/test_apps/system/cxx_build_test/main/test_twai.cpp Normal file
View File

@@ -0,0 +1,15 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
#include "driver/twai.h"
void test_twai_apis(void)
{
twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT(GPIO_NUM_0, GPIO_NUM_1, TWAI_MODE_NO_ACK);
twai_timing_config_t t_config = TWAI_TIMING_CONFIG_100KBITS();
twai_driver_install(&g_config, &t_config, &f_config);
twai_driver_uninstall();
}