espressif · me-no-dev · Sep 25, 2024 · Sep 24, 2024 · Sep 24, 2024 · Sep 24, 2024
diff --git a/cores/esp32/esp32-hal-i2c-slave.c b/cores/esp32/esp32-hal-i2c-slave.c
diff --git a/cores/esp32/esp32-hal-spi.c b/cores/esp32/esp32-hal-spi.c
@@ -148,13 +148,15 @@ struct spi_struct_t {
 #if CONFIG_DISABLE_HAL_LOCKS
 #define SPI_MUTEX_LOCK()
 #define SPI_MUTEX_UNLOCK()
-+ static spi_t _spi_bus_array[] = {
+// clang-format off
+static spi_t _spi_bus_array[] = {
 #if CONFIG_IDF_TARGET_ESP32S2
  {(volatile spi_dev_t *)(DR_REG_SPI1_BASE), 0, -1, -1, -1, -1},
  {(volatile spi_dev_t *)(DR_REG_SPI2_BASE), 1, -1, -1, -1, -1},
  {(volatile spi_dev_t *)(DR_REG_SPI3_BASE), 2, -1, -1, -1, -1}
 #elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4
-  {(volatile spi_dev_t *)(DR_REG_SPI2_BASE), 0, -1, -1, -1, -1}, {(volatile spi_dev_t *)(DR_REG_SPI3_BASE), 1, -1, -1, -1, -1}
+  {(volatile spi_dev_t *)(DR_REG_SPI2_BASE), 0, -1, -1, -1, -1},
+  {(volatile spi_dev_t *)(DR_REG_SPI3_BASE), 1, -1, -1, -1, -1}
 #elif CONFIG_IDF_TARGET_ESP32C2
  {(volatile spi_dev_t *)(DR_REG_SPI2_BASE), 0, -1, -1, -1, -1}
 #elif CONFIG_IDF_TARGET_ESP32C3
@@ -168,6 +170,7 @@ struct spi_struct_t {
  {(volatile spi_dev_t *)(DR_REG_SPI3_BASE), 3, -1, -1, -1, -1}
 #endif
 };
+// clang-format on
 #else
 #define SPI_MUTEX_LOCK() \
  do {                   \

diff --git a/cores/esp32/esp32-hal-touch.c b/cores/esp32/esp32-hal-touch.c
@@ -29,7 +29,7 @@
 #if SOC_TOUCH_SENSOR_VERSION == 1    // ESP32
 static uint16_t __touchSleepCycles = 0x1000;
 static uint16_t __touchMeasureCycles = 0x1000;
-#elif SOC_TOUCH_SENSOR_VERSION == 2  // ESP32S2, ESP32S3
+#elif SOC_TOUCH_SENSOR_VERSION >= 2  // ESP32S2, ESP32S3, ESP32P4
 static uint16_t __touchSleepCycles = TOUCH_PAD_SLEEP_CYCLE_DEFAULT;
 static uint16_t __touchMeasureCycles = TOUCH_PAD_MEASURE_CYCLE_DEFAULT;
 #endif

diff --git a/libraries/BLE/examples/BLE5_multi_advertising/ci.json b/libraries/BLE/examples/BLE5_multi_advertising/ci.json
@@ -1,5 +1,6 @@
 {
  "targets": {
+    "esp32": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/BLE5_periodic_advertising/ci.json b/libraries/BLE/examples/BLE5_periodic_advertising/ci.json
@@ -1,10 +1,7 @@
 {
  "targets": {
    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
    "esp32p4": false,
-    "esp32s2": false,
-    "esp32s3": false
+    "esp32s2": false
  }
 }
diff --git a/libraries/BLE/examples/BLE5_periodic_sync/ci.json b/libraries/BLE/examples/BLE5_periodic_sync/ci.json
@@ -1,9 +1,6 @@
 {
  "targets": {
    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/Beacon_Scanner/ci.json b/libraries/BLE/examples/Beacon_Scanner/ci.json
@@ -1,8 +1,5 @@
 {
  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/Client/ci.json b/libraries/BLE/examples/Client/ci.json
@@ -1,6 +1,5 @@
 {
  "targets": {
-    "esp32c3": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/Notify/ci.json b/libraries/BLE/examples/Notify/ci.json
@@ -1,6 +1,5 @@
 {
  "targets": {
-    "esp32h2": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/Server/ci.json b/libraries/BLE/examples/Server/ci.json
@@ -1,10 +1,6 @@
 {
  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
    "esp32p4": false,
-    "esp32s2": false,
-    "esp32s3": false
+    "esp32s2": false
  }
 }
diff --git a/libraries/BLE/examples/Server_multiconnect/ci.json b/libraries/BLE/examples/Server_multiconnect/ci.json
@@ -1,9 +1,5 @@
 {
  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/UART/ci.json b/libraries/BLE/examples/UART/ci.json
@@ -1,8 +1,5 @@
 {
  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/Write/ci.json b/libraries/BLE/examples/Write/ci.json
@@ -1,6 +1,5 @@
 {
  "targets": {
-    "esp32c3": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/BLE/examples/iBeacon/ci.json b/libraries/BLE/examples/iBeacon/ci.json
@@ -1,6 +1,5 @@
 {
  "targets": {
-    "esp32h2": false,
    "esp32p4": false,
    "esp32s2": false
  }

diff --git a/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.json b/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.json
@@ -2,6 +2,7 @@
  "targets": {
    "esp32c3": false,
    "esp32c6": false,
-    "esp32h2": false
+    "esp32h2": false,
+    "esp32p4": false
  }
 }
diff --git a/libraries/ESP32/examples/Touch/TouchButton/ci.json b/libraries/ESP32/examples/Touch/TouchButton/ci.json
@@ -3,6 +3,7 @@
    "esp32c3": false,
    "esp32c6": false,
    "esp32h2": false,
+    "esp32p4": false,
    "esp32s2": false,
    "esp32s3": false
  }

diff --git a/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json b/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json
@@ -3,6 +3,7 @@
    "esp32": false,
    "esp32c3": false,
    "esp32c6": false,
-    "esp32h2": false
+    "esp32h2": false,
+    "esp32p4": false
  }
 }
diff --git a/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json b/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json
@@ -2,6 +2,7 @@
  "targets": {
    "esp32c3": false,
    "esp32c6": false,
-    "esp32h2": false
+    "esp32h2": false,
+    "esp32p4": false
  }
 }
diff --git a/libraries/ESP32/examples/Touch/TouchRead/ci.json b/libraries/ESP32/examples/Touch/TouchRead/ci.json
@@ -2,6 +2,7 @@
  "targets": {
    "esp32c3": false,
    "esp32c6": false,
-    "esp32h2": false
+    "esp32h2": false,
+    "esp32p4": false
  }
 }
diff --git a/libraries/Ethernet/examples/ETH_LAN8720/ci.json b/libraries/Ethernet/examples/ETH_LAN8720/ci.json
@@ -3,6 +3,7 @@
    "esp32c3": false,
    "esp32c6": false,
    "esp32h2": false,
+    "esp32p4": false,
    "esp32s2": false,
    "esp32s3": false
  }

diff --git a/libraries/Ethernet/examples/ETH_TLK110/ci.json b/libraries/Ethernet/examples/ETH_TLK110/ci.json
@@ -3,6 +3,7 @@
    "esp32c3": false,
    "esp32c6": false,
    "esp32h2": false,
+    "esp32p4": false,
    "esp32s2": false,
    "esp32s3": false
  }

diff --git a/libraries/OpenThread/examples/COAP/coap_switch/ci.json b/libraries/OpenThread/examples/COAP/coap_switch/ci.json
@@ -1,10 +1,10 @@
 {
  "targets": {
    "esp32": false,
+    "esp32c2": false,
    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
    "esp32p4": false,
-    "esp32s2": false
+    "esp32s2": false,
+    "esp32s3": false
  }
 }
diff --git a/libraries/OpenThread/examples/SimpleCLI/ci.json b/libraries/OpenThread/examples/SimpleCLI/ci.json
@@ -1,9 +1,10 @@
 {
  "targets": {
+    "esp32": false,
+    "esp32c2": false,
    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
    "esp32p4": false,
-    "esp32s2": false
+    "esp32s2": false,
+    "esp32s3": false
  }
 }
diff --git a/libraries/OpenThread/examples/SimpleNode/ci.json b/libraries/OpenThread/examples/SimpleNode/ci.json
@@ -1,7 +1,10 @@
 {
  "targets": {
+    "esp32": false,
+    "esp32c2": false,
    "esp32c3": false,
    "esp32p4": false,
-    "esp32s2": false
+    "esp32s2": false,
+    "esp32s3": false
  }
 }
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json b/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json
@@ -1,7 +1,10 @@
 {
  "targets": {
-    "esp32h2": false,
+    "esp32": false,
+    "esp32c2": false,
+    "esp32c3": false,
    "esp32p4": false,
-    "esp32s2": false
+    "esp32s2": false,
+    "esp32s3": false
  }
 }
diff --git a/libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino b/libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino
@@ -39,7 +39,7 @@
 #define HSPI_SS   15
 #endif

-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4
 #define VSPI FSPI
 #endif


diff --git a/tests/validation/periman/ci.json b/tests/validation/periman/ci.json
@@ -2,5 +2,8 @@
  "platforms": {
    "qemu": false,
    "wokwi": false
+  },
+  "targets": {
+    "esp32p4": false
  }
 }
diff --git a/tests/validation/touch/ci.json b/tests/validation/touch/ci.json
@@ -6,6 +6,7 @@
  "targets": {
    "esp32c3": false,
    "esp32c6": false,
-    "esp32h2": false
+    "esp32h2": false,
+    "esp32p4": false
  }
 }
diff --git a/tests/validation/uart/uart.ino b/tests/validation/uart/uart.ino
@@ -100,7 +100,7 @@ void transmit_and_check_msg(const String msg_append, bool perform_assert = true)
  if (perform_assert) {
    TEST_ASSERT_EQUAL_STRING(("Hello from Serial1 (UART1) >>> via loopback >>> Serial1 (UART1) " + msg_append).c_str(), recv_msg.c_str());
  }
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  Serial1.print("Hello from Serial1 (UART1) >>> to >>> Serial2 (UART2) " + msg_append);
  Serial1.flush();
  delay(100);
@@ -128,7 +128,7 @@ void task_delayed_msg(void *pvParameters) {

 #if SOC_UART_HP_NUM == 2
  selected_serial = &Serial;
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  selected_serial = &Serial1;
 #endif

@@ -150,7 +150,7 @@ void setUp(void) {
    onReceive_cb(Serial1);
  });
  uart_internal_loopback(1, RX1);
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  log_d("Setup internal loop-back between Serial1 (UART1) <<--->> Serial2 (UART2)");

  Serial1.onReceive([]() {
@@ -225,7 +225,7 @@ void change_baudrate_test(void) {
  Serial1.updateBaudRate(9600);
  TEST_ASSERT_UINT_WITHIN(192, 9600, Serial1.baudRate());

-#if SOC_UART_HP_NUM == 3
+#if SOC_UART_HP_NUM >= 3
  Serial2.updateBaudRate(9600);
  TEST_ASSERT_UINT_WITHIN(192, 9600, Serial2.baudRate());
 #endif
@@ -239,7 +239,7 @@ void change_baudrate_test(void) {
  //Baudrate error should be within 2% of the target baudrate
  TEST_ASSERT_UINT_WITHIN(2304, 115200, Serial1.baudRate());

-#if SOC_UART_HP_NUM == 3
+#if SOC_UART_HP_NUM >= 3
  TEST_ASSERT_UINT_WITHIN(2304, 115200, Serial2.baudRate());
 #endif

@@ -421,7 +421,7 @@ void change_pins_test(void) {

 #if SOC_UART_HP_NUM == 2
  esp_rom_gpio_connect_out_signal(SOC_RX0, SIG_GPIO_OUT_IDX, false, false);
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  esp_rom_gpio_connect_out_signal(RX1, SIG_GPIO_OUT_IDX, false, false);
  esp_rom_gpio_connect_out_signal(RX2, SIG_GPIO_OUT_IDX, false, false);
 #endif
@@ -432,7 +432,7 @@ void change_pins_test(void) {
  Serial1.setPins(NEW_RX1, NEW_TX1);
  TEST_ASSERT_EQUAL(NEW_RX1, uart_get_RxPin(1));
  TEST_ASSERT_EQUAL(NEW_TX1, uart_get_TxPin(1));
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  Serial1.setPins(RX2, TX2);
  Serial2.setPins(RX1, TX1);
  TEST_ASSERT_EQUAL(RX2, uart_get_RxPin(1));
@@ -447,7 +447,7 @@ void change_pins_test(void) {

 #if SOC_UART_HP_NUM == 2
  uart_internal_loopback(1, NEW_RX1);
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  uart_internal_loopback(1, RX1);
  uart_internal_loopback(2, RX2);
 #endif
@@ -470,7 +470,7 @@ void auto_baudrate_test(void) {
 #if SOC_UART_HP_NUM == 2
  selected_serial = &Serial1;
  uart_internal_loopback(0, RX1);
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  selected_serial = &Serial2;
 #endif

@@ -504,7 +504,7 @@ void periman_test(void) {

  Wire.begin(RX1, TX1);

-#if SOC_UART_HP_NUM == 3
+#if SOC_UART_HP_NUM >= 3
  Wire1.begin(RX2, TX2);
 #endif

@@ -518,7 +518,7 @@ void periman_test(void) {

  Serial1.setPins(RX1, TX1);

-#if SOC_UART_HP_NUM == 3
+#if SOC_UART_HP_NUM >= 3
  Serial2.setPins(RX2, TX2);
  uart_internal_loopback(1, RX2);
  uart_internal_loopback(2, RX1);
@@ -577,7 +577,7 @@ void setup() {
    onReceive_cb(Serial1);
  });
  uart_internal_loopback(1, RX1);
-#elif SOC_UART_HP_NUM == 3
+#elif SOC_UART_HP_NUM >= 3
  log_d("Setup internal loop-back between Serial1 (UART1) <<--->> Serial2 (UART2)");

  Serial1.onReceive([]() {

diff --git a/tests/validation/wifi/ci.json b/tests/validation/wifi/ci.json
@@ -22,6 +22,7 @@
    "qemu": false
  },
  "targets": {
-    "esp32h2": false
+    "esp32h2": false,
+    "esp32p4": false
  }
 }