Skip to content

Commit bfcc265

Browse files
committed
Added check to avoid T1S library inclusion when megaavr core is used
1 parent f7fda2b commit bfcc265

7 files changed

+16
-7
lines changed

src/ArduinoModbus.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
#include "ModbusTCPClient.h"
2727
#include "ModbusTCPServer.h"
2828

29+
#ifndef __AVR__
2930
#include "ModbusT1SClient.h"
3031
#include "ModbusT1SServer.h"
31-
32+
#endif
3233
#endif

src/ModbusT1SClient.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern "C" {
2525
}
2626

2727
#include "ModbusT1SClient.h"
28-
28+
#ifndef __AVR__
2929
/**
3030
* @class ModbusT1SClientClass
3131
* Class for Modbus T1S Client communication.
@@ -501,3 +501,4 @@ void ModbusT1SClientClass::disablePOE() {
501501
}
502502

503503
ModbusT1SClientClass ModbusT1SClient;
504+
#endif

src/ModbusT1SClient.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#ifndef _MODBUS_T1S_CLIENT_H_INCLUDED
2121
#define _MODBUS_T1S_CLIENT_H_INCLUDED
22-
22+
#ifndef __AVR__
2323
#include "ModbusClient.h"
2424
#include <ArduinoRS485.h>
2525
#include <Arduino_10BASE_T1S.h>
@@ -269,3 +269,4 @@ void disablePOE();
269269

270270
extern ModbusT1SClientClass ModbusT1SClient;
271271
#endif
272+
#endif

src/ModbusT1SCommon.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include "ModbusT1SCommon.h"
2-
2+
#ifndef __AVR__
33
INIT_TC6(SPI, CS_PIN, RESET_PIN, IRQ_PIN);
4+
#endif

src/ModbusT1SCommon.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifndef _MODBUS_T1S_COMMON_H_INCLUDED
22
#define _MODBUS_T1S_COMMON_H_INCLUDED
33

4+
#ifndef __AVR__
45
#include <Arduino_10BASE_T1S.h>
56

67
#define INIT_TC6(_SPI, _CS_PIN, _RESET_PIN, _IRQ_PIN) \
@@ -32,4 +33,5 @@ enum ModbusT1SFunctionCode {
3233
UDP_WRITE_HR_PORT
3334
};
3435

35-
#endif
36+
#endif
37+
#endif

src/ModbusT1SServer.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1818
*/
1919

20+
2021
#include <errno.h>
2122

2223
extern "C" {
@@ -25,7 +26,7 @@ extern "C" {
2526
}
2627

2728
#include "ModbusT1SServer.h"
28-
29+
#ifndef __AVR__
2930
/**
3031
* @class ModbusT1SServerClass
3132
* Class for Modbus T1S Server communication.
@@ -411,3 +412,4 @@ void ModbusT1SServerClass::setGatwayIP(IPAddress ip) {
411412
}
412413

413414
ModbusT1SServerClass ModbusT1SServer;
415+
#endif

src/ModbusT1SServer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
#ifndef _MODBUS_T1S_SERVER_H_INCLUDED
2121
#define _MODBUS_T1S_SERVER_H_INCLUDED
2222

23+
#ifndef __AVR__
2324
#include "ModbusServer.h"
2425
#include <ArduinoRS485.h>
2526
#include <Arduino_10BASE_T1S.h>
2627
#include "ModbusRTUClient.h"
2728
#include "ModbusT1SCommon.h"
2829
#include <SPI.h>
2930

30-
3131
using callback_f = void (*)(bool, bool);
3232
class ModbusT1SServerClass : public ModbusServer {
3333
public:
@@ -176,3 +176,4 @@ class ModbusT1SServerClass : public ModbusServer {
176176
extern ModbusT1SServerClass ModbusT1SServer;
177177

178178
#endif
179+
#endif

0 commit comments

Comments
 (0)