espressif/esp-modbus
1
0
Fork 1
mirror of https://github.com/espressif/esp-modbus.git synced 2025-07-30 10:27:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

modbus slave expose registration of func handlers

Browse Source
This commit is contained in:
aleks
2023-09-14 09:36:11 +02:00
committed by Alex Lisitsyn
parent 5fa0b710d1
commit 087909c26e
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -43,10 +43,10 @@ set(srcs
"common/esp_modbus_master_serial.c" "common/esp_modbus_master_serial.c"
"common/esp_modbus_slave_serial.c") "common/esp_modbus_slave_serial.c")
set(include_dirs common/include) set(include_dirs common/include port modbus/include)
set(priv_include_dirs common port modbus modbus/ascii modbus/functions set(priv_include_dirs common modbus modbus/ascii modbus/functions
modbus/rtu modbus/tcp modbus/include) modbus/rtu modbus/tcp)
list(APPEND priv_include_dirs serial_slave/port serial_slave/modbus_controller list(APPEND priv_include_dirs serial_slave/port serial_slave/modbus_controller
serial_master/port serial_master/modbus_controller serial_master/port serial_master/modbus_controller

8
Kconfig
View File

@ -211,5 +211,13 @@ menu "Modbus configuration"
to send timeout events from the callback function called from ISR. to send timeout events from the callback function called from ISR.
This option has dependency with the UART_ISR_IN_IRAM option which places UART interrupt This option has dependency with the UART_ISR_IN_IRAM option which places UART interrupt
handler into IRAM to prevent delays related to processing of UART events. handler into IRAM to prevent delays related to processing of UART events.
config FMB_FUNC_HANDLERS_MAX
int "Number "
range 0 100
default 16
help
Modbus stack event queue timeout in milliseconds. This may help to optimize
Modbus stack event processing time.
endmenu endmenu

2
freemodbus/modbus/include/mbconfig.h
View File

@ -132,7 +132,7 @@ PR_BEGIN_EXTERN_C
* the sum of all enabled functions in this file and custom function * the sum of all enabled functions in this file and custom function
* handlers. If set to small adding more functions will fail. * handlers. If set to small adding more functions will fail.
*/ */
#define MB_FUNC_HANDLERS_MAX ( 16 ) #define MB_FUNC_HANDLERS_MAX ( CONFIG_FMB_FUNC_HANDLERS_MAX )
/*! \brief Number of bytes which should be allocated for the <em>Report Slave ID /*! \brief Number of bytes which should be allocated for the <em>Report Slave ID
* </em>command. * </em>command.

2
freemodbus/modbus/include/mbport.h
View File

@ -149,6 +149,8 @@ void vMBPortClose( void );
void xMBPortSerialClose( void ); void xMBPortSerialClose( void );
//eMBErrorCode eMBRegisterCB( UCHAR ucFunctionCode, pxMBFunctionHandler pxHandler );
void vMBPortSerialEnable( BOOL xRxEnable, BOOL xTxEnable ); void vMBPortSerialEnable( BOOL xRxEnable, BOOL xTxEnable );
BOOL xMBPortSerialGetByte( CHAR * pucByte ); BOOL xMBPortSerialGetByte( CHAR * pucByte );

3
freemodbus/port/port.h
View File

@ -50,7 +50,8 @@
#include "driver/timer.h" #include "driver/timer.h"
#endif #endif
#include "mbconfig.h" //#include "mbconfig.h"
#include "sdkconfig.h"
#define INLINE inline #define INLINE inline
#define PR_BEGIN_EXTERN_C extern "C" { #define PR_BEGIN_EXTERN_C extern "C" {

12
test/serial/mb_serial_master/main/master.c
View File

@ -292,11 +292,23 @@ static esp_err_t master_init(void)
return err; return err;
} }
//#include "port.h"
#include "mb_m.h"
eMBException functionHandler( UCHAR * pucFrame, USHORT * pusLength )
{
return MB_EX_GATEWAY_PATH_FAILED;
}
extern eMBErrorCode eMBRegisterCB( UCHAR ucFunctionCode, pxMBFunctionHandler pxHandler );
void app_main(void) void app_main(void)
{ {
// Initialization of device peripheral and objects // Initialization of device peripheral and objects
ESP_ERROR_CHECK(master_init()); ESP_ERROR_CHECK(master_init());
vTaskDelay(10); vTaskDelay(10);
eMBRegisterCB(10, &functionHandler);
master_operation_func(NULL); master_operation_func(NULL);
} }