Change examples to work with new API

Author: emelianov

LICENSE.txt

@@ -1,6 +1,8 @@
 Copyright (c) 2015, Andr� Sarmento Barbosa
+              2017, Alexander Emelianov ([email protected])
 All rights reserved.
 
+
 Redistribution and use in source and binary forms, with or without modification, 
 are permitted provided that the following conditions are met:
 

README.md

@@ -63,6 +63,10 @@ This README is under development, for now, see the examples of the library.
 
 Contributions
 =============
+https://github.com/emelinov/modbus-esp8266
+[email protected]
+
+Original version:
 http://github.com/andresarmento/modbus-esp8266<br>
 prof (at) andresarmento (dot) com
 

examples/TestAnalogInput/TestAnalogInput.ino

@@ -1,12 +1,16 @@
 /*
   Modbus-Arduino Example - Test Holding Register (Modbus IP ESP8266)
   Read Analog sensor on Pin ADC (ADC input between 0 ... 1V)
+  Original library
   Copyright by André Sarmento Barbosa
   http://github.com/andresarmento/modbus-arduino
+
+  Current version
+  (c)2017 Alexander Emelianov ([email protected])
+  https://github.com/emelianov/modbus-esp8266
 */
 
 #include <ESP8266WiFi.h>
-#include <Modbus.h>
 #include <ModbusIP_ESP8266.h>
 
 //Modbus Registers Offsets (0-9999)
