Skip to content

Support non ESP devices #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 17, 2020
Merged

Support non ESP devices #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
033e9d1
may handover baudrate to begin serial communication, use baudRate() o…
brainelectronics Apr 26, 2020
2e4c685
include ModbusIP_ESP8266 only if board is ESP32 or ESP8266
brainelectronics Apr 26, 2020
309b5f1
setBaudrate function added, fixed PR remarks
brainelectronics May 13, 2020
99d2864
fixed begin function in header
brainelectronics May 13, 2020
4bd61ee
small fix for setBaudrate function
brainelectronics May 13, 2020
218f331
updated RTU examples for ESP32, ESP8266, STM32F103
brainelectronics May 13, 2020
5c3c839
Merge branch '3.0.1' into feature/support-non-esp-devices
emelianov May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
include ModbusIP_ESP8266 only if board is ESP32 or ESP8266
  • Loading branch information
@brainelectronics
brainelectronics committed Apr 26, 2020
commit 2e4c68572f8079ded1e2f32a061c60350c2ecbb2
6 changes: 5 additions & 1 deletion src/ModbusIP_ESP8266.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
Copyright (C) 2014 Andr� Sarmento Barbosa
2017-2019 Alexander Emelianov ([email protected])
*/
#if defined(ESP32) || defined(ESP8266)

#include "ModbusIP_ESP8266.h"

ModbusIP::ModbusIP() {
Expand Down Expand Up @@ -423,4 +425,6 @@ ModbusIP::~ModbusIP() {
delete client[i];
client[i] = nullptr;
}
}
}

#endif
6 changes: 5 additions & 1 deletion src/ModbusIP_ESP8266.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/
#pragma once

#if defined(ESP32) || defined(ESP8266)

#include <Modbus.h>
#ifdef ESP8266
#include <ESP8266WiFi.h>
Expand Down Expand Up @@ -123,4 +125,6 @@ class ModbusIP : public Modbus {
uint16_t writeOffset, uint16_t* value, uint16_t numregs = 1,
cbTransaction cb = nullptr, uint8_t unit = MODBUSIP_UNIT);
*/
};
};

#endif