From 86095af77eaa1f14345be0f0b6e028924e053438 Mon Sep 17 00:00:00 2001
From: Sara Damiano <sdamiano@stroudcenter.org>
Date: Wed, 18 Sep 2024 11:44:22 -0400
Subject: [PATCH] Consistently check for both ARDUINO_ARCH_AVR and __AVR__

Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
---
 examples/menu_a_la_carte/menu_a_la_carte.ino | 2 +-
 src/LoggerBase.h                             | 2 +-
 src/ModSensorInterrupts.h                    | 2 +-
 src/WatchDogs/WatchDogAVR.cpp                | 2 +-
 4 files changed, 4 insertions(+), 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
index 5720f93fe..50d99c088 100644
--- 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
index 36c1ad97c..b1f6e2c73 100644
--- a/src/LoggerBase.h
+++ b/src/LoggerBase.h
@@ -45,7 +45,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
index 808475155..a467bb4b8 100644
--- a/src/ModSensorInterrupts.h
+++ b/src/ModSensorInterrupts.h
@@ -16,7 +16,7 @@
 
 #include <Arduino.h>
 
-#if defined(__AVR__)
+#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
index ade6956a6..b00f96445 100644
--- 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>