mirror of
https://github.com/espressif/esp-idf.git
synced 2025-10-03 18:40:59 +02:00
Merge branch 'bugfix/twai_driver_cxx_test_v5.5' into 'release/v5.5'
fix(twai): fixed build errors in cxx environment (v5.5) See merge request espressif/esp-idf!41223
This commit is contained in:
@@ -55,7 +55,7 @@ esp_err_t twai_new_node_onchip(const twai_onchip_node_config_t *node_config, twa
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Helper function to configure a dual 16-bit acceptance filter.
|
* @brief Helper function to configure a dual 16-bit acceptance filter.
|
||||||
* @note For 29bits Extended IDs, ONLY high 16bits id/mask is used for eache filter.
|
* @note For 29bits Extended IDs, ONLY high 16bits id/mask is used for each filter.
|
||||||
*
|
*
|
||||||
* @param id1 First ID to filter.
|
* @param id1 First ID to filter.
|
||||||
* @param mask1 Mask for first ID.
|
* @param mask1 Mask for first ID.
|
||||||
@@ -86,6 +86,8 @@ static inline twai_mask_filter_config_t twai_make_dual_filter(uint16_t id1, uint
|
|||||||
.mask = is_ext ? (((mask1 & TWAI_EXT_ID_MASK) >> 13) << 16) | ((mask2 & TWAI_EXT_ID_MASK) >> 13) : \
|
.mask = is_ext ? (((mask1 & TWAI_EXT_ID_MASK) >> 13) << 16) | ((mask2 & TWAI_EXT_ID_MASK) >> 13) : \
|
||||||
((mask1 & TWAI_STD_ID_MASK) << 21) | ((mask2 & TWAI_STD_ID_MASK) << 5),
|
((mask1 & TWAI_STD_ID_MASK) << 21) | ((mask2 & TWAI_STD_ID_MASK) << 5),
|
||||||
.is_ext = is_ext,
|
.is_ext = is_ext,
|
||||||
|
.no_classic = false,
|
||||||
|
.no_fd = false,
|
||||||
.dual_filter = true,
|
.dual_filter = true,
|
||||||
};
|
};
|
||||||
return dual_cfg;
|
return dual_cfg;
|
||||||
|
Reference in New Issue
Block a user