Skip to content

Commit a755337

Browse files
bmorcellibmorcelli
authored
Merge branch 'espressif:master' into master
2 parents 9c7a613 + ac45e2d commit a755337

23 files changed

+266
-159
lines changed

‎.github/workflows/cron.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ jobs:
3535
# - idf_branch: "release/v5.1"
3636
# lib_builder_branch: "release/v5.1"
3737
# targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2"
38-
- idf_branch: "release/v5.3"
39-
lib_builder_branch: "master"
40-
targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
38+
# - idf_branch: "release/v5.3"
39+
# lib_builder_branch: "release/v5.3"
40+
# targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
4141
- idf_branch: "release/v5.4"
42-
lib_builder_branch: "release/v5.4"
42+
lib_builder_branch: "master"
4343
targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
44+
- idf_branch: "release/v5.5"
45+
lib_builder_branch: "release/v5.5"
46+
targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4,esp32c5"

‎.github/workflows/cron_build.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ jobs:
4141
deploy_needed: ${{ steps.check.outputs.deploy_needed }}
4242
targets_list: ${{ steps.check.outputs.targets_list }}
4343
steps:
44-
- uses: actions/checkout@v4
44+
- name: Checkout ${{ inputs.lib_builder_branch }}
45+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4546
with:
4647
ref: ${{ inputs.lib_builder_branch }}
4748

@@ -65,7 +66,8 @@ jobs:
6566
matrix:
6667
target: ${{ fromJson(needs.check-if-needed.outputs.targets_list) }}
6768
steps:
68-
- uses: actions/checkout@v4
69+
- name: Checkout ${{ inputs.lib_builder_branch }}
70+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6971
with:
7072
ref: ${{ inputs.lib_builder_branch }}
7173

@@ -88,13 +90,13 @@ jobs:
8890
8991
- name: Upload build
9092
if: failure()
91-
uses: actions/upload-artifact@v4
93+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9294
with:
9395
name: build-${{ env.libs_branch }}-${{ matrix.target }}
9496
path: build
9597

9698
- name: Upload library files
97-
uses: actions/upload-artifact@v4
99+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
98100
with:
99101
name: libs-${{ env.libs_branch }}-${{ matrix.target }}
100102
path: dist
@@ -105,7 +107,8 @@ jobs:
105107
needs: [check-if-needed, build-libs]
106108
if: needs.check-if-needed.outputs.deploy_needed == '1'
107109
steps:
108-
- uses: actions/checkout@v4
110+
- name: Checkout ${{ inputs.lib_builder_branch }}
111+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
109112
with:
110113
ref: ${{ inputs.lib_builder_branch }}
111114

@@ -115,7 +118,7 @@ jobs:
115118
echo "libs_branch=${branch//\//_}" >> $GITHUB_ENV
116119
117120
- name: Download artifacts
118-
uses: actions/download-artifact@v4
121+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
119122
with:
120123
path: dist
121124
pattern: libs-${{ env.libs_branch }}-*
@@ -125,7 +128,7 @@ jobs:
125128
run: bash ./tools/combine-artifacts.sh
126129

127130
- name: Upload full esp32-arduino-libs archive
128-
uses: actions/upload-artifact@v4
131+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
129132
with:
130133
name: esp32-arduino-libs-${{ env.libs_branch }}
131134
path: dist/esp32-arduino-libs.zip
@@ -154,7 +157,7 @@ jobs:
154157
bash ./tools/push-to-arduino.sh
155158
156159
- name: Upload package_esp32_index.template.json
157-
uses: actions/upload-artifact@v4
160+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
158161
with:
159162
name: package-esp32-index-json-${{ env.libs_branch }}
160163
path: out/package_esp32_index.template.json

‎.github/workflows/docker.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ jobs:
6666
echo "URL: $URL"
6767
6868
- name: Checkout
69-
uses: actions/checkout@v4
69+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7070

7171
- name: Login to Docker Hub
7272
if: ${{ github.event_name == 'push' }}
73-
uses: docker/login-action@v3
73+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
7474
with:
7575
username: ${{ secrets.DOCKERHUB_USERNAME }}
7676
password: ${{ secrets.DOCKERHUB_TOKEN }}
7777

7878
- name: Set up QEMU for multiarch builds
79-
uses: docker/setup-qemu-action@v3
79+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
8080

8181
- name: Set up Docker Buildx
82-
uses: docker/setup-buildx-action@v3
82+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
8383

8484
- name: Build and push
85-
uses: docker/build-push-action@v5
85+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
8686
with:
8787
context: tools/docker
8888
push: ${{ github.event_name == 'push' }}
@@ -94,7 +94,7 @@ jobs:
9494
9595
- name: Update Docker Hub repository description (master branch)
9696
if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
97-
uses: peter-evans/dockerhub-description@v4
97+
uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0
9898
with:
9999
username: ${{ secrets.DOCKERHUB_USERNAME }}
100100
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/push.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
3131
fail-fast: false
3232
steps:
33-
- uses: actions/checkout@v4
33+
- name: Checkout repository
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3435

3536
- name: Install dependencies
3637
run: bash ./tools/prepare-ci.sh
@@ -40,13 +41,13 @@ jobs:
4041

