Skip to content

Add back preprocessor defines to guard libraries #29

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

Closed
mirh wants to merge 1 commit into from
Closed

Add back preprocessor defines to guard libraries #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Modules/Nano/RCnano/CheckShield.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

#if SupportEthernet == 1
// uses SPI.h
// use 'if(ShieldFound())' before 'ether.begin(sizeof Ethernet::buffer, LocalMac, selectPin);' to prevent hang

Expand Down Expand Up @@ -65,4 +65,4 @@ static byte readOp(byte op, byte address) {
disableChip();
return result;
}

#endif
47 changes: 29 additions & 18 deletions Modules/Nano/RCnano/RCnano.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
#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 SupportEthernet 1 // Requires Ethercard library
# define SupportMCP23017 1 // Requires Adafruit MCP23008 and MCP23017 libraries
# define InoDescription "RCnano : 25-Jun-2023"
const uint16_t InoID = 25063; // change to send defaults to eeprom, ddmmy, no leading 0
int16_t StoredID; // Defaults ID stored in eeprom
Expand All @@ -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];
};

Expand Down Expand Up @@ -61,6 +51,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.
Expand All @@ -82,6 +75,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;

Expand All @@ -108,6 +112,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;

Expand Down Expand Up @@ -215,16 +221,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
Expand Down Expand Up @@ -273,6 +278,7 @@ void setup()
}
}
else
#endif
{
// Nano pins
for (int i = 0; i < 16; i++)
Expand All @@ -293,6 +299,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 ...");

Expand Down Expand Up @@ -331,6 +338,7 @@ void setup()
Serial.println("");
Serial.println("Ethernet controller not found.");
}
#endif

Serial.println("");
Serial.println("Finished Setup.");
Expand Down Expand Up @@ -372,15 +380,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();
}

Expand Down
4 changes: 2 additions & 2 deletions Modules/Nano/RCnano/Relays.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ void CheckRelays()
NewLo |= PowerRelayLo;
NewHi |= PowerRelayHi;

#if UseMCP23017 == 1
if (MDL.UseMCP23017 == 1)
{
if (IOexpanderFound)
Expand All @@ -68,7 +69,7 @@ void CheckRelays()
}
}
else
{
#endif
// use Nano pins
for (int j = 0; j < 2; j++)
{
Expand All @@ -81,5 +82,4 @@ void CheckRelays()
}
}
}
}
}
3 changes: 2 additions & 1 deletion Modules/Nano/RCnano/UDPwiredComm.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

#if SupportEthernet == 1
byte UDPpacket[30];
uint16_t UDPpgn;

Expand Down Expand Up @@ -407,3 +407,4 @@ void ReceiveAGIO(uint16_t dest_port, uint8_t src_ip[IP_LEN], uint16_t src_port,
}
}

#endif