Misc

Author: emelianov

.gitmodules

@@ -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:
 

LICENSE.txt

@@ -1,7 +1,6 @@
-Modbus Library for ESP8266
-==========================
+# Modbus Library for ESP8266/ESP32
 
-This library allows your ESP8266 to communicate via Modbus protocol. The Modbus is a master-slave protocol
+This library allows your ESP8266/ESP32 to communicate via Modbus protocol. The Modbus is a master-slave protocol
 used in industrial automation and can be used in other areas, such as home automation.
 
 The Modbus generally uses serial RS-232 or RS-485 as physical layer (then called Modbus Serial) and TCP/IP via Ethernet or WiFi (Modbus IP).
@@ -11,12 +10,13 @@ In the current version the library allows the ESP8266 operate as a slave, suppor
 http://pt.wikipedia.org/wiki/Modbus http://www.modbus.org/docs/Modbus_Application_Protocol_V1_1b.pdf
 http://www.modbus.org/docs/Modbus_Messaging_Implementation_Guide_V1_0b.pdf
 
-Features
-========
+## Features
+
+Keep alive and ESP32 support added to original library. This features is under testing.
 
 <ul>
 <li>Operates as a slave</li>
-<li>Supports Modbus IP (TCP, not keep-alive)</li>
+<li>Supports Modbus IP (TCP)</li>
 <li>Reply exception messages for all supported functions</li>
 <li>Modbus functions supported:</li>
 <ul>
@@ -33,7 +33,7 @@ Features
 
 <b>Notes:</b>
 
-1. When using Modbus IP the transport protocol is TCP (port 502) and the connection is terminated to each transmitted message, that is, is not a keep-alive type connection.
+1. When using Modbus IP the transport protocol is TCP (port 502).
 
 2. The offsets for registers are 0-based. So be careful when setting your supervisory system or your testing software. For example, in ScadaBR (http://www.scadabr.com.br)
 offsets are 0-based, then, a register configured as 100 in the library is set to 100 in ScadaBR. On the other hand, in the CAS Modbus Scanner
@@ -54,19 +54,23 @@ Thus, only the following functions are supported:
 </ul>
 
 
-How to
-======
+## How to
 
 ```
 This README is under development, for now, see the examples of the library.
 ```
 
-Contributions
-=============
+## Contributions
+
+https://github.com/emelinov/modbus-esp8266
+
+[email protected]
+
+Original version:
 http://github.com/andresarmento/modbus-esp8266<br>
 prof (at) andresarmento (dot) com
 
-License
-=======
+## License
+
 The code in this repo is licensed under the BSD New License. See LICENSE.txt for more info.
 

README.md

@@ -1,12 +1,20 @@
 /*
   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>
+#ifdef ESP8266
+ #include <ESP8266WiFi.h>
+#else
+ #include <WiFi.h>
+#endif
 #include <ModbusIP_ESP8266.h>
 
 //Modbus Registers Offsets (0-9999)
@@ -18,21 +26,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);
 

TODO.txt

@@ -2,12 +2,20 @@
   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>
+#ifdef ESP8266
+ #include <ESP8266WiFi.h>
+#else
+ #include <WiFi.h>
+#endif
 #include <ModbusIP_ESP8266.h>
 
 // Modbus Registers Offsets (0-9999)
@@ -18,9 +26,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 +40,7 @@ void setup() {
   Serial.println("IP address: ");
   Serial.println(WiFi.localIP());
 
+  mb.begin();
   mb.addHreg(TEST_HREG, 0xABCD);
 }
 

examples/TestAnalogInput/TestAnalogInput.ino

@@ -1,12 +1,20 @@
 /*
   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>
+#ifdef ESP8266
+ #include <ESP8266WiFi.h>
+#else
+ #include <WiFi.h>
+#endif
 #include <ModbusIP_ESP8266.h>
 
 //Modbus Registers Offsets (0-9999)
@@ -18,9 +26,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 +40,8 @@ void setup() {
   Serial.println("IP address: ");
   Serial.println(WiFi.localIP());
 
+  mb.begin();
+
   pinMode(ledPin, OUTPUT);
   mb.addCoil(LED_COIL);
 }

examples/TestHoldingReg/TestHoldingReg.ino

@@ -1,12 +1,20 @@
 /*
   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>
+#ifdef ESP8266
+ #include <ESP8266WiFi.h>
+#else
+ #include <WiFi.h>
+#endif
 #include <ModbusIP_ESP8266.h>
 
 //Modbus Registers Offsets (0-9999)
@@ -18,8 +26,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

examples/TestLed/TestLed.ino

@@ -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)

examples/TestSwitchStatus/TestSwitchStatus.ino

@@ -6,4 +6,4 @@ sentence=Modbus Library for ESP8266
 paragraph=This library allows your ESP8266 to communicate via Modbus protocol. The Modbus is a master-slave protocol used in industrial automation and can be used in other areas, such as home automation.
 category=Communication
 url=https://github.com/emelianov/modbus-esp8266
-architectures=esp8266
+architectures=esp8266,esp32