Merge branch 'release/v3.1.x' into fix/p4_requirements · espressif/arduino-esp32@fdfcaec (original) (raw)

`@@ -5,8 +5,8 @@

`

5

5

`# export ARDUINO_SKIP_IDF_VERSION_CHECK=1

`

6

6

`# idf.py build

`

7

7

``

8

``

`-

set(min_supported_idf_version "5.1.0")

`

9

``

`-

set(max_supported_idf_version "5.1.99")

`

``

8

`+

set(min_supported_idf_version "5.3.0")

`

``

9

`+

set(max_supported_idf_version "5.3.99")

`

10

10

`set(idf_version "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")

`

11

11

``

12

12

`if ("${idf_version}" AND NOT "$ENV{ARDUINO_SKIP_IDF_VERSION_CHECK}")

`

`@@ -45,9 +45,11 @@ set(CORE_SRCS

`

45

45

` cores/esp32/esp32-hal-timer.c

`

46

46

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

`

47

47

` cores/esp32/esp32-hal-touch.c

`

``

48

`+

cores/esp32/esp32-hal-touch-ng.c

`

48

49

` cores/esp32/esp32-hal-uart.c

`

49

50

` cores/esp32/esp32-hal-rmt.c

`

50

51

` cores/esp32/Esp.cpp

`

``

52

`+

cores/esp32/freertos_stats.cpp

`

51

53

` cores/esp32/FunctionalInterrupt.cpp

`

52

54

` cores/esp32/HardwareSerial.cpp

`

53

55

` cores/esp32/HEXBuilder.cpp

`

`@@ -93,6 +95,7 @@ set(ARDUINO_ALL_LIBRARIES

`

93

95

` HTTPUpdate

`

94

96

` Insights

`

95

97

` LittleFS

`

``

98

`+

Matter

`

96

99

` NetBIOS

`

97

100

` Network

`

98

101

` OpenThread

`

`@@ -165,6 +168,11 @@ set(ARDUINO_LIBRARY_OpenThread_SRCS

`

165

168

` libraries/OpenThread/src/OThreadCLI.cpp

`

166

169

` libraries/OpenThread/src/OThreadCLI_Util.cpp)

`

167

170

``

``

171

`+

set(ARDUINO_LIBRARY_Matter_SRCS

`

``

172

`+

libraries/Matter/src/MatterEndpoints/MatterOnOffLight.cpp

`

``

173

`+

libraries/Matter/src/MatterEndpoints/MatterDimmableLight.cpp

`

``

174

`+

libraries/Matter/src/Matter.cpp)

`

``

175

+

168

176

`set(ARDUINO_LIBRARY_PPP_SRCS

`

169

177

` libraries/PPP/src/PPP.cpp

`

170

178

` libraries/PPP/src/ppp.c)

`

`@@ -307,7 +315,7 @@ endforeach()

`

307

315

`set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})

`

308

316

`set(srcs CORESRCS{CORE_SRCS} CORES​RCS{ARDUINO_LIBRARIES_SRCS})

`

309

317

`set(priv_includes cores/esp32/libb64)

`

310

``

`-

set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser espressif__network_provisioning)

`

``

318

`+

set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser esp_ringbuf esp_driver_gptimer esp_driver_usb_serial_jtag driver espressif__network_provisioning)

`

311

319

`set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})

`

312

320

``

313

321

`if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)

`

`@@ -318,6 +326,10 @@ if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThre

`

318

326

` endif()

`

319

327

`endif()

`

320

328

``

``

329

`+

if(IDF_TARGET STREQUAL "esp32p4")

`

``

330

`+

list(APPEND requires esp_driver_touch_sens)

`

``

331

`+

endif()

`

``

332

+

321

333

`idf_component_register(INCLUDE_DIRS includedirsPRIVINCLUDEDIRS{includedirs} PRIV_INCLUDE_DIRS includedirsPRIVI​NCLUDED​IRS{priv_includes} SRCS srcsREQUIRES{srcs} REQUIRES srcsREQUIRES{requires} PRIV_REQUIRES ${priv_requires})

`

322

334

``

323

335

`if(NOT CONFIG_FREERTOS_HZ EQUAL 1000 AND NOT "$ENV{ARDUINO_SKIP_TICK_CHECK}")

`

`@@ -357,9 +369,15 @@ function(maybe_add_component component_name)

`

357

369

` endif()

`

358

370

`endfunction()

`

359

371

``

360

``

`-

if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)

`

``

372

`+

if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)

`

361

373

` maybe_add_component(arduino_tinyusb)

`

362

374

`endif()

`

363

375

`if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)

`

364

376

` maybe_add_component(esp_https_ota)

`

365

377

`endif()

`

``

378

`+

if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ESP_SR)

`

``

379

`+

maybe_add_component(espressif__esp_sr)

`

``

380

`+

endif()

`

``

381

`+

if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_Matter)

`

``

382

`+

maybe_add_component(espressif__esp_matter)

`

``

383

`+

endif()

`