feedc0de/esp-modbus
1
0
Fork 0
forked from espressif/esp-modbus
Code Pull Requests Activity

add cpp test-app, fix atomcs issue (+workaround v5.0)

Browse Source
This commit is contained in:
aleks
2025-02-14 10:59:13 +01:00
parent a2a16545fc
commit 138382bf0d
13 changed files with 192 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_apps/cpp/modbus_serial_cpp_test/CMakeLists.txt
+6
View File
@@ -0,0 +1,6 @@
# The following five lines of boilerplate have to be in your project's
# CMakeLists in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(mb_serial_cpp)
test_apps/cpp/modbus_serial_cpp_test/main/CMakeLists.txt
+2
View File
@@ -0,0 +1,2 @@
idf_component_register(SRCS "serial_test.cpp"
INCLUDE_DIRS ".")
test_apps/cpp/modbus_serial_cpp_test/main/idf_component.yml
+6
View File
@@ -0,0 +1,6 @@
dependencies:
idf: ">=5.0"
espressif/esp-modbus:
version: "^2.0.0"
override_path: "../../../../"
test_apps/cpp/modbus_serial_cpp_test/main/serial_test.cpp
+130
View File
@@ -0,0 +1,130 @@
#include "esp_log.h"
#include "sdkconfig.h"
#include "mbcontroller.h"
#define TEST_PORT_NUM (uart_port_t)1
#define TEST_SPEED 115200
#define TAG "CPP_TEST"
#define MB_SLAVE_SHORT_ADDRESS 1
enum {
MB_DEVICE_ADDR1 = 1
};
// Enumeration of all supported CIDs for device (used in parameter definition table)
enum {
CID_DEV_REG0 = 0
};
#define STR(fieldname) ((const char*)( fieldname ))
#define OPTS(min_val, max_val, step_val) { .opt1 = min_val, .opt2 = max_val, .opt3 = step_val }
static void *pmaster_handle = NULL;
static void *pslave_handle = NULL;
// Example Data (Object) Dictionary for Modbus parameters
const mb_parameter_descriptor_t dummy_dict[] = {
// CID, Name, Units, Modbus addr, register type, Modbus Reg Start Addr, Modbus Reg read length,
// Instance offset (NA), Instance type, Instance length (bytes), Options (NA), Permissions
{ CID_DEV_REG0, STR("MB_hold_reg-0"), STR("Data"), MB_DEVICE_ADDR1, MB_PARAM_HOLDING, 0, 1,
0, PARAM_TYPE_U16, PARAM_SIZE_U16, OPTS( 0,0,0 ), PAR_PERMS_READ_WRITE_TRIGGER },
};
// Calculate number of parameters in the table
const uint16_t num_device_parameters = (sizeof(dummy_dict)/sizeof(dummy_dict[0]));
// Modbus serial master initialization
static esp_err_t master_serial_init(void **pinst)
{
mb_communication_info_t comm;
comm.ser_opts.port = (uart_port_t)TEST_PORT_NUM;
comm.ser_opts.mode = (mb_comm_mode_t)MB_RTU;
comm.ser_opts.baudrate = TEST_SPEED;
comm.ser_opts.parity = MB_PARITY_NONE;
comm.ser_opts.uid = 0;
comm.ser_opts.response_tout_ms = 100;
comm.ser_opts.data_bits = UART_DATA_8_BITS;
comm.ser_opts.stop_bits = UART_STOP_BITS_1;
// Initialize Modbus controller
esp_err_t err = mbc_master_create_serial(&comm, pinst);
MB_RETURN_ON_FALSE((pinst != NULL), ESP_ERR_INVALID_STATE, TAG,
"mbc master initialization fail.");
MB_RETURN_ON_FALSE((err == ESP_OK), ESP_ERR_INVALID_STATE, TAG,
"mbc master initialization fail, returns(0x%x).", (int)err);
err = mbc_master_set_descriptor(*pinst, &dummy_dict[0], num_device_parameters);
MB_RETURN_ON_FALSE((err == ESP_OK), ESP_ERR_INVALID_STATE, TAG,
"mbc master set descriptor fail, returns(0x%x).", (int)err);
err = mbc_master_start(*pinst);
MB_RETURN_ON_FALSE((err == ESP_OK), ESP_ERR_INVALID_STATE, TAG,
"mbc master start fail, returned (0x%x).", (int)err);
const mb_parameter_descriptor_t *pdescriptor = NULL;
err = mbc_master_get_cid_info(*pinst, CID_DEV_REG0, &pdescriptor);
MB_RETURN_ON_FALSE(((err != ESP_ERR_NOT_FOUND) && (pdescriptor != NULL)), ESP_ERR_INVALID_STATE, TAG,
"mbc master get descriptor fail, returned (0x%x).", (int)err);
uint16_t regs[] = {0x1111, 0x2222};
uint8_t type = 0;
err = mbc_master_get_parameter(*pinst, pdescriptor->cid, (uint8_t *)&regs[0], &type);
MB_RETURN_ON_FALSE((err != ESP_ERR_INVALID_STATE), ESP_ERR_INVALID_STATE, TAG,
"mbc master get parameter fail, returned (0x%x).", (int)err);
ESP_LOGI(TAG, "Modbus master stack initialized...");
return ESP_OK;
}
// Modbus serial slave initialization
static esp_err_t slave_serial_init(void **pinst)
{
mb_register_area_descriptor_t reg_area;
mb_communication_info_t comm;
comm.ser_opts.port = (uart_port_t)TEST_PORT_NUM;
comm.ser_opts.mode = (mb_comm_mode_t)MB_RTU;
comm.ser_opts.baudrate = TEST_SPEED;
comm.ser_opts.parity = MB_PARITY_NONE;
comm.ser_opts.uid = MB_SLAVE_SHORT_ADDRESS;
comm.ser_opts.response_tout_ms = 100;
comm.ser_opts.data_bits = UART_DATA_8_BITS;
comm.ser_opts.stop_bits = UART_STOP_BITS_1;
// Initialize Modbus controller
esp_err_t err = mbc_slave_create_serial(&comm, pinst);
MB_RETURN_ON_FALSE((pinst != NULL), ESP_ERR_INVALID_STATE, TAG,
"mbc slave initialization fail.");
MB_RETURN_ON_FALSE((err == ESP_OK), ESP_ERR_INVALID_STATE, TAG,
"mbc slave initialization fail, returns(0x%x).", (int)err);
uint16_t holding_regs[] = {0x1111, 0x2222, 0x3333, 0x4444};
reg_area.type = MB_PARAM_HOLDING;
reg_area.start_offset = 0;
reg_area.address = (void*)&holding_regs[0];
reg_area.size = sizeof(holding_regs);
reg_area.access = MB_ACCESS_RW;
ESP_ERROR_CHECK(mbc_slave_set_descriptor(*pinst, reg_area));
err = mbc_slave_start(*pinst);
MB_RETURN_ON_FALSE((err == ESP_OK), ESP_ERR_INVALID_STATE, TAG,
"mbc slave start fail, returned (0x%x).", (int)err);
ESP_LOGI(TAG, "Modbus slave stack initialized...");
return err;
}
// Intentionally verify that atomic values are layout compatible with original types
// Note: the `__is_layout_compatible() and ` is not supported in old versions
static_assert(
sizeof(std::atomic_int) == sizeof(int) &&
sizeof(std::atomic<int>) == sizeof(int) &&
sizeof(_Atomic(int)) == sizeof(int) &&
sizeof(_Atomic(uint32_t)) == sizeof(uint32_t) &&
sizeof(_Atomic(uint16_t)) == sizeof(uint16_t) &&
sizeof(_Atomic(uint64_t)) == sizeof(uint64_t)
);
extern "C" void app_main(void)
{
// Initialization of device peripheral and objects
ESP_LOGI(TAG, "Setup master cpp....");
ESP_ERROR_CHECK(master_serial_init(&pmaster_handle));
ESP_ERROR_CHECK(mbc_master_delete(pmaster_handle));
ESP_LOGI(TAG, "Master test passed successfully.");
ESP_LOGI(TAG, "Setup slave cpp....");
ESP_ERROR_CHECK(slave_serial_init(&pslave_handle));
ESP_ERROR_CHECK(mbc_slave_delete(pslave_handle));
ESP_LOGI(TAG, "Slave test passed successfully.");
}
test_apps/cpp/modbus_serial_cpp_test/pytest_cpp_mb_serial_master_slave.py
+15
View File
@@ -0,0 +1,15 @@
# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
import pytest
from pytest_embedded import Dut
@pytest.mark.esp32
@pytest.mark.generic
def test_cpp_mb_serial_master_slave(dut: Dut) -> None:
dut.expect('Setup master cpp....')
dut.expect('Modbus master stack initialized...', timeout=5)
dut.expect('Master test passed successfully.', timeout=5)
dut.expect('Setup slave cpp....')
dut.expect('Modbus slave stack initialized...', timeout=5)
dut.expect('Slave test passed successfully.', timeout=5)
dut.expect('Returned from app_main()')