diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2689d1c..63d5683 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,7 +113,7 @@ build_idf_master: extends: .build_pytest_template image: espressif/idf:latest variables: - TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2" + TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4" build_idf_v5.0: extends: .build_pytest_template diff --git a/README.md b/README.md index f04f445..57ee2f3 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,8 @@ Issue reports and feature requests can be submitted using Github Issues: https:/ Contributions in the form of pull requests should follow ESP-IDF project's [contribution guidelines](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/contribute/index.html). We kindly ask developers to start a discussion on an issue before proposing large changes to the project. +See the beta version of stack v2.0.0_beta introduced [here](https://github.com/espressif/esp-modbus/discussions/45) + ## Licence ESP-Modbus project is based on [FreeMODBUS library](https://github.com/cwalter-at/freemodbus), Copyright (c) 2006 Christian Walter and licensed under the BSD 3-clause license. diff --git a/docs/en/applications_and_references.rst b/docs/en/applications_and_references.rst index ca5dbf1..559e807 100644 --- a/docs/en/applications_and_references.rst +++ b/docs/en/applications_and_references.rst @@ -70,3 +70,4 @@ API Reference .. include-build-file:: inc/esp_modbus_master.inc .. include-build-file:: inc/esp_modbus_slave.inc + diff --git a/idf_component.yml b/idf_component.yml index f28d81d..49f9b06 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.0.12" +version: "1.0.13" description: ESP-MODBUS is the official Modbus library for Espressif SoCs. url: https://github.com/espressif/esp-modbus dependencies: diff --git a/test/serial/mb_serial_master/README.md b/test/serial/mb_serial_master/README.md index 4128ec5..5f1d807 100644 --- a/test/serial/mb_serial_master/README.md +++ b/test/serial/mb_serial_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/test/serial/mb_serial_master/main/Kconfig.projbuild b/test/serial/mb_serial_master/main/Kconfig.projbuild index ef661fc..e81e0f4 100644 --- a/test/serial/mb_serial_master/main/Kconfig.projbuild +++ b/test/serial/mb_serial_master/main/Kconfig.projbuild @@ -30,7 +30,8 @@ menu "Modbus Example Configuration" int "UART RXD pin number" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 - default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + range 0 56 if IDF_TARGET_ESP32P4 + default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 @@ -46,7 +47,8 @@ menu "Modbus Example Configuration" int "UART TXD pin number" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 - default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + range 0 56 if IDF_TARGET_ESP32P4 + default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 @@ -62,6 +64,8 @@ menu "Modbus Example Configuration" int "UART RTS pin number" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 + range 0 56 if IDF_TARGET_ESP32P4 + default 20 if IDF_TARGET_ESP32P4 default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 diff --git a/test/serial/mb_serial_slave/README.md b/test/serial/mb_serial_slave/README.md index 48881bf..15f1db7 100644 --- a/test/serial/mb_serial_slave/README.md +++ b/test/serial/mb_serial_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/test/serial/mb_serial_slave/main/Kconfig.projbuild b/test/serial/mb_serial_slave/main/Kconfig.projbuild index 7e0abf7..2e2bdca 100644 --- a/test/serial/mb_serial_slave/main/Kconfig.projbuild +++ b/test/serial/mb_serial_slave/main/Kconfig.projbuild @@ -30,7 +30,8 @@ menu "Modbus Example Configuration" int "UART RXD pin number" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 - default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + range 0 56 if IDF_TARGET_ESP32P4 + default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 @@ -46,7 +47,8 @@ menu "Modbus Example Configuration" int "UART TXD pin number" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 - default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + range 0 56 if IDF_TARGET_ESP32P4 + default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 @@ -62,6 +64,8 @@ menu "Modbus Example Configuration" int "UART RTS pin number" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 + range 0 56 if IDF_TARGET_ESP32P4 + default 20 if IDF_TARGET_ESP32P4 default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 diff --git a/test/tcp/mb_tcp_master/README.md b/test/tcp/mb_tcp_master/README.md index d75ea59..7f298e1 100644 --- a/test/tcp/mb_tcp_master/README.md +++ b/test/tcp/mb_tcp_master/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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/test/tcp/mb_tcp_slave/README.md b/test/tcp/mb_tcp_slave/README.md index a034c01..72f4b2a 100644 --- a/test/tcp/mb_tcp_slave/README.md +++ b/test/tcp/mb_tcp_slave/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Slave Example