Directly set standard-conforming RTU delays inside Modbus library.

arduino-libraries · Oct 31, 2024 · f6f9127 · f6f9127
1 parent 760b1e3
commit f6f9127
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/examples/RTU/ModbusRTUClientParameters/ModbusRTUClientParameters.ino b/examples/RTU/ModbusRTUClientParameters/ModbusRTUClientParameters.ino
@@ -22,8 +22,6 @@ void setup() {
 
   Serial.println("Modbus RTU Client Toggle w/ Parameters");
 
-  RS485.setDelays(ModbusRTUDelay::preDelay(baudrate), ModbusRTUDelay::postDelay(baudrate));
-
   // start the Modbus RTU client in 8E1 mode
   if (!ModbusRTUClient.begin(baudrate, SERIAL_8E1)) {
     Serial.println("Failed to start Modbus RTU Client!");

diff --git a/src/ArduinoModbus.h b/src/ArduinoModbus.h
@@ -20,7 +20,6 @@
 #ifndef _ARDUINO_MODBUS_H_INCLUDED
 #define _ARDUINO_MODBUS_H_INCLUDED
 
-#include "ModbusRTUDelay.h"
 #include "ModbusRTUClient.h"
 #include "ModbusRTUServer.h"
 

diff --git a/src/ModbusRTUClient.cpp b/src/ModbusRTUClient.cpp
@@ -26,6 +26,8 @@ extern "C" {
 
 #include "ModbusRTUClient.h"
 
+#include "ModbusRTUDelay.h"
+
 ModbusRTUClientClass::ModbusRTUClientClass() :
   ModbusClient(1000)
 {
@@ -42,6 +44,8 @@ ModbusRTUClientClass::~ModbusRTUClientClass()
 
 int ModbusRTUClientClass::begin(unsigned long baudrate, uint16_t config)
 {
+  _rs485->setDelays(ModbusRTUDelay::preDelay(baudrate), ModbusRTUDelay::postDelay(baudrate));
+
   modbus_t* mb = modbus_new_rtu(_rs485, baudrate, config);
 
   if (!ModbusClient::begin(mb, 0x00)) {

diff --git a/src/ModbusRTUServer.cpp b/src/ModbusRTUServer.cpp
@@ -26,6 +26,9 @@ extern "C" {
 
 #include "ModbusRTUServer.h"
 
+#include "ModbusRTUDelay.h"
+
+
 ModbusRTUServerClass::ModbusRTUServerClass()
 {
 }
@@ -40,6 +43,8 @@ ModbusRTUServerClass::~ModbusRTUServerClass()
 
 int ModbusRTUServerClass::begin(int id, unsigned long baudrate, uint16_t config)
 {
+  _rs485->setDelays(ModbusRTUDelay::preDelay(baudrate), ModbusRTUDelay::postDelay(baudrate));
+
   modbus_t* mb = modbus_new_rtu(_rs485, baudrate, config);
 
   if (!ModbusServer::begin(mb, id)) {