Merge branch 'develop' into Y513_BGA

EnviroDIY · Sep 23, 2024 · 332adbc · 332adbc
2 parents 743dbbf + 44ae906
commit 332adbc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/examples/menu_a_la_carte/menu_a_la_carte.ino b/examples/menu_a_la_carte/menu_a_la_carte.ino
@@ -48,7 +48,7 @@
 // peripherals as possible.  In some cases (ie, modbus communication) many
 // sensors can share the same serial port.
 
-#if defined(ARDUINO_ARCH_AVR) || defined(__AVR__)  // For AVR boards
+#if defined(__AVR__) || defined(ARDUINO_ARCH_AVR)  // For AVR boards
 // Unfortunately, most AVR boards have only one or two hardware serial ports,
 // so we'll set up three types of extra software serial ports to use
 

diff --git a/src/LoggerBase.h b/src/LoggerBase.h
@@ -43,7 +43,7 @@
 #include <RTCZero.h>
 #endif
 #include "WatchDogs/WatchDogSAMD.h"
-#elif defined(ARDUINO_ARCH_AVR) || defined(__AVR__)
+#elif defined(__AVR__) || defined(ARDUINO_ARCH_AVR)
 #include <avr/power.h>
 #include <avr/sleep.h>
 #include "WatchDogs/WatchDogAVR.h"

diff --git a/src/ModSensorInterrupts.h b/src/ModSensorInterrupts.h
@@ -14,7 +14,9 @@
 #ifndef SRC_MODSENSORINTERRUPTS_H_
 #define SRC_MODSENSORINTERRUPTS_H_
 
-#if defined(__AVR__)
+#include <Arduino.h>
+
+#if defined(__AVR__) || defined(ARDUINO_ARCH_AVR)
 // #define LIBCALL_ENABLEINTERRUPT  // To prevent compiler/linker crashes
 #include <EnableInterrupt.h>  // To handle external and pin change interrupts
 #else

diff --git a/src/WatchDogs/WatchDogAVR.cpp b/src/WatchDogs/WatchDogAVR.cpp
@@ -13,7 +13,7 @@
 // Be careful to use a platform-specific conditional include to only make the
 // code visible for the appropriate platform.  Arduino will try to compile and
 // link all .cpp files regardless of platform.
-#if defined(ARDUINO_ARCH_AVR) || defined(__AVR__)
+#if defined(__AVR__) || defined(ARDUINO_ARCH_AVR)
 
 #include <avr/interrupt.h>
 #include <avr/wdt.h>