Incorporate API feedback from Tom, fixes for Modbus Server

Author: sandeepmistry

examples/RTU/ModbusRTUClientToggle/ModbusRTUClientToggle.ino

@@ -36,7 +36,7 @@ void setup() {
 
 void loop() {
   // for (slave) id 1: write the value of 0x01, to the coil at address 0x00 
-  if (!ModbusRTUClient.writeCoil(1, 0x00, 0x01)) {
+  if (!ModbusRTUClient.coilWrite(1, 0x00, 0x01)) {
     Serial.print("Failed to write coil! ");
     Serial.println(ModbusRTUClient.lastError());
   }
@@ -45,7 +45,7 @@ void loop() {
   delay(1000);
 
   // for (slave) id 1: write the value of 0x00, to the coil at address 0x00 
-  if (!ModbusRTUClient.writeCoil(1, 0x00, 0x00)) {
+  if (!ModbusRTUClient.coilWrite(1, 0x00, 0x00)) {
     Serial.print("Failed to write coil! ");
     Serial.println(ModbusRTUClient.lastError());
   }

examples/RTU/ModbusRTUServerLED/ModbusRTUServerLED.ino

@@ -28,7 +28,7 @@ void setup() {
 
   Serial.println("Modbus RTU Server LED");
 
-  // start the Modbus RTU server
+  // start the Modbus RTU server, with (slave) id 1
   if (!ModbusRTUServer.begin(1, 9600)) {
     Serial.println("Failed to start Modbus RTU Server!");
     while (1);
@@ -47,7 +47,7 @@ void loop() {
   ModbusRTUServer.poll();
 
   // read the current value of the coil
-  int coilValue = ModbusRTUServer.readCoil(0x00);
+  int coilValue = ModbusRTUServer.coilRead(0x00);
 
   if (coilValue) {
     // coil value set, turn LED on

examples/TCP/WiFiModbusClientToggle/WiFiModbusClientToggle.ino

@@ -69,7 +69,7 @@ void loop() {
     // client connected
 
     // write the value of 0x01, to the coil at address 0x00
-    if (!modbusTCPClient.writeCoil(0x00, 0x01)) {
+    if (!modbusTCPClient.coilWrite(0x00, 0x01)) {
       Serial.print("Failed to write coil! ");
       Serial.println(modbusTCPClient.lastError());
     }
@@ -78,7 +78,7 @@ void loop() {
     delay(1000);
 
     // write the value of 0x00, to the coil at address 0x00
-    if (!modbusTCPClient.writeCoil(0x00, 0x00)) {
+    if (!modbusTCPClient.coilWrite(0x00, 0x00)) {
       Serial.print("Failed to write coil! ");
       Serial.println(modbusTCPClient.lastError());
     }

examples/TCP/WiFiModbusServerLED/WiFiModbusServerLED.ino

@@ -97,7 +97,7 @@ void loop() {
 
 void updateLED() {
   // read the current value of the coil
-  int coilValue = modbusTCPServer.readCoil(0x00);
+  int coilValue = modbusTCPServer.coilRead(0x00);
 
   if (coilValue) {
     // coil value set, turn LED on

keywords.txt

@@ -20,31 +20,34 @@ begin	KEYWORD2
 poll	KEYWORD2
 end	KEYWORD2
 
-readCoil	KEYWORD2
-readCoils	KEYWORD2
-readDiscreteInput	KEYWORD2
-readDiscreteInputs	KEYWORD2
-readHoldingRegister	KEYWORD2
-readHoldingRegisters	KEYWORD2
-readInputRegister	KEYWORD2
-readInputRegisters	KEYWORD2
-writeCoil	KEYWORD2
-writeCoils	KEYWORD2
-writeHoldingRegister	KEYWORD2
-writeHoldingRegisters	KEYWORD2
-maskWriteRegister	KEYWORD2
-writeAndReadRegisters	KEYWORD2
+beginTransmission	KEYWORD2
+write	KEYWORD2
+endTransmission	KEYWORD2
+requestFrom	KEYWORD2
+available	KEYWORD2
+read	KEYWORD2
+
+coilRead	KEYWORD2
+discreteInputRead	KEYWORD2
+holdingRegisterRead	KEYWORD2
+inputRegisterRead	KEYWORD2
+coilWrite	KEYWORD2
+holdingRegisterWrite	KEYWORD2
+registerMaskWrite	KEYWORD2
 lastError	KEYWORD2
 
 configureCoils	KEYWORD2
 configureDiscreteInputs	KEYWORD2
 configureHoldingRegisters	KEYWORD2
 configureInputRegisters	KEYWORD2
-writeDiscreteInput	KEYWORD2
-writeDiscreteInputs	KEYWORD2
-writeInputRegister	KEYWORD2
-writeInputRegisters	KEYWORD2
+discreteInputWrite	KEYWORD2
+inputRegisterWrite	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
 #######################################
+
+COILS	LITERAL1
+DISCRETE_INPUTS	LITERAL1
+HOLIDING_REGISTERS	LITERAL1
+INPUT_REGISTERS	LITERAL1