Skip to content

Commit a16f621

Browse files
committed
Merge branch 'feat/twai_driver_legacy_target_support' into 'master'
feat(driver_twai): twai driver legacy target support (part_2) Closes IDF-12480 and IDF-12808 See merge request espressif/esp-idf!36487
2 parents d19d073 + 00c7819 commit a16f621

File tree

79 files changed

+2619
-1564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2619
-1564
lines changed

components/driver/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ else()
109109
esp_driver_ana_cmpr esp_driver_i2s esp_driver_sdmmc esp_driver_sdspi esp_driver_sdio
110110
esp_driver_dac esp_driver_rmt esp_driver_tsens esp_driver_sdm esp_driver_i2c
111111
esp_driver_uart esp_driver_ledc esp_driver_parlio esp_driver_usb_serial_jtag
112+
esp_driver_twai
112113
LDFRAGMENTS ${ldfragments}
113114
)
114115
if(CONFIG_SOC_ADC_SUPPORTED AND

components/driver/test_apps/.build-test-rules.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ components/driver/test_apps/legacy_timer_driver:
7272
depends_filepatterns:
7373
- components/driver/deprecated/**/*timer*
7474

75-
components/driver/test_apps/touch_sensor_v1:
76-
disable:
77-
- if: SOC_TOUCH_SENSOR_VERSION != 1
78-
79-
components/driver/test_apps/touch_sensor_v2:
80-
disable:
81-
- if: SOC_TOUCH_SENSOR_VERSION != 2
82-
83-
components/driver/test_apps/twai:
75+
components/driver/test_apps/legacy_twai:
8476
disable:
8577
- if: SOC_TWAI_SUPPORTED != 1 or SOC_TWAI_SUPPORT_FD == 1
8678
reason: legacy driver doesn't support FD
8779
depends_filepatterns:
8880
- components/driver/twai/**/*
8981
depends_components:
9082
- esp_driver_gpio
83+
84+
components/driver/test_apps/touch_sensor_v1:
85+
disable:
86+
- if: SOC_TOUCH_SENSOR_VERSION != 1
87+
88+
components/driver/test_apps/touch_sensor_v2:
89+
disable:
90+
- if: SOC_TOUCH_SENSOR_VERSION != 2
File renamed without changes.

0 commit comments

Comments
 (0)