Skip to content

Commit 4bb287e

Browse files
lucasssvazpre-commit-ci-lite[bot]
lucasssvaz
and
pre-commit-ci-lite[bot]
authored
fix(esp32p4): Fix compilation errors (#10371)
* fix(esp32p4): Add missing touchpad definitions * fix(esp32p4): Add missing target in SPI example * fix(esp32p4): Start touch driver fix * fix(esp32p4): Skip touch examples while it is not implemented * fix(esp32p4): Add missing analog pin definitions * refactor(formatting): Fix formatting that was broken in P4 PR * fix(openthread): Add missing targets to skip * fix(esp32p4): Skip ethernet sketches * fix(esp32p4): Disable periman test while touch is not implemented * fix(esp32p4): Disable touch test while touch is not implemented * fix(esp32p4): Fix UART test * fix(esp32p4): Skip Wi-Fi test * fix(esp32): Skip unsupported example * fix(esp32p4): Fix skip files * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent 9398d52 commit 4bb287e

File tree

31 files changed

+471
-444
lines changed

31 files changed

+471
-444
lines changed

Diff for: ‎cores/esp32/esp32-hal-i2c-slave.c

+385-387
Large diffs are not rendered by default.

Diff for: ‎cores/esp32/esp32-hal-spi.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,15 @@ struct spi_struct_t {
148148
#if CONFIG_DISABLE_HAL_LOCKS
149149
#define SPI_MUTEX_LOCK()
150150
#define SPI_MUTEX_UNLOCK()
151-
+ static spi_t _spi_bus_array[] = {
151+
// clang-format off
152+
static spi_t _spi_bus_array[] = {
152153
#if CONFIG_IDF_TARGET_ESP32S2
153154
{(volatile spi_dev_t *)(DR_REG_SPI1_BASE), 0, -1, -1, -1, -1},
154155
{(volatile spi_dev_t *)(DR_REG_SPI2_BASE), 1, -1, -1, -1, -1},
155156
{(volatile spi_dev_t *)(DR_REG_SPI3_BASE), 2, -1, -1, -1, -1}
156157
#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4
157-
{(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}
158+
{(volatile spi_dev_t *)(DR_REG_SPI2_BASE), 0, -1, -1, -1, -1},
159+
{(volatile spi_dev_t *)(DR_REG_SPI3_BASE), 1, -1, -1, -1, -1}
158160
#elif CONFIG_IDF_TARGET_ESP32C2
159161
{(volatile spi_dev_t *)(DR_REG_SPI2_BASE), 0, -1, -1, -1, -1}
160162
#elif CONFIG_IDF_TARGET_ESP32C3
@@ -168,6 +170,7 @@ struct spi_struct_t {
168170
{(volatile spi_dev_t *)(DR_REG_SPI3_BASE), 3, -1, -1, -1, -1}
169171
#endif
170172
};
173+
// clang-format on
171174
#else
172175
#define SPI_MUTEX_LOCK() \
173176
do { \

Diff for: ‎cores/esp32/esp32-hal-touch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#if SOC_TOUCH_SENSOR_VERSION == 1 // ESP32
3030
static uint16_t __touchSleepCycles = 0x1000;
3131
static uint16_t __touchMeasureCycles = 0x1000;
32-
#elif SOC_TOUCH_SENSOR_VERSION == 2 // ESP32S2, ESP32S3
32+
#elif SOC_TOUCH_SENSOR_VERSION >= 2 // ESP32S2, ESP32S3, ESP32P4
3333
static uint16_t __touchSleepCycles = TOUCH_PAD_SLEEP_CYCLE_DEFAULT;
3434
static uint16_t __touchMeasureCycles = TOUCH_PAD_MEASURE_CYCLE_DEFAULT;
3535
#endif

Diff for: ‎libraries/BLE/examples/BLE5_multi_advertising/ci.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"targets": {
3+
"esp32": false,
34
"esp32p4": false,
45
"esp32s2": false
56
}

Diff for: ‎libraries/BLE/examples/BLE5_periodic_advertising/ci.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"targets": {
33
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
64
"esp32p4": false,
7-
"esp32s2": false,
8-
"esp32s3": false
5+
"esp32s2": false
96
}
107
}

Diff for: ‎libraries/BLE/examples/BLE5_periodic_sync/ci.json

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"targets": {
33
"esp32": false,
4-
"esp32c3": false,
5-
"esp32c6": false,
6-
"esp32h2": false,
74
"esp32p4": false,
85
"esp32s2": false
96
}

Diff for: ‎libraries/BLE/examples/Beacon_Scanner/ci.json

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"targets": {
3-
"esp32c3": false,
4-
"esp32c6": false,
5-
"esp32h2": false,
63
"esp32p4": false,
74
"esp32s2": false
85
}

Diff for: ‎libraries/BLE/examples/Client/ci.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32c3": false,
43
"esp32p4": false,
54
"esp32s2": false
65
}

Diff for: ‎libraries/BLE/examples/Notify/ci.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32h2": false,
43
"esp32p4": false,
54
"esp32s2": false
65
}

Diff for: ‎libraries/BLE/examples/Server/ci.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
63
"esp32p4": false,
7-
"esp32s2": false,
8-
"esp32s3": false
4+
"esp32s2": false
95
}
106
}

Diff for: ‎libraries/BLE/examples/Server_multiconnect/ci.json

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"targets": {
3-
"esp32": false,
4-
"esp32c3": false,
5-
"esp32c6": false,
6-
"esp32h2": false,
73
"esp32p4": false,
84
"esp32s2": false
95
}

Diff for: ‎libraries/BLE/examples/UART/ci.json

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"targets": {
3-
"esp32c3": false,
4-
"esp32c6": false,
5-
"esp32h2": false,
63
"esp32p4": false,
74
"esp32s2": false
85
}

Diff for: ‎libraries/BLE/examples/Write/ci.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32c3": false,
43
"esp32p4": false,
54
"esp32s2": false
65
}

