Skip to content

Commit f903d0a

Browse files
committed
update serial config parm
1 parent 8938bea commit f903d0a

7 files changed

+12
-11
lines changed

src/ModbusRTUClient.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ModbusRTUClientClass::~ModbusRTUClientClass()
4040
{
4141
}
4242

43-
int ModbusRTUClientClass::begin(unsigned long baudrate, uint16_t config)
43+
int ModbusRTUClientClass::begin(unsigned long baudrate, uint32_t config)
4444
{
4545
modbus_t* mb = modbus_new_rtu(_rs485, baudrate, config);
4646

@@ -51,7 +51,7 @@ int ModbusRTUClientClass::begin(unsigned long baudrate, uint16_t config)
5151
return 1;
5252
}
5353

54-
int ModbusRTUClientClass::begin(RS485Class& rs485, unsigned long baudrate, uint16_t config)
54+
int ModbusRTUClientClass::begin(RS485Class& rs485, unsigned long baudrate, uint32_t config)
5555
{
5656
_rs485 = &rs485;
5757
return begin(baudrate, config);

src/ModbusRTUClient.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#define _MODBUS_RTU_CLIENT_H_INCLUDED
2222

2323
#include "ModbusClient.h"
24+
#include <Arduino.h>
2425
#include <ArduinoRS485.h>
2526

2627
class ModbusRTUClientClass : public ModbusClient {
@@ -37,8 +38,8 @@ class ModbusRTUClientClass : public ModbusClient {
3738
*
3839
* Return 1 on success, 0 on failure
3940
*/
40-
int begin(unsigned long baudrate, uint16_t config = SERIAL_8N1);
41-
int begin(RS485Class& rs485, unsigned long baudrate, uint16_t config = SERIAL_8N1);
41+
int begin(unsigned long baudrate, uint32_t config = SERIAL_8N1);
42+
int begin(RS485Class& rs485, unsigned long baudrate, uint32_t config = SERIAL_8N1);
4243

4344
private:
4445
RS485Class* _rs485 = &RS485;

src/ModbusRTUServer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ModbusRTUServerClass::~ModbusRTUServerClass()
3838
{
3939
}
4040

41-
int ModbusRTUServerClass::begin(int id, unsigned long baudrate, uint16_t config)
41+
int ModbusRTUServerClass::begin(int id, unsigned long baudrate, uint32_t config)
4242
{
4343
modbus_t* mb = modbus_new_rtu(_rs485, baudrate, config);
4444

@@ -51,7 +51,7 @@ int ModbusRTUServerClass::begin(int id, unsigned long baudrate, uint16_t config)
5151
return 1;
5252
}
5353

54-
int ModbusRTUServerClass::begin(RS485Class& rs485, int id, unsigned long baudrate, uint16_t config)
54+
int ModbusRTUServerClass::begin(RS485Class& rs485, int id, unsigned long baudrate, uint32_t config)
5555
{
5656
_rs485 = &rs485;
5757
return begin(id, baudrate, config);

src/ModbusRTUServer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class ModbusRTUServerClass : public ModbusServer {
3838
*
3939
* Return 1 on success, 0 on failure
4040
*/
41-
int begin(int id, unsigned long baudrate, uint16_t config = SERIAL_8N1);
42-
int begin(RS485Class& rs485, int id, unsigned long baudrate, uint16_t config = SERIAL_8N1);
41+
int begin(int id, unsigned long baudrate, uint32_t config = SERIAL_8N1);
42+
int begin(RS485Class& rs485, int id, unsigned long baudrate, uint32_t config = SERIAL_8N1);
4343

4444
/**
4545
* Poll interface for requests

src/libmodbus/modbus-rtu-private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct win32_ser {
4848
typedef struct _modbus_rtu {
4949
#if defined(ARDUINO)
5050
unsigned long baud;
51-
uint16_t config;
51+
uint32_t config;
5252
RS485Class* rs485;
5353
#else
5454
/* Device: "/dev/ttyS0", "/dev/ttyUSB0" or "/dev/tty.USA19*" on Mac OS X. */

src/libmodbus/modbus-rtu.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ const modbus_backend_t _modbus_rtu_backend = {
13301330
};
13311331

13321332
#ifdef ARDUINO
1333-
modbus_t* modbus_new_rtu(RS485Class *rs485, unsigned long baud, uint16_t config)
1333+
modbus_t* modbus_new_rtu(RS485Class *rs485, unsigned long baud, uint32_t config)
13341334
#else
13351335
modbus_t* modbus_new_rtu(const char *device,
13361336
int baud, char parity, int data_bit,

src/libmodbus/modbus-rtu.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MODBUS_BEGIN_DECLS
1919

2020
#ifdef ARDUINO
2121
class RS485Class;
22-
MODBUS_API modbus_t* modbus_new_rtu(RS485Class *rs485, unsigned long baud, uint16_t config);
22+
MODBUS_API modbus_t* modbus_new_rtu(RS485Class *rs485, unsigned long baud, uint32_t config);
2323
#else
2424
MODBUS_API modbus_t* modbus_new_rtu(const char *device, int baud, char parity,
2525
int data_bit, int stop_bit);

0 commit comments

Comments
 (0)