Moved common structure in common file

arduino-libraries · Nov 14, 2024 · 98eb594 · 98eb594
1 parent 3818090
commit 98eb594
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/ModbusT1SCommon.cpp b/src/ModbusT1SCommon.cpp
@@ -0,0 +1,4 @@
+#include "ModbusT1SCommon.h"
+#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
+INIT_TC6(SPI, CS_PIN, RESET_PIN, IRQ_PIN);
+#endif
diff --git a/src/ModbusT1SCommon.h b/src/ModbusT1SCommon.h
@@ -1,8 +1,28 @@
 #ifndef _MODBUS_T1S_COMMON_H_INCLUDED
 #define _MODBUS_T1S_COMMON_H_INCLUDED
-#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
+
 #include <Arduino_10BASE_T1S.h>
 
+#define INIT_TC6(_SPI, _CS_PIN, _RESET_PIN, _IRQ_PIN) \
+  TC6::TC6_Io* tc6_io = new TC6::TC6_Io \
+  ( _SPI \
+    , _CS_PIN \
+    , _RESET_PIN \
+    , _IRQ_PIN); \
+  TC6::TC6_Arduino_10BASE_T1S* tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
+
+extern TC6::TC6_Arduino_10BASE_T1S* tc6_inst;
+extern TC6::TC6_Io* tc6_io;
+static void default_OnPlcaStatus(bool success, bool plcaStatus);
+
+#if (defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA))
+#define RS485_SERIAL Serial1
+#define RS485_TX_PIN 1
+#define RS485_RX_PIN 0
+#define RS485_DE_PIN 8
+#define RS485_RE_PIN 7
+#endif
+
 enum ModbusT1SFunctionCode {
   UDP_READ_COIL_PORT = 1,
   UDP_WRITE_COIL_PORT,
@@ -12,11 +32,4 @@ enum ModbusT1SFunctionCode {
   UDP_WRITE_HR_PORT
 };
 
-auto const tc6_io = new TC6::TC6_Io
-( SPI
-  , CS_PIN
-  , RESET_PIN
-  , IRQ_PIN);
-auto const tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
-#endif
 #endif