Modified the examples to show the new API

Author: Rocketct

examples/RTU/ModbusRTUClientMD02TemperatureHumiditySensor/ModbusRTUClientMD02TemperatureHumiditySensor.ino

@@ -56,7 +56,7 @@ void loop()
   if (ModbusRTUClient.available())
   {
     int16_t const temperature_raw = ModbusRTUClient.read();
-    float const temperature_deg = temperature_raw / 100.f;
+    float const temperature_deg = temperature_raw / 10.f;
     Serial.println(temperature_deg);
   }
 
@@ -68,7 +68,7 @@ void loop()
   if (ModbusRTUClient.available())
   {
     int16_t const humidity_raw = ModbusRTUClient.read();
-    float const humidity_per_cent = humidity_raw / 100.f;
+    float const humidity_per_cent = humidity_raw / 10.f;
     Serial.println(humidity_per_cent);
   }
 

examples/T1S/ModbusT1SClient/ModbusT1SClient.ino

@@ -21,7 +21,7 @@ static uint16_t const UDP_CLIENT_PORT = 8888;
 void setup() {
  Serial.begin(115200);
 
-  ModbusT1SClient.setT1SClient(&udp_client);
+  ModbusT1SClient.setT1SClient(udp_client);
   ModbusT1SClient.setT1SPort(UDP_CLIENT_PORT);
   ModbusT1SClient.setServerPort(UDP_SERVER_PORT);
   ModbusT1SClient.setModbusId(MODBUS_ID);
@@ -34,7 +34,7 @@ void setup() {
 }
 
 void loop() {
-  ModbusT1SClient.checkPLCAStatus();
+  ModbusT1SClient.update();
 
   int res = ModbusT1SClient.coilRead(0x00);
   if (res == -1) {

examples/T1S/ModbusT1SClientTemperatureHumiditySensor/ModbusT1SClientTemperatureHumiditySensor.ino

@@ -21,7 +21,7 @@ Arduino_10BASE_T1S_UDP udp_client;
 void setup() {
   Serial.begin(115200);
 
-  ModbusT1SClient.setT1SClient(&udp_client);
+  ModbusT1SClient.setT1SClient(udp_client);
   ModbusT1SClient.setT1SPort(UDP_CLIENT_PORT);
   ModbusT1SClient.setServerPort(UDP_SERVER_PORT);
   ModbusT1SClient.setCallback(OnPlcaStatus);
@@ -30,11 +30,12 @@ void setup() {
     Serial.println("Failed to start Modbus T1S Client!");
     while (1);
   }
+  ModbusT1SClient.disablePOE();
 }
 
 unsigned long start = 0;
 void loop() {
-  ModbusT1SClient.checkPLCAStatus();
+  ModbusT1SClient.update();
 
   if ((millis() - start) > 1000)
   {

examples/T1S/ModbusT1SServer/ModbusT1SServer.ino

@@ -13,6 +13,8 @@
 #include <ArduinoRS485.h>
 #include <ArduinoModbus.h>
 
+RS485Class serial485(RS485_SERIAL, RS485_TX_PIN, RS485_DE_PIN, RS485_RE_PIN);
+
 static uint8_t const T1S_PLCA_NODE_ID = 0;
 static uint16_t const UDP_SERVER_PORT = 8889;
 
@@ -21,15 +23,15 @@ Arduino_10BASE_T1S_UDP udp_server;
 void setup() {
   Serial.begin(115200);
 
-  ModbusT1SServer.setT1SServer(&udp_server);
+  ModbusT1SServer.setT1SServer(udp_server);
   ModbusT1SServer.setT1SPort(UDP_SERVER_PORT);
-  ModbusT1SServer.setBadrate(9600);
   ModbusT1SServer.setCallback(OnPlcaStatus);
 
-  if (!ModbusT1SServer.begin(T1S_PLCA_NODE_ID)) {
+  if (!ModbusT1SServer.begin(T1S_PLCA_NODE_ID, 9600, SERIAL_8N1, serial485)) {
     Serial.println("Failed to start Modbus T1S Server!");
     while (1);
   }
+  ModbusT1SServer.disablePOE();
 }
 
 void loop() {

examples/T1S/ModbusT1SServerTemperatureHumiditySensor/ModbusT1SServerTemperatureHumiditySensor.ino

@@ -1,6 +1,6 @@
 /*
   This file is part of the ArduinoModbus library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
+  Copyright (c) 2024 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -28,10 +28,8 @@
 #include "ModbusT1SCommon.h"
 #include <SPI.h>
 
-
-
 #define RX_TIMEOUT 1000
-static void OnPlcaStatus_client(bool success, bool plcaStatus);
+
 using callback_f = void (*)(bool, bool);
 class ModbusT1SClientClass : public ModbusClient {
 public:
@@ -47,8 +45,6 @@ class ModbusT1SClientClass : public ModbusClient {
    *
    * Return 1 on success, 0 on failure
    */
-  int begin(unsigned long baudrate, uint16_t config = SERIAL_8N1);
-  int begin(RS485Class& rs485, unsigned long baudrate, uint16_t config = SERIAL_8N1);
   int begin(int node_id);
 /**
  * Sets the IP address of the Modbus server.
@@ -88,7 +84,7 @@ void setModbusId(uint16_t id);
  * @param port The port number of the Modbus server. Default is 0.
  * @return int The status of the coil (1 for ON, 0 for OFF) or -1 if an error occurs.
  */
-int coilRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int coilRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Reads the status of a coil from the Modbus server with a specified ID.
@@ -102,7 +98,7 @@ int coilRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port =
  * @param port The port number of the Modbus server. Default is 0.
  * @return int The status of the coil (1 for ON, 0 for OFF) or -1 if an error occurs.
  */
-int coilRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int coilRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Writes a value to a coil on the Modbus server.
@@ -116,7 +112,7 @@ int coilRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr, int
  * @param port The port number of the Modbus server. Default is 0.
  * @return int Returns 1 if the write operation is successful, 0 otherwise.
  */
-int coilWrite(int address, uint8_t value, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int coilWrite(int address, uint16_t value, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Writes a value to a coil on the Modbus server with a specified ID.
@@ -131,7 +127,7 @@ int coilWrite(int address, uint8_t value, Arduino_10BASE_T1S_UDP * client = null
  * @param port The port number of the Modbus server. Default is 0.
  * @return int Returns 1 if the write operation is successful, 0 otherwise.
  */
-int coilWrite(int id, int address, uint8_t value, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int coilWrite(int id, int address, uint16_t value, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Reads the status of a discrete input from the Modbus server.
@@ -144,7 +140,7 @@ int coilWrite(int id, int address, uint8_t value, Arduino_10BASE_T1S_UDP * clien
  * @param port The port number of the Modbus server. Default is 0.
  * @return int The status of the discrete input (1 for ON, 0 for OFF) or -1 if an error occurs.
  */
-int discreteInputRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int discreteInputRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Reads the status of a discrete input from the Modbus server with a specified ID.
@@ -158,7 +154,7 @@ int discreteInputRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr, in
  * @param port The port number of the Modbus server. Default is 0.
  * @return int The status of the discrete input (1 for ON, 0 for OFF) or -1 if an error occurs.
  */
-int discreteInputRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int discreteInputRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Reads the value of an input register from the Modbus server.
@@ -171,7 +167,7 @@ int discreteInputRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nul
  * @param port The port number of the Modbus server. Default is 0.
  * @return long The value of the input register or -1 if an error occurs.
  */
-long inputRegisterRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+long inputRegisterRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Reads the value of an input register from the Modbus server with a specified ID.
@@ -185,7 +181,7 @@ long inputRegisterRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr, i
  * @param port The port number of the Modbus server. Default is 0.
  * @return long The value of the input register or -1 if an error occurs.
  */
-long inputRegisterRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+long inputRegisterRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Writes a value to a holding register on the Modbus server.
@@ -199,7 +195,7 @@ long inputRegisterRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nu
  * @param port The port number of the Modbus server. Default is 0.
  * @return int Returns 1 if the write operation is successful, 0 otherwise.
  */
-int holdingRegisterWrite(int address, uint16_t value, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int holdingRegisterWrite(int address, uint16_t value, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Writes a value to a holding register on the Modbus server with a specified ID.
@@ -214,7 +210,7 @@ int holdingRegisterWrite(int address, uint16_t value, Arduino_10BASE_T1S_UDP * c
  * @param port The port number of the Modbus server. Default is 0.
  * @return int Returns 1 if the write operation is successful, 0 otherwise.
  */
-int holdingRegisterWrite(int id, int address, uint16_t value, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+int holdingRegisterWrite(int id, int address, uint16_t value, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Reads the value of a holding register from the Modbus server.
@@ -227,7 +223,7 @@ int holdingRegisterWrite(int id, int address, uint16_t value, Arduino_10BASE_T1S
  * @param port The port number of the Modbus server. Default is 0.
  * @return long The value of the holding register or -1 if an error occurs.
  */
-long holdingRegisterRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
+long holdingRegisterRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr);
 
 /**
  * Reads the value of a holding register from the Modbus server with a specified ID.
@@ -241,27 +237,32 @@ long holdingRegisterRead(int address, Arduino_10BASE_T1S_UDP * client = nullptr,
  * @param port The port number of the Modbus server. Default is 0.
  * @return long The value of the holding register or -1 if an error occurs.
  */
-long holdingRegisterRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr, int port = -1);
-void setT1SClient(Arduino_10BASE_T1S_UDP * client = nullptr);
+long holdingRegisterRead(int id, int address, Arduino_10BASE_T1S_UDP * client = nullptr);
+void setT1SClient(Arduino_10BASE_T1S_UDP & client);
 void setRxTimeout(unsigned long timeout = RX_TIMEOUT);
 void setT1SPort(int port = 8889);
-void checkPLCAStatus();
+void update();
 void setCallback(callback_f cb = nullptr);
+void enablePOE();
+void disablePOE();
 
 
 private:
-  callback_f callback = nullptr;
+  long receive(int id, int address, Arduino_10BASE_T1S_UDP * client, int functionCode);
+  int  send(int id, int address, uint16_t value, Arduino_10BASE_T1S_UDP * client, int functionCode);
   void write(uint8_t * buf, int len, Arduino_10BASE_T1S_UDP * client);
   int read(Arduino_10BASE_T1S_UDP * client);
   bool checkPacket(int port, uint16_t id, uint16_t address);
 
 private:
-
+  IPAddress _gateway = IPAddress(0, 0, 0, 0);
   unsigned long _rx_timeout = RX_TIMEOUT;
+  callback_f callback = nullptr;
   IPAddress _server_ip = IPAddress(0, 0, 0, 0);
-  std::vector<uint8_t> udp_rx_buf;
   uint16_t _server_port = 8889;
   uint16_t _modbus_id = 0;
+  uint8_t udp_rx_buf[8] = {0};
+
   RS485Class* _rs485 = &RS485;
   Arduino_10BASE_T1S_UDP * _client = nullptr;
   int _node_id = 1;