alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-24 09:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/dfu_p4' into 'master'

Browse Source 
feat(dfu): Enable DFU on ESP32-P4

Closes IDF-7757

See merge request espressif/esp-idf!35539
This commit is contained in:
Tomas Rezucha
2024-12-18 23:57:23 +08:00
parent 57269c3af6 c5ea3e6cf6
commit a57e4d7bdd
7 changed files with 84 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/conf_common.py
View File

@@ -138,7 +138,6 @@ RGB_LCD_DOCS = ['api-reference/peripherals/lcd/rgb_lcd.rst']
DSI_LCD_DOCS = ['api-reference/peripherals/lcd/dsi_lcd.rst']
PARLIO_LCD_DOCS = ['api-reference/peripherals/lcd/parl_lcd.rst']
# TODO: Merge this back with `USB_DOCS` IDF-9919 IDF-9920 IDF-9133
USB_OTG_DFU_DOCS = ['api-guides/dfu.rst']
USB_OTG_CONSOLE_DOCS = ['api-guides/usb-otg-console.rst']
@@ -248,7 +247,7 @@ ESP32H2_DOCS = ['api-guides/RF_calibration.rst',
ESP32P4_DOCS = ['api-reference/system/ipc.rst',
'api-reference/peripherals/cap_touch_sens.rst',
'api-reference/peripherals/sd_pullup_requirements.rst']
'api-reference/peripherals/sd_pullup_requirements.rst'] + USB_OTG_DFU_DOCS
# format: {tag needed to include: documents to included}, tags are parsed from sdkconfig and peripheral_caps.h headers
conditional_include_dict = {'SOC_BT_SUPPORTED':BT_DOCS,