Add back preprocessor ifs

To avoid usage of (sometimes) unneeded libraries, but also to hopefully help supporting more boards.

Author: mirh

Modules/Nano/RCnano/CheckShield.ino

@@ -1,4 +1,4 @@
-
+#if SupportEthernet == 1
 // uses SPI.h 
 // use 'if(ShieldFound())' before 'ether.begin(sizeof Ethernet::buffer, LocalMac, selectPin);' to prevent hang
 
@@ -65,4 +65,4 @@ static byte readOp(byte op, byte address) {
     disableChip();
     return result;
 }
-
+#endif

Modules/Nano/RCnano/RCnano.ino

@@ -1,19 +1,9 @@
-#include <Adafruit_MCP23008.h>
-#include <Adafruit_MCP23X08.h>
-#include <Adafruit_MCP23X17.h>
-#include <Adafruit_MCP23XXX.h>
 #include <Wire.h>
 #include <EEPROM.h>
 
-#include <Adafruit_BusIO_Register.h>
-#include <Adafruit_I2CDevice.h>
-#include <Adafruit_I2CRegister.h>
-#include <Adafruit_SPIDevice.h>
-
-#include <SPI.h>
-#include <EtherCard.h>
-
-# define InoDescription "RCnano  :  29-Mar-2023"
+#define SupportEthernet 1 // Requires Ethercard library
+#define SupportMCP23017 1 // Requires Adafruit MCP23008 and MCP23017 libraries
+#define InoDescription "RCnano  :  29-Mar-2023"
 const int16_t InoID = 2903;	// change to send defaults to eeprom
 int16_t StoredID;			// Defaults ID stored in eeprom	
 
@@ -26,7 +16,7 @@ struct ModuleConfig
 	uint8_t	IPpart3 = 1;			// IP address, 3rd octet
 	uint8_t RelayOnSignal = 0;	    // value that turns on relays
 	uint8_t FlowOnDirection = 0;	// sets on value for flow valve or sets motor direction
-	uint8_t UseMCP23017 = 1;        // 0 use Nano pins for relays, 1 use MCP23017 for relays
+	uint8_t UseMCP23017 = SupportMCP23017 == 1 ? 1 : 0; // 0 use Nano pins for relays, 1 use MCP23017 for relays
 	uint8_t Relays[16];
 	uint8_t Debounce = 3;			// minimum ms pin change, base debounce
 };
@@ -62,6 +52,9 @@ struct SensorConfig
 
 SensorConfig Sensor[2];
 
+#if SupportEthernet == 1
+#include <SPI.h>
+#include <EtherCard.h>
 // If using the ENC28J60 ethernet shield these pins
 // are used by it and unavailable for relays:
 // 7,8,10,11,12,13. It also pulls pin D2 high.
@@ -79,6 +72,17 @@ unsigned int DestinationPort = 29999; // Rate Controller listening port
 byte Ethernet::buffer[300]; // udp send and receive buffer
 bool ENCfound;
 static byte selectPin = 10;
+#endif
+
+#if SupportMCP23017 == 1
+#include <Adafruit_MCP23008.h>
+#include <Adafruit_MCP23X08.h>
+#include <Adafruit_MCP23X17.h>
+#include <Adafruit_MCP23XXX.h>
+#include <Adafruit_BusIO_Register.h>
+#include <Adafruit_I2CDevice.h>
+#include <Adafruit_I2CRegister.h>
+#include <Adafruit_SPIDevice.h>
 
 Adafruit_MCP23X17 mcp;
 
@@ -105,6 +109,8 @@ Adafruit_MCP23X17 mcp;
 #define Relay15 1
 #define Relay16 0
 
+#endif
+
 const uint16_t LOOP_TIME = 50;      //in msec = 20hz
 uint32_t LoopLast = LOOP_TIME;
 
@@ -204,16 +210,15 @@ void setup()
 	if (MDL.SensorCount < 1) MDL.SensorCount = 1;
 	if (MDL.SensorCount > 2) MDL.SensorCount = 2;
 
+#if UseMCP23017 == 1
 	if (MDL.UseMCP23017)
-	{
 		Serial.println("Using MCP23017 for relays.");
-	}
 	else
-	{
+#endif
 		Serial.println("Using Nano pins for relays.");
-	}
 
 	Wire.begin();
+#if SupportMCP23017 == 1
 	if (MDL.UseMCP23017)
 	{
 		// I/O expander on default address 0x20
@@ -262,6 +267,7 @@ void setup()
 		}
 	}
 	else
+#endif
 	{
 		// Nano pins
 		for (int i = 0; i < 16; i++)
@@ -282,6 +288,7 @@ void setup()
 	attachInterrupt(digitalPinToInterrupt(Sensor[0].FlowPin), ISR0, FALLING);
 	attachInterrupt(digitalPinToInterrupt(Sensor[1].FlowPin), ISR1, FALLING);
 
+#if SupportEthernet == 1
 	Serial.println("");
 	Serial.println("Starting Ethernet ...");
 
@@ -319,6 +326,7 @@ void setup()
 		Serial.println("");
 		Serial.println("Ethernet controller not found.");
 	}
+#endif
 
 	Serial.println("");
 	Serial.println("Finished Setup.");
@@ -358,15 +366,18 @@ void loop()
 	{
 		SendLast = millis();
 		SendSerial();
+#if SupportEthernet == 1
 		SendUDPwired();
+#endif
 	}
 
+#if SupportEthernet == 1
 	if (ENCfound)
 	{
 		//this must be called for ethercard functions to work.
 		ether.packetLoop(ether.packetReceive());
 	}
-
+#endif
 	ReceiveSerial();
 }
 

Modules/Nano/RCnano/Relays.ino

@@ -44,6 +44,7 @@ void CheckRelays()
     NewLo |= PowerRelayLo;
     NewHi |= PowerRelayHi;
 
+#if UseMCP23017 == 1
     if (MDL.UseMCP23017 == 1)
     {
         if (IOexpanderFound)
@@ -68,7 +69,7 @@ void CheckRelays()
         }
     }
     else
-    {
+#endif
         // use Nano pins
         for (int j = 0; j < 2; j++)
         {
@@ -81,5 +82,4 @@ void CheckRelays()
                 }
             }
         }
-    }
 }

Modules/Nano/RCnano/UDPwiredComm.ino

@@ -1,4 +1,4 @@
-
+#if SupportEthernet == 1
 byte UDPpacket[30];
 uint16_t UDPpgn;
 
@@ -347,3 +347,4 @@ void ReceiveUDPwired(uint16_t dest_port, uint8_t src_ip[IP_LEN], uint16_t src_po
         }
     }
 }
+#endif