Skip to content

Commit e3ce2ec

Browse files
me-no-devP-R-O-C-H-Ypre-commit-ci-lite[bot]
authored
IDF release/v5.5 (#11981)
* IDF release/v5.5 f1a1df9b * fix(usb): Add required callback for tinysub host * fix(sdmmc): Fix missing initializer warnings * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: Jan Procházka <[email protected]> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent 8cb2659 commit e3ce2ec

File tree

3 files changed

+64
-35
lines changed

3 files changed

+64
-35
lines changed

‎cores/esp32/esp32-hal-tinyusb.c‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,25 @@ __attribute__((weak)) uint16_t tud_network_xmit_cb(uint8_t *dst, void *ref, uint
477477
__attribute__((weak)) void tud_network_init_cb(void) {}
478478
#endif
479479

480+
#if CFG_TUH_HID
481+
__attribute__((weak)) void tuh_hid_mount_cb(uint8_t dev_addr, uint8_t idx, uint8_t const *report_desc, uint16_t desc_len) {}
482+
__attribute__((weak)) void tuh_hid_umount_cb(uint8_t dev_addr, uint8_t idx) {}
483+
__attribute__((weak)) void tuh_hid_report_received_cb(uint8_t dev_addr, uint8_t idx, uint8_t const *report, uint16_t len) {}
484+
__attribute__((weak)) void tuh_hid_report_sent_cb(uint8_t dev_addr, uint8_t idx, uint8_t const *report, uint16_t len) {}
485+
__attribute__((weak)) void tuh_hid_get_report_complete_cb(uint8_t dev_addr, uint8_t idx, uint8_t report_id, uint8_t report_type, uint16_t len) {}
486+
__attribute__((weak)) void tuh_hid_set_report_complete_cb(uint8_t dev_addr, uint8_t idx, uint8_t report_id, uint8_t report_type, uint16_t len) {}
487+
__attribute__((weak)) void tuh_hid_set_protocol_complete_cb(uint8_t dev_addr, uint8_t idx, uint8_t protocol) {}
488+
#endif
489+
#if CFG_TUH_CDC
490+
__attribute__((weak)) void tuh_cdc_mount_cb(uint8_t idx) {}
491+
__attribute__((weak)) void tuh_cdc_umount_cb(uint8_t idx) {}
492+
__attribute__((weak)) void tuh_cdc_rx_cb(uint8_t idx) {}
493+
__attribute__((weak)) void tuh_cdc_tx_complete_cb(uint8_t idx) {}
494+
#endif
495+
#if CFG_TUH_MSC
496+
__attribute__((weak)) void tuh_msc_mount_cb(uint8_t dev_addr) {}
497+
__attribute__((weak)) void tuh_msc_umount_cb(uint8_t dev_addr) {}
498+
#endif
480499
/*
481500
* Private API
482501
* */

‎libraries/SD_MMC/src/SD_MMC.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,17 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
228228
#if defined(CONFIG_IDF_TARGET_ESP32P4) && defined(BOARD_SDMMC_SLOT) && (BOARD_SDMMC_SLOT == 0)
229229
host.slot = SDMMC_HOST_SLOT_0;
230230
// reconfigure slot_config to remove all pins in order to use IO_MUX
231-
slot_config = {
231+
slot_config = sdmmc_slot_config_t{
232+
.clk = GPIO_NUM_NC,
233+
.cmd = GPIO_NUM_NC,
234+
.d0 = GPIO_NUM_NC,
235+
.d1 = GPIO_NUM_NC,
236+
.d2 = GPIO_NUM_NC,
237+
.d3 = GPIO_NUM_NC,
238+
.d4 = GPIO_NUM_NC,
239+
.d5 = GPIO_NUM_NC,
240+
.d6 = GPIO_NUM_NC,
241+
.d7 = GPIO_NUM_NC,
232242
.cd = SDMMC_SLOT_NO_CD,
233243
.wp = SDMMC_SLOT_NO_WP,
234244
.width = 4,

‎package/package_esp32_index.template.json‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{
5252
"packager": "esp32",
5353
"name": "esp32-arduino-libs",
54-
"version": "idf-release_v5.5-07e9bf49-v1"
54+
"version": "idf-release_v5.5-f1a1df9b-v3"
5555
},
5656
{
5757
"packager": "esp32",
@@ -104,63 +104,63 @@
104104
"tools": [
105105
{
106106
"name": "esp32-arduino-libs",
107-
"version": "idf-release_v5.5-07e9bf49-v1",
107+
"version": "idf-release_v5.5-f1a1df9b-v3",
108108
"systems": [
109109
{
110110
"host": "i686-mingw32",
111-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
112-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
113-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
114-
"size": "448900656"
111+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
112+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
113+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
114+
"size": "451353300"
115115
},
116116
{
117117
"host": "x86_64-mingw32",
118-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
119-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
120-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
121-
"size": "448900656"
118+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
119+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
120+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
121+
"size": "451353300"
122122
},
123123
{
124124
"host": "arm64-apple-darwin",
125-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
126-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
127-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
128-
"size": "448900656"
125+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
126+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
127+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
128+
"size": "451353300"
129129
},
130130
{
131131
"host": "x86_64-apple-darwin",
132-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
133-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
134-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
135-
"size": "448900656"
132+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
133+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
134+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
135+
"size": "451353300"
136136
},
137137
{
138138
"host": "x86_64-pc-linux-gnu",
139-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
140-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
141-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
142-
"size": "448900656"
139+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
140+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
141+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
142+
"size": "451353300"
143143
},
144144
{
145145
"host": "i686-pc-linux-gnu",
146-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
147-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
148-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
149-
"size": "448900656"
146+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
147+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
148+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
149+
"size": "451353300"
150150
},
151151
{
152152
"host": "aarch64-linux-gnu",
153-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
154-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
155-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
156-
"size": "448900656"
153+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
154+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
155+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
156+
"size": "451353300"
157157
},
158158
{
159159
"host": "arm-linux-gnueabihf",
160-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
161-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-07e9bf49-v1.zip",
162-
"checksum": "SHA-256:e5ae9e62d781df941128a526e653bb82decde844604b5ccee62efd12c6b2eaa6",
163-
"size": "448900656"
160+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.5/esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
161+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.5-f1a1df9b-v3.zip",
162+
"checksum": "SHA-256:35c0cc87b1965d0e70d599472dc6640e0363b05340488e73ccb7481d349906f3",
163+
"size": "451353300"
164164
}
165165
]
166166
},

0 commit comments

Comments
 (0)