Diff for: ‎libraries/BLE/examples/iBeacon/ci.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32h2": false,
43
"esp32p4": false,
54
"esp32s2": false
65
}

Diff for: ‎libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"targets": {
33
"esp32c3": false,
44
"esp32c6": false,
5-
"esp32h2": false
5+
"esp32h2": false,
6+
"esp32p4": false
67
}
78
}

Diff for: ‎libraries/ESP32/examples/Touch/TouchButton/ci.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"esp32c3": false,
44
"esp32c6": false,
55
"esp32h2": false,
6+
"esp32p4": false,
67
"esp32s2": false,
78
"esp32s3": false
89
}

Diff for: ‎libraries/ESP32/examples/Touch/TouchButtonV2/ci.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"esp32": false,
44
"esp32c3": false,
55
"esp32c6": false,
6-
"esp32h2": false
6+
"esp32h2": false,
7+
"esp32p4": false
78
}
89
}

Diff for: ‎libraries/ESP32/examples/Touch/TouchInterrupt/ci.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"targets": {
33
"esp32c3": false,
44
"esp32c6": false,
5-
"esp32h2": false
5+
"esp32h2": false,
6+
"esp32p4": false
67
}
78
}

Diff for: ‎libraries/ESP32/examples/Touch/TouchRead/ci.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"targets": {
33
"esp32c3": false,
44
"esp32c6": false,
5-
"esp32h2": false
5+
"esp32h2": false,
6+
"esp32p4": false
67
}
78
}

Diff for: ‎libraries/Ethernet/examples/ETH_LAN8720/ci.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"esp32c3": false,
44
"esp32c6": false,
55
"esp32h2": false,
6+
"esp32p4": false,
67
"esp32s2": false,
78
"esp32s3": false
89
}

Diff for: ‎libraries/Ethernet/examples/ETH_TLK110/ci.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"esp32c3": false,
44
"esp32c6": false,
55
"esp32h2": false,
6+
"esp32p4": false,
67
"esp32s2": false,
78
"esp32s3": false
89
}

Diff for: ‎libraries/OpenThread/examples/COAP/coap_switch/ci.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"targets": {
33
"esp32": false,
4+
"esp32c2": false,
45
"esp32c3": false,
5-
"esp32c6": false,
6-
"esp32h2": false,
76
"esp32p4": false,
8-
"esp32s2": false
7+
"esp32s2": false,
8+
"esp32s3": false
99
}
1010
}

Diff for: ‎libraries/OpenThread/examples/SimpleCLI/ci.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
35
"esp32c3": false,
4-
"esp32c6": false,
5-
"esp32h2": false,
66
"esp32p4": false,
7-
"esp32s2": false
7+
"esp32s2": false,
8+
"esp32s3": false
89
}
910
}

Diff for: ‎libraries/OpenThread/examples/SimpleNode/ci.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
35
"esp32c3": false,
46
"esp32p4": false,
5-
"esp32s2": false
7+
"esp32s2": false,
8+
"esp32s3": false
69
}
710
}

