forked from espressif/esp-modbus
Merge branch 'bugfix/fix_closing_braces_cpp' into 'release/v2.0'
Removed extra closing braces to avoid C++ compiler error See merge request idf/esp-modbus!75
This commit is contained in:
@@ -45,7 +45,6 @@ after_script:
|
|||||||
|
|
||||||
.before_script_build_jobs:
|
.before_script_build_jobs:
|
||||||
before_script:
|
before_script:
|
||||||
- pip install idf-component-manager --upgrade
|
|
||||||
- pip install "idf_build_apps~=1.0.1"
|
- pip install "idf_build_apps~=1.0.1"
|
||||||
|
|
||||||
.check_idf_ver: &check_idf_ver |
|
.check_idf_ver: &check_idf_ver |
|
||||||
@@ -126,18 +125,18 @@ build_idf_master:
|
|||||||
variables:
|
variables:
|
||||||
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2"
|
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2"
|
||||||
|
|
||||||
|
build_idf_v5.3:
|
||||||
|
extends: .build_pytest_template
|
||||||
|
image: espressif/idf:release-v5.3
|
||||||
|
variables:
|
||||||
|
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c6 esp32c3"
|
||||||
|
|
||||||
build_idf_v5.0:
|
build_idf_v5.0:
|
||||||
extends: .build_pytest_template
|
extends: .build_pytest_template
|
||||||
image: espressif/idf:release-v5.0
|
image: espressif/idf:release-v5.0
|
||||||
variables:
|
variables:
|
||||||
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3"
|
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3"
|
||||||
|
|
||||||
build_idf_v4.4:
|
|
||||||
extends: .build_pytest_template
|
|
||||||
image: espressif/idf:release-v4.4
|
|
||||||
variables:
|
|
||||||
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c3"
|
|
||||||
|
|
||||||
.target_test_template:
|
.target_test_template:
|
||||||
image: $TARGET_TEST_ENV_IMAGE
|
image: $TARGET_TEST_ENV_IMAGE
|
||||||
stage: target_test
|
stage: target_test
|
||||||
@@ -196,6 +195,19 @@ target_test_master:
|
|||||||
artifacts: true
|
artifacts: true
|
||||||
after_script: []
|
after_script: []
|
||||||
|
|
||||||
|
target_test_5.3:
|
||||||
|
stage: target_test
|
||||||
|
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.3:1"
|
||||||
|
extends: .test_template
|
||||||
|
parallel:
|
||||||
|
matrix:
|
||||||
|
- TEST_PORT: ["serial"]
|
||||||
|
TEST_SUBDIR: ["examples/serial", "test_apps"] # test only serial examples for now
|
||||||
|
needs:
|
||||||
|
job: build_idf_v5.3
|
||||||
|
artifacts: true
|
||||||
|
after_script: []
|
||||||
|
|
||||||
target_test_v5.0:
|
target_test_v5.0:
|
||||||
stage: target_test
|
stage: target_test
|
||||||
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:3"
|
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:3"
|
||||||
@@ -209,19 +221,6 @@ target_test_v5.0:
|
|||||||
artifacts: true
|
artifacts: true
|
||||||
after_script: []
|
after_script: []
|
||||||
|
|
||||||
target_test_v4.4:
|
|
||||||
stage: target_test
|
|
||||||
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:3"
|
|
||||||
extends: .test_template
|
|
||||||
parallel:
|
|
||||||
matrix:
|
|
||||||
- TEST_PORT: ["serial"]
|
|
||||||
TEST_SUBDIR: ["examples/serial", "test_apps"]
|
|
||||||
needs:
|
|
||||||
job: build_idf_v4.4
|
|
||||||
artifacts: true
|
|
||||||
after_script: []
|
|
||||||
|
|
||||||
build_docs:
|
build_docs:
|
||||||
stage: build
|
stage: build
|
||||||
image: $ESP_DOCS_ENV_IMAGE
|
image: $ESP_DOCS_ENV_IMAGE
|
||||||
|
@@ -160,9 +160,7 @@ extern "C" {
|
|||||||
#define MB_FUNC_READWRITE_HOLDING_ENABLED (1)
|
#define MB_FUNC_READWRITE_HOLDING_ENABLED (1)
|
||||||
|
|
||||||
/*! @} */
|
/*! @} */
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if MB_MASTER_RTU_ENABLED || MB_MASTER_ASCII_ENABLED || MB_MASTER_TCP_ENABLED
|
#if MB_MASTER_RTU_ENABLED || MB_MASTER_ASCII_ENABLED || MB_MASTER_TCP_ENABLED
|
||||||
/*! \brief If master send a broadcast frame, the master will wait time of convert to delay,
|
/*! \brief If master send a broadcast frame, the master will wait time of convert to delay,
|
||||||
|
Reference in New Issue
Block a user