Workaround for boards not supported by Enable Interrupts

Signed-off-by: Sara Damiano <[email protected]>

examples/DRWI_2G/DRWI_2G.ino

@@ -32,10 +32,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/DRWI_DigiLTE/DRWI_DigiLTE.ino

@@ -32,10 +32,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/DRWI_Mayfly1/DRWI_Mayfly1.ino

@@ -38,10 +38,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/DRWI_Mayfly1_WiFi/DRWI_Mayfly1_WiFi.ino

@@ -38,10 +38,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/DRWI_NoCellular/DRWI_NoCellular.ino

@@ -20,10 +20,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/DRWI_SIM7080LTE/DRWI_SIM7080LTE.ino

@@ -39,10 +39,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/baro_rho_correction/baro_rho_correction.ino

@@ -34,10 +34,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/data_saving/data_saving.ino

@@ -33,10 +33,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/double_logger/double_logger.ino

@@ -32,10 +32,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/logging_to_MMW/logging_to_MMW.ino

@@ -32,10 +32,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/logging_to_ThingSpeak/logging_to_ThingSpeak.ino

@@ -35,10 +35,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/menu_a_la_carte/menu_a_la_carte.ino

@@ -36,10 +36,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/simple_logging/simple_logging.ino

@@ -20,10 +20,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

examples/simple_logging_LearnEnviroDIY/simple_logging_LearnEnviroDIY.ino

@@ -20,10 +20,6 @@
 // The Arduino library is needed for every Arduino program.
 #include <Arduino.h>
 
-// EnableInterrupt is used by ModularSensors for external and pin change
-// interrupts and must be explicitly included in the main program.
-#include <EnableInterrupt.h>
-
 // Include the main header for ModularSensors
 #include <ModularSensors.h>
 /** End [includes] */

src/LoggerBase.cpp

@@ -18,7 +18,7 @@
  */
 #define LIBCALL_ENABLEINTERRUPT
 // To handle external and pin change interrupts
-#include <EnableInterrupt.h>
+#include "ModSensorInterrupts.h"
 // For all i2c communication, including with the real time clock
 #include <Wire.h>
 

src/ModSensorInterrupts.h

@@ -0,0 +1,29 @@
+/**
+ * @file ModSensorInterrupts.h
+ * @copyright Stroud Water Research Center
+ * Part of the EnviroDIY ModularSensors library for Arduino.
+ * This library is published under the BSD-3 license.
+ * @author Sara Geleskie Damiano <[email protected]>
+ *
+ * @brief A work-around for the AVR interrupt library not supporting SAMD
+ * boards. That libary isn't necessary for them.
+ */
+
+
+// Header Guards
+#ifndef SRC_MODSENSORINTERRUPTS_H_
+#define SRC_MODSENSORINTERRUPTS_H_
+
+#if defined(__AVR__) || defined(ARDUINO_ARCH_AVR) || defined __SAM3U4E__ ||    \
+    defined __SAM3X8E__ || defined __SAM3X8H__ || defined ARDUINO_SAMD_ZERO || \
+    defined __SAMD21G18A__ || defined __SAMD21J18A__
+// #define LIBCALL_ENABLEINTERRUPT  // To prevent compiler/linker crashes
+#include <EnableInterrupt.h>  // To handle external and pin change interrupts
+#else
+#define enableInterrupt(pin, userFunc, mode) \
+    attachInterrupt(pin, userFunc, mode)
+#define disableInterrupt(pin) detachInterrupt(pin)
+#endif
+
+
+#endif  // SRC_MODSENSORINTERRUPTS_H_

src/ModularSensors.h

@@ -5,7 +5,7 @@
  * This library is published under the BSD-3 license.
  * @author Sara Geleskie Damiano <[email protected]>
  *
- * @brief A simple include file for the Arduino command line interface (CLI).s
+ * @brief A simple include file for the Arduino command line interface (CLI).
  */
 
 // Header Guards
@@ -21,6 +21,9 @@
  */
 #define MODULAR_SENSORS_VERSION "0.35.0"
 
+// To support interrupts
+#include "ModSensorInterrupts.h"
+
 // To get all of the base classes for ModularSensors, include LoggerBase.
 // NOTE:  Individual sensor definitions must be included separately.
 #include "LoggerBase.h"

src/sensors/SDI12Sensors.cpp

@@ -8,8 +8,14 @@
  * @brief Implements the SDI12Sensors class.
  */
 
-#define LIBCALL_ENABLEINTERRUPT  // To prevent compiler/linker crashes
-#include <EnableInterrupt.h>     // To handle external and pin change interrupts
+/**
+ * @brief To prevent compiler/linker crashes with enable interrupt library, we
+ * must define LIBCALL_ENABLEINTERRUPT before importing EnableInterrupt within a
+ * library.
+ */
+#define LIBCALL_ENABLEINTERRUPT
+// To handle external and pin change interrupts
+#include "ModSensorInterrupts.h"
 
 #include "SDI12Sensors.h"