@@ -18,21 +22,20 @@ ModbusIP mb;
 long ts;
 
 void setup() {
-    Serial.begin(115200);
+    Serial.begin(74880);
 
-    //Config Modbus IP
-    mb.config("your_ssid", "your_password");
-  
+    WiFi.begin("your_ssid", "your_password");
     while (WiFi.status() != WL_CONNECTED) {
         delay(500);
         Serial.print(".");
     }
- 
+
     Serial.println("");
     Serial.println("WiFi connected");  
     Serial.println("IP address: ");
     Serial.println(WiFi.localIP());
 
+    mb.begin();		//Sart Modbus IP
     // Add SENSOR_IREG register - Use addIreg() for analog Inputs
     mb.addIreg(SENSOR_IREG);
 

examples/TestHoldingReg/TestHoldingReg.ino

@@ -2,12 +2,16 @@
   Modbus-Arduino Example - Test Holding Register (Modbus IP ESP8266)
   Configure Holding Register (offset 100) with initial value 0xABCD
   You can get or set this holding register
+  Original library
   Copyright by André Sarmento Barbosa
   http://github.com/andresarmento/modbus-arduino
+
+  Current version
+  (c)2017 Alexander Emelianov ([email protected])
+  https://github.com/emelianov/modbus-esp8266
 */
 
 #include <ESP8266WiFi.h>
-#include <Modbus.h>
 #include <ModbusIP_ESP8266.h>
 
 // Modbus Registers Offsets (0-9999)
@@ -18,9 +22,9 @@ const int TEST_HREG = 100;
 ModbusIP mb;
 
 void setup() {
-  Serial.begin(115200);
+  Serial.begin(74880);
 
-  mb.config("your_ssid", "your_password");
+  WiFi.begin("your_ssid", "your_password");
 
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
@@ -32,6 +36,7 @@ void setup() {
   Serial.println("IP address: ");
   Serial.println(WiFi.localIP());
 
+  mb.begin();
   mb.addHreg(TEST_HREG, 0xABCD);
 }
 

examples/TestLed/TestLed.ino

@@ -1,12 +1,16 @@
 /*
   Modbus-Arduino Example - Test Led (Modbus IP ESP8266)
   Control a Led on GPIO0 pin using Write Single Coil Modbus Function 
+  Original library
   Copyright by André Sarmento Barbosa
   http://github.com/andresarmento/modbus-arduino
+
+  Current version
+  (c)2017 Alexander Emelianov ([email protected])
+  https://github.com/emelianov/modbus-esp8266
 */
 
 #include <ESP8266WiFi.h>
-#include <Modbus.h>
 #include <ModbusIP_ESP8266.h>
 
 //Modbus Registers Offsets (0-9999)
@@ -18,9 +22,9 @@ const int ledPin = 0; //GPIO0
 ModbusIP mb;
 
 void setup() {
-  Serial.begin(115200);
+  Serial.begin(74880);
 
-  mb.config("your_ssid", "your_password");
+  WiFi.begin("your_ssid", "your_password");
 
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
@@ -32,6 +36,8 @@ void setup() {
   Serial.println("IP address: ");
   Serial.println(WiFi.localIP());
 
+  mb.begin();
+
   pinMode(ledPin, OUTPUT);
   mb.addCoil(LED_COIL);
 }

examples/TestSwitchStatus/TestSwitchStatus.ino

@@ -1,12 +1,16 @@
 /*
   Modbus-Arduino Example - Test Holding Register (Modbus IP ESP8266)
   Read Switch Status on pin GPIO0 
+  Original library
   Copyright by André Sarmento Barbosa
   http://github.com/andresarmento/modbus-arduino
+
+  Current version
+  (c)2017 Alexander Emelianov ([email protected])
+  https://github.com/emelianov/modbus-esp8266
 */
 
 #include <ESP8266WiFi.h>
-#include <Modbus.h>
 #include <ModbusIP_ESP8266.h>
 
 //Modbus Registers Offsets (0-9999)
@@ -18,8 +22,14 @@ const int switchPin = 0; //GPIO0
 ModbusIP mb;
 
 void setup() {
+
+    WiFi.begin("your_ssid", "your_password");
+    while (WiFi.status() != WL_CONNECTED) {
+      delay(500);
+      Serial.print(".");
+    }
     //Config Modbus IP
-    mb.config("your_ssid", "your_password");
+    mb.begin();
     //Set ledPin mode
     pinMode(switchPin, INPUT);
     // Add SWITCH_ISTS register - Use addIsts() for digital inputs

keywords.txt

@@ -5,7 +5,7 @@ ModbusIP	 KEYWORD1
 ModbusIP_ESP8266 KEYWORD1
 
 # Methods and Functions (KEYWORD2)
-config          KEYWORD2
+begin          KEYWORD2
 task            KEYWORD2
 
 # Constants (LITERAL1)
@@ -14,7 +14,6 @@ task            KEYWORD2
 
 # Datatypes (KEYWORD1)
 Modbus	    KEYWORD1
-u_int       KEYWORD1
 TRegister   KEYWORD1
 
 # Methods and Functions (KEYWORD2)

src/Modbus.cpp

@@ -1,6 +1,7 @@
 /*
-    Modbus.cpp - Source for Modbus Base Library
+    Modbus.h - Header for Modbus Base Library
     Copyright (C) 2014 André Sarmento Barbosa
+                  2017 Alexander Emelianov ([email protected])
 */
 #include "Modbus.h"
 
@@ -197,7 +198,7 @@ void Modbus::readRegisters(uint16_t startreg, uint16_t numregs) {
 
     //Check Address
     //*** See comments on readCoils method.
-    if (!this->searchRegister(startreg + 40001)) {
+    if (!this->searchRegister(startreg + HREG_BASE)) {
         this->exceptionResponse(MB_FC_READ_REGS, MB_EX_ILLEGAL_ADDRESS);
         return;
     }
@@ -261,7 +262,7 @@ void Modbus::writeMultipleRegisters(byte* frame,uint16_t startreg, uint16_t numo
 
     //Check Address (startreg...startreg + numregs)
     for (int k = 0; k < numoutputs; k++) {
-        if (!this->searchRegister(startreg + 40001 + k)) {
+        if (!this->searchRegister(startreg + HREG_BASE + k)) {
             this->exceptionResponse(MB_FC_WRITE_REGS, MB_EX_ILLEGAL_ADDRESS);
             return;
         }

src/Modbus.h

@@ -1,6 +1,7 @@
 /*
     Modbus.h - Header for Modbus Base Library
     Copyright (C) 2014 André Sarmento Barbosa
+                  2017 Alexander Emelianov ([email protected])
 */
 #include "Arduino.h"
 

src/ModbusIP_ESP8266.cpp

@@ -1,6 +1,7 @@
 /*
-    ModbusIP_ESP8266.cpp - Source for Modbus IP ESP8266 Library
-    Copyright (C) 2015 André Sarmento Barbosa
+    Modbus.h - Header for Modbus Base Library
+    Copyright (C) 2014 André Sarmento Barbosa
+                  2017 Alexander Emelianov ([email protected])
 */
 #include "ModbusIP_ESP8266.h"