4142
- name: Upload build
4243
if: failure()
43-
uses: actions/upload-artifact@v4
44+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4445
with:
4546
name: build-${{ matrix.target }}
4647
path: build
4748

4849
- name: Upload archive
49-
uses: actions/upload-artifact@v4
50+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5051
with:
5152
name: artifacts-${{ matrix.target }}
5253
path: dist
@@ -57,7 +58,7 @@ jobs:
5758
runs-on: ubuntu-latest
5859
steps:
5960
- name: Download artifacts
60-
uses: actions/download-artifact@v4
61+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
6162
with:
6263
path: dist
6364
pattern: artifacts-*
@@ -71,13 +72,13 @@ jobs:
7172
cp out/package_esp32_index.template.json dist/package_esp32_index.template.json
7273
7374
- name: Upload full esp32-arduino-libs archive
74-
uses: actions/upload-artifact@v4
75+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7576
with:
7677
name: esp32-arduino-libs
7778
path: dist/esp32-arduino-libs.tar.gz
7879

7980
- name: Upload package_esp32_index.template.json
80-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8182
with:
8283
name: package-esp32-index-json
8384
path: dist/package_esp32_index.template.json

‎.github/workflows/repository_dispatch.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,30 @@ jobs:
77
name: Dispatch Event
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- name: Checkout repository
11+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1112
with:
1213
fetch-depth: 0
14+
1315
- name: Install dependencies
1416
run: bash ./tools/prepare-ci.sh
17+
1518
- name: Handle Event
1619
env:
1720
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
1821
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
1922
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
2023
run: bash ./tools/repository_dispatch.sh
24+
2125
- name: Upload build
2226
if: failure()
23-
uses: actions/upload-artifact@v4
27+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
2428
with:
2529
name: build
2630
path: build
31+
2732
- name: Upload archive
28-
uses: actions/upload-artifact@v4
33+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
2934
with:
3035
name: artifacts
3136
path: dist

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ idf_build_set_property(COMPILE_DEFINITIONS "-DESP32_ARDUINO_LIB_BUILDER" APPEND)
3939
##################
4040
### ESP Matter ###
4141
##################
42-
idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND)
42+
idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++2a;-DCHIP_HAVE_CONFIG_H" APPEND)

‎components/arduino_tinyusb/Kconfig.projbuild

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ menu "Arduino TinyUSB"
4242
help
4343
CDC FIFO size of TX
4444

45+
config TINYUSB_CDC_MAX_PORTS
46+
int "Maximum enabled CDC ports"
47+
range 1 2
48+
default 1
49+
depends on TINYUSB_CDC_ENABLED
50+
help
51+
Maximum enabled CDC ports
52+
4553
endmenu
4654

4755
menu "Mass Storage (MSC) driver"

‎components/arduino_tinyusb/include/tusb_config.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,11 @@ extern "C" {
115115
#define CFG_TUD_ENDOINT0_SIZE 64
116116

117117
// Enabled Drivers
118-
#define CFG_TUD_CDC CONFIG_TINYUSB_CDC_ENABLED
118+
#ifdef CONFIG_TINYUSB_CDC_MAX_PORTS
119+
#define CFG_TUD_CDC CONFIG_TINYUSB_CDC_MAX_PORTS
120+
#else
121+
#define CFG_TUD_CDC 0
122+
#endif
119123
#define CFG_TUD_MSC CONFIG_TINYUSB_MSC_ENABLED
120124
#define CFG_TUD_HID CONFIG_TINYUSB_HID_ENABLED
121125
#define CFG_TUD_MIDI CONFIG_TINYUSB_MIDI_ENABLED

‎components/arduino_tinyusb/patches/dcd_dwc2.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
dwc2_regs_t* dwc2 = DWC2_REG(rhport);
2020
const uint8_t epnum = tu_edpt_number(p_endpoint_desc->bEndpointAddress);
2121
@@ -266,7 +277,18 @@
22-
depctl.bm.set_data0_iso_even = 1;
22+
depctl.set_data0_iso_even = 1;
2323
}
2424
if (dir == TUSB_DIR_IN) {
25-
- depctl.bm.tx_fifo_num = epnum;
26-
+ //depctl.bm.tx_fifo_num = epnum;
25+
- depctl.tx_fifo_num = epnum;
26+
+ //depctl.tx_fifo_num = epnum;
2727
+ uint8_t fifo_num = epnum;
2828
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
2929
+ // Special Case for EP5, which is used by CDC but not actually called by the driver
@@ -34,7 +34,7 @@
3434
+ fifo_num = get_free_fifo();
3535
+ }
3636
+#endif
37-
+ depctl.bm.tx_fifo_num = fifo_num;
37+
+ depctl.tx_fifo_num = fifo_num;
3838
}
3939

4040
dwc2_dep_t* dep = &dwc2->ep[dir == TUSB_DIR_IN ? 0 : 1][epnum];
@@ -56,9 +56,9 @@
5656
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
5757
+ _allocated_fifos = 1;
5858
+#endif
59+
60+
usbd_spin_lock(true);
5961
handle_bus_reset(rhport);
60-
}
61-
6262
@@ -1008,7 +1037,11 @@
6363

6464
if (gintsts & GINTSTS_USBSUSP) {

0 commit comments

Comments
 (0)