diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml index bd984dba60..6d6619d8fa 100644 --- a/examples/protocols/.build-test-rules.yml +++ b/examples/protocols/.build-test-rules.yml @@ -180,10 +180,6 @@ examples/protocols/l2tap: examples/protocols/modbus: <<: *default_dependencies - disable: - - if: IDF_TARGET == "esp32p4" - temporary: true - reason: not supported on p4 # TODO: IDF-7869 depends_filepatterns: - examples/common_components/protocol_examples_common/**/* - examples/protocols/modbus/mb_example_common/**/* diff --git a/examples/protocols/modbus/serial/mb_master/README.md b/examples/protocols/modbus/serial/mb_master/README.md index 14407d9539..7b28f660a2 100644 --- a/examples/protocols/modbus/serial/mb_master/README.md +++ b/examples/protocols/modbus/serial/mb_master/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Master Example diff --git a/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild b/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild index 9e6ec5327e..7d182f27b4 100644 --- a/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild +++ b/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild @@ -31,7 +31,7 @@ menu "Modbus Example Configuration" config MB_UART_RXD int "UART RXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX - default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\ IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help @@ -41,7 +41,7 @@ menu "Modbus Example Configuration" config MB_UART_TXD int "UART TXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\ IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help @@ -51,6 +51,7 @@ menu "Modbus Example Configuration" config MB_UART_RTS int "UART RTS pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX + default 20 if IDF_TARGET_ESP32P4 default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\ IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 diff --git a/examples/protocols/modbus/serial/mb_master/sdkconfig.defaults b/examples/protocols/modbus/serial/mb_master/sdkconfig.defaults index 3c9c6de0ed..df3c28edad 100644 --- a/examples/protocols/modbus/serial/mb_master/sdkconfig.defaults +++ b/examples/protocols/modbus/serial/mb_master/sdkconfig.defaults @@ -1,10 +1,9 @@ # # Modbus configuration # +CONFIG_FMB_TIMER_PORT_ENABLED=n CONFIG_MB_COMM_MODE_ASCII=y CONFIG_MB_UART_BAUD_RATE=115200 -CONFIG_FMB_TIMER_PORT_ENABLED=n -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=400 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/examples/protocols/modbus/serial/mb_slave/README.md b/examples/protocols/modbus/serial/mb_slave/README.md index c73e76383f..00db56c68d 100644 --- a/examples/protocols/modbus/serial/mb_slave/README.md +++ b/examples/protocols/modbus/serial/mb_slave/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Slave Example diff --git a/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild b/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild index ab6518cffc..ca1b485eb8 100644 --- a/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild +++ b/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild @@ -31,7 +31,7 @@ menu "Modbus Example Configuration" config MB_UART_RXD int "UART RXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX - default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\ IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help @@ -41,7 +41,7 @@ menu "Modbus Example Configuration" config MB_UART_TXD int "UART TXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\ IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help @@ -51,6 +51,7 @@ menu "Modbus Example Configuration" config MB_UART_RTS int "UART RTS pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX + default 20 if IDF_TARGET_ESP32P4 default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\ IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 diff --git a/examples/protocols/modbus/serial/mb_slave/sdkconfig.defaults b/examples/protocols/modbus/serial/mb_slave/sdkconfig.defaults index 7f2c0eabdf..957833bbdd 100644 --- a/examples/protocols/modbus/serial/mb_slave/sdkconfig.defaults +++ b/examples/protocols/modbus/serial/mb_slave/sdkconfig.defaults @@ -5,5 +5,4 @@ CONFIG_MB_COMM_MODE_ASCII=y CONFIG_MB_SLAVE_ADDR=1 CONFIG_MB_UART_BAUD_RATE=115200 CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y diff --git a/examples/protocols/modbus/tcp/mb_tcp_master/README.md b/examples/protocols/modbus/tcp/mb_tcp_master/README.md index 8ac43f8bcc..7f298e1cae 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_master/README.md +++ b/examples/protocols/modbus/tcp/mb_tcp_master/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus TCP Master Example diff --git a/examples/protocols/modbus/tcp/mb_tcp_master/sdkconfig.defaults b/examples/protocols/modbus/tcp/mb_tcp_master/sdkconfig.defaults index 968d332fcc..1a76af9cc3 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_master/sdkconfig.defaults +++ b/examples/protocols/modbus/tcp/mb_tcp_master/sdkconfig.defaults @@ -11,9 +11,6 @@ CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_GROUP=0 -CONFIG_FMB_TIMER_INDEX=0 -CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_EXAMPLE_CONNECT_IPV6=n diff --git a/examples/protocols/modbus/tcp/mb_tcp_slave/README.md b/examples/protocols/modbus/tcp/mb_tcp_slave/README.md index 7d20eb27a6..725bf10ced 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_slave/README.md +++ b/examples/protocols/modbus/tcp/mb_tcp_slave/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Slave Example diff --git a/tools/ci/ignore_build_warnings.txt b/tools/ci/ignore_build_warnings.txt index fc5ac452ab..332ef25185 100644 --- a/tools/ci/ignore_build_warnings.txt +++ b/tools/ci/ignore_build_warnings.txt @@ -42,13 +42,9 @@ warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE' assigned to '"4MB"' in .*/ warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE' assigned to '"8MB"' in .*/components/wear_levelling/host_test/sdkconfig.defaults warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE' assigned to '"8MB"' in .*/components/fatfs/host_test/sdkconfig.defaults warning: unknown kconfig symbol 'ESPTOOLPY_MONITOR_BAUD_921600B' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/vendor_models/* -warning: unknown kconfig symbol 'FMB_TIMER_GROUP' assigned to '0' in .*/examples/protocols/modbus/tcp/* -warning: unknown kconfig symbol 'FMB_TIMER_INDEX' assigned to '0' in .*/examples/protocols/modbus/tcp/* -warning: unknown kconfig symbol 'FMB_TIMER_ISR_IN_IRAM' assigned to 'y' in .*/examples/protocols/modbus/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/examples/bluetooth/esp_ble_mesh/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/examples/wifi/iperf/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/idf-app-test/apps/iperf/* -warning: unknown kconfig symbol 'MB_SLAVE_IP_FROM_STDIN' assigned to 'y' in .*/examples/protocols/modbus/* warning: unknown kconfig symbol 'SPI_FLASH_USE_LEGACY_IMPL' assigned to '1' in .*/components/wear_levelling/host_test/sdkconfig.defaults warning: unknown kconfig symbol 'SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram warning: unknown kconfig symbol 'SPIRAM_FETCH_INSTRUCTIONS' assigned to 'y' in .*/components/spi_flash/test_apps/mspi_test/sdkconfig.ci.psram