Parcourir la source

Merge branch 'bugfix/twai_low_speed_bit_rates' into 'master'

TWAI: Fix incorrect configuration initializers for low speed bit rates

Closes IDF-3585

See merge request espressif/esp-idf!14388
Darian il y a 4 ans
Parent
commit
a7468b519d
1 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 3 3
      components/hal/include/hal/twai_types.h

+ 3 - 3
components/hal/include/hal/twai_types.h

@@ -61,9 +61,9 @@ extern "C" {
  * @note The available bit rates are dependent on the chip target and revision.
  */
 #if (SOC_TWAI_BRP_MAX > 256)
-#define TWAI_TIMING_CONFIG_1KBITS()     {.brp = 4000, .tseg_1 = 15, .tseg_2 = 8, .sjw = 3, .triple_sampling = false}
-#define TWAI_TIMING_CONFIG_5KBITS()     {.brp = 800, .tseg_1 = 15, .tseg_2 = 8, .sjw = 3, .triple_sampling = false}
-#define TWAI_TIMING_CONFIG_10KBITS()    {.brp = 400, .tseg_1 = 15, .tseg_2 = 8, .sjw = 3, .triple_sampling = false}
+#define TWAI_TIMING_CONFIG_1KBITS()     {.brp = 4000, .tseg_1 = 15, .tseg_2 = 4, .sjw = 3, .triple_sampling = false}
+#define TWAI_TIMING_CONFIG_5KBITS()     {.brp = 800, .tseg_1 = 15, .tseg_2 = 4, .sjw = 3, .triple_sampling = false}
+#define TWAI_TIMING_CONFIG_10KBITS()    {.brp = 400, .tseg_1 = 15, .tseg_2 = 4, .sjw = 3, .triple_sampling = false}
 #endif
 #if (SOC_TWAI_BRP_MAX > 128) || (CONFIG_ESP32_REV_MIN >= 2)
 #define TWAI_TIMING_CONFIG_12_5KBITS()  {.brp = 256, .tseg_1 = 16, .tseg_2 = 8, .sjw = 3, .triple_sampling = false}