Diff for: ‎libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"targets": {
3-
"esp32h2": false,
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
46
"esp32p4": false,
5-
"esp32s2": false
7+
"esp32s2": false,
8+
"esp32s3": false
69
}
710
}

Diff for: ‎libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define HSPI_SS 15
4040
#endif
4141

42-
#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
42+
#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4
4343
#define VSPI FSPI
4444
#endif
4545

Diff for: ‎tests/validation/periman/ci.json

+3
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22
"platforms": {
33
"qemu": false,
44
"wokwi": false
5+
},
6+
"targets": {
7+
"esp32p4": false
58
}
69
}

Diff for: ‎tests/validation/touch/ci.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"targets": {
77
"esp32c3": false,
88
"esp32c6": false,
9-
"esp32h2": false
9+
"esp32h2": false,
10+
"esp32p4": false
1011
}
1112
}

Diff for: ‎tests/validation/uart/uart.ino

+12-12
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void transmit_and_check_msg(const String msg_append, bool perform_assert = true)
100100
if (perform_assert) {
101101
TEST_ASSERT_EQUAL_STRING(("Hello from Serial1 (UART1) >>> via loopback >>> Serial1 (UART1) " + msg_append).c_str(), recv_msg.c_str());
102102
}
103-
#elif SOC_UART_HP_NUM == 3
103+
#elif SOC_UART_HP_NUM >= 3
104104
Serial1.print("Hello from Serial1 (UART1) >>> to >>> Serial2 (UART2) " + msg_append);
105105
Serial1.flush();
106106
delay(100);
@@ -128,7 +128,7 @@ void task_delayed_msg(void *pvParameters) {
128128

129129
#if SOC_UART_HP_NUM == 2
130130
selected_serial = &Serial;
131-
#elif SOC_UART_HP_NUM == 3
131+
#elif SOC_UART_HP_NUM >= 3
132132
selected_serial = &Serial1;
133133
#endif
134134

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

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

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

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

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

422422
#if SOC_UART_HP_NUM == 2
423423
esp_rom_gpio_connect_out_signal(SOC_RX0, SIG_GPIO_OUT_IDX, false, false);
424-
#elif SOC_UART_HP_NUM == 3
424+
#elif SOC_UART_HP_NUM >= 3
425425
esp_rom_gpio_connect_out_signal(RX1, SIG_GPIO_OUT_IDX, false, false);
426426
esp_rom_gpio_connect_out_signal(RX2, SIG_GPIO_OUT_IDX, false, false);
427427
#endif
@@ -432,7 +432,7 @@ void change_pins_test(void) {
432432
Serial1.setPins(NEW_RX1, NEW_TX1);
433433
TEST_ASSERT_EQUAL(NEW_RX1, uart_get_RxPin(1));
434434
TEST_ASSERT_EQUAL(NEW_TX1, uart_get_TxPin(1));
435-
#elif SOC_UART_HP_NUM == 3
435+
#elif SOC_UART_HP_NUM >= 3
436436
Serial1.setPins(RX2, TX2);
437437
Serial2.setPins(RX1, TX1);
438438
TEST_ASSERT_EQUAL(RX2, uart_get_RxPin(1));
@@ -447,7 +447,7 @@ void change_pins_test(void) {
447447

448448
#if SOC_UART_HP_NUM == 2
449449
uart_internal_loopback(1, NEW_RX1);
450-
#elif SOC_UART_HP_NUM == 3
450+
#elif SOC_UART_HP_NUM >= 3
451451
uart_internal_loopback(1, RX1);
452452
uart_internal_loopback(2, RX2);
453453
#endif
@@ -470,7 +470,7 @@ void auto_baudrate_test(void) {
470470
#if SOC_UART_HP_NUM == 2
471471
selected_serial = &Serial1;
472472
uart_internal_loopback(0, RX1);
473-
#elif SOC_UART_HP_NUM == 3
473+
#elif SOC_UART_HP_NUM >= 3
474474
selected_serial = &Serial2;
475475
#endif
476476

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

505505
Wire.begin(RX1, TX1);
506506

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

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

519519
Serial1.setPins(RX1, TX1);
520520

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

583583
Serial1.onReceive([]() {

Diff for: ‎tests/validation/wifi/ci.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"qemu": false
2323
},
2424
"targets": {
25-
"esp32h2": false
25+
"esp32h2": false,
26+
"esp32p4": false
2627
}
2728
}

0 commit comments

Comments
 (0)