Skip to content

Commit fd36505

Browse files
authored
Merge branch 'master' into test/sdcard
2 parents d1efa2a + e368295 commit fd36505

File tree

17 files changed

+2523
-7
lines changed

17 files changed

+2523
-7
lines changed

.github/scripts/sketch_utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
155155
esp32c3_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
156156
esp32c6_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
157157
esp32h2_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
158-
esp32p4_opts=$(echo "PSRAM=enabled,USBMode=default,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
158+
esp32p4_opts=$(echo "PSRAM=enabled,USBMode=default,ChipVariant=postv3,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
159159
esp32c5_opts=$(echo "PSRAM=enabled,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
160160

161161
# Select the common part of the FQBN based on the target. The rest will be

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ set(ARDUINO_LIBRARY_Matter_SRCS
202202
libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp
203203
libraries/Matter/src/MatterEndpoints/MatterDimmablePlugin.cpp
204204
libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp
205+
libraries/Matter/src/MatterEndpoints/MatterWindowCovering.cpp
205206
libraries/Matter/src/Matter.cpp
206207
libraries/Matter/src/MatterEndPoint.cpp)
207208

docs/en/contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Currently, the default FQBNs are:
174174
* ``espressif:esp32:esp32c3``
175175
* ``espressif:esp32:esp32c6``
176176
* ``espressif:esp32:esp32h2``
177-
* ``espressif:esp32:esp32p4:USBMode=default``
177+
* ``espressif:esp32:esp32p4:USBMode=default,ChipVariant=postv3``
178178

179179
There are two ways to alter the FQBNs used to compile the sketches: by using the ``fqbn`` or ``fqbn_append`` fields in the ``ci.yml`` file.
180180

0 commit comments

Comments
 (0)