Fixed headers inclusion to compile with all architectures

Author: Rocketct

src/ModbusT1SClient.cpp

@@ -16,8 +16,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
- 
-#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
+
 #include <errno.h>
 
 extern "C" {
@@ -502,4 +501,3 @@ void ModbusT1SClientClass::disablePOE() {
 }
 
 ModbusT1SClientClass ModbusT1SClient;
-#endif

src/ModbusT1SClient.h

@@ -19,8 +19,6 @@
 
 #ifndef _MODBUS_T1S_CLIENT_H_INCLUDED
 #define _MODBUS_T1S_CLIENT_H_INCLUDED
-#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
-
 
 #include "ModbusClient.h"
 #include <ArduinoRS485.h>
@@ -271,4 +269,3 @@ void disablePOE();
 
 extern ModbusT1SClientClass ModbusT1SClient;
 #endif
-#endif

src/ModbusT1SCommon.cpp

@@ -1,4 +1,3 @@
 #include "ModbusT1SCommon.h"
-#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
+
 INIT_TC6(SPI, CS_PIN, RESET_PIN, IRQ_PIN);
-#endif

src/ModbusT1SServer.cpp

@@ -16,7 +16,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
+
 #include <errno.h>
 
 extern "C" {
@@ -388,14 +388,10 @@ static void default_OnPlcaStatus(bool success, bool plcaStatus)
 {
   if (!success)
   {
-    Serial.println("PLCA status register read failed");
     return;
   }
 
-  if (plcaStatus) {
-    Serial.println("PLCA Mode active");
-  } else {
-    Serial.println("CSMA/CD fallback");
+  if (!plcaStatus) {
     tc6_inst->enablePlca();
   }
 }
@@ -415,4 +411,3 @@ void ModbusT1SServerClass::setGatwayIP(IPAddress ip) {
 }
 
 ModbusT1SServerClass ModbusT1SServer;
-#endif

src/ModbusT1SServer.h

@@ -19,7 +19,6 @@
 
 #ifndef _MODBUS_T1S_SERVER_H_INCLUDED
 #define _MODBUS_T1S_SERVER_H_INCLUDED
-#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
 
 #include "ModbusServer.h"
 #include <ArduinoRS485.h>
@@ -28,8 +27,7 @@
 #include "ModbusT1SCommon.h"
 #include <SPI.h>
 
-  
-static void OnPlcaStatus_server(bool success, bool plcaStatus);
+
 using callback_f = void (*)(bool, bool);
 class ModbusT1SServerClass : public ModbusServer {
 public:
@@ -178,4 +176,3 @@ class ModbusT1SServerClass : public ModbusServer {
 extern ModbusT1SServerClass ModbusT1SServer;
 
 #endif
-#endif

src/libmodbus/modbus-private.h

@@ -10,7 +10,7 @@
 
 #ifndef _MSC_VER
 # include <stdint.h>
-#if defined(ARDUINO) && (defined(__AVR__) || (ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
+#if defined(ARDUINO) && (defined(__AVR__) || defined(ARDUINO_ARCH_RENESAS))
 #define ssize_t unsigned long
 
 #define fd_set void*