From b8e31efcac46b0570cd4d1a64b31024f7bddcc35 Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Fri, 16 Apr 2021 18:18:37 +0800 Subject: [PATCH] TWAI: Fix incorrect CAP name Fixes a bug where SOC_TWAI_BRP_DIV_SUPPORTED was mistyped preventing slower bit rates from being enabled on ESP32 revision 2 and 3 chips --- components/hal/esp32/include/hal/twai_ll.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/hal/esp32/include/hal/twai_ll.h b/components/hal/esp32/include/hal/twai_ll.h index e04e4c0786..54ea032d6e 100644 --- a/components/hal/esp32/include/hal/twai_ll.h +++ b/components/hal/esp32/include/hal/twai_ll.h @@ -331,7 +331,7 @@ static inline uint32_t twai_ll_get_and_clear_intrs(twai_dev_t *hw) */ static inline void twai_ll_set_enabled_intrs(twai_dev_t *hw, uint32_t intr_mask) { -#if TWAI_BRP_DIV_SUPPORTED +#if SOC_TWAI_BRP_DIV_SUPPORTED //ESP32 Rev 2 or later has brp div field. Need to mask it out hw->interrupt_enable_reg.val = (hw->interrupt_enable_reg.val & 0x10) | intr_mask; #else @@ -357,7 +357,7 @@ static inline void twai_ll_set_enabled_intrs(twai_dev_t *hw, uint32_t intr_mask) */ static inline void twai_ll_set_bus_timing(twai_dev_t *hw, uint32_t brp, uint32_t sjw, uint32_t tseg1, uint32_t tseg2, bool triple_sampling) { -#if TWAI_BRP_DIV_SUPPORTED +#if SOC_TWAI_BRP_DIV_SUPPORTED if (brp > SOC_TWAI_BRP_DIV_THRESH) { //Need to set brp_div bit hw->interrupt_enable_reg.brp_div = 1;