From 467235aace409171639353d066f7239d94c4b45d Mon Sep 17 00:00:00 2001
From: alastaira <alastair.aitchison@gmail.com>
Date: Tue, 10 Oct 2023 15:32:11 +0100
Subject: [PATCH] Removed WProgram.h reference

Sure nobody still uses <Arduino 0022?
---
 Animations.h        | 6 +-----
 AsyncTimer.h        | 6 +-----
 BlinkAssistant.h    | 7 +------
 Eye.h               | 7 +------
 EyeBlink.h          | 7 +------
 EyeConfig.h         | 7 +------
 EyeDrawer.h         | 6 +-----
 EyePresets.h        | 7 +------
 EyeTransformation.h | 7 +------
 EyeTransition.h     | 7 +------
 EyeVariation.h      | 7 +------
 Face.h              | 8 +-------
 FaceBehavior.h      | 7 +------
 FaceEmotions.hpp    | 6 +-----
 FaceExpression.h    | 6 +-----
 LookAssistant.h     | 7 +------
 16 files changed, 16 insertions(+), 92 deletions(-)

diff --git a/Animations.h b/Animations.h
index 3d1f5c1..aac2128 100644
--- a/Animations.h
+++ b/Animations.h
@@ -13,11 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _ANIMATIONS_h
 #define _ANIMATIONS_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
+#include <Arduino.h>
 
 class IAnimation {
 public:
diff --git a/AsyncTimer.h b/AsyncTimer.h
index 86164e8..e16cf18 100644
--- a/AsyncTimer.h
+++ b/AsyncTimer.h
@@ -13,11 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _ASYNCTIMER_h
 #define _ASYNCTIMER_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
-#else
-	#include "WProgram.h"
-#endif
+#include <Arduino.h>
 
 typedef void(*AsyncTimerCallback)();
 
diff --git a/BlinkAssistant.h b/BlinkAssistant.h
index 37f2844..40a0636 100644
--- a/BlinkAssistant.h
+++ b/BlinkAssistant.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _BLINKASSISTANT_h
 #define _BLINKASSISTANT_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
-#else
-	#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "Animations.h"
 #include "AsyncTimer.h"
 
diff --git a/Eye.h b/Eye.h
index 6d43947..791034e 100644
--- a/Eye.h
+++ b/Eye.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYE_h
 #define _EYE_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "Common.h"
 #include "Animations.h"
 #include "EyeConfig.h"
diff --git a/EyeBlink.h b/EyeBlink.h
index 0f3d594..4b8a06a 100644
--- a/EyeBlink.h
+++ b/EyeBlink.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYEBLINK_h
 #define _EYEBLINK_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
-#else
-	#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "Animations.h"
 #include "EyeConfig.h"
 
diff --git a/EyeConfig.h b/EyeConfig.h
index e2ad95e..f92e604 100644
--- a/EyeConfig.h
+++ b/EyeConfig.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYECONFIG_h
 #define _EYECONFIG_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
-#else
-	#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 struct EyeConfig
 {
 	int16_t OffsetX;
diff --git a/EyeDrawer.h b/EyeDrawer.h
index c32f236..d453d99 100644
--- a/EyeDrawer.h
+++ b/EyeDrawer.h
@@ -13,13 +13,9 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYEDRAWER_h
 #define _EYEDRAWER_h
 
+#include <Arduino.h>
 #include "Common.h"
 #include "EyeConfig.h"
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
 
 enum CornerType {T_R, T_L, B_L, B_R};
 
diff --git a/EyePresets.h b/EyePresets.h
index 68348e4..a9f3a0f 100644
--- a/EyePresets.h
+++ b/EyePresets.h
@@ -17,12 +17,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYEPRESETS_h
 #define _EYEPRESETS_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "EyeConfig.h"
 
 static const EyeConfig Preset_Normal = {
diff --git a/EyeTransformation.h b/EyeTransformation.h
index 2b79bf4..27c6bba 100644
--- a/EyeTransformation.h
+++ b/EyeTransformation.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYETRANSFORMATION_h
 #define _EYETRANSFORMATION_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "Animations.h"
 #include "EyeConfig.h"
 
diff --git a/EyeTransition.h b/EyeTransition.h
index bd2b33c..69cd88a 100644
--- a/EyeTransition.h
+++ b/EyeTransition.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYETRANSITION_h
 #define _EYETRANSITION_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "Animations.h"
 #include "EyeConfig.h"
 
diff --git a/EyeVariation.h b/EyeVariation.h
index bb9965e..364f532 100644
--- a/EyeVariation.h
+++ b/EyeVariation.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _EYEVARIATION_h
 #define _EYEVARIATION_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "Animations.h"
 #include "EyeConfig.h"
 
diff --git a/Face.h b/Face.h
index 1df6214..6d929e5 100644
--- a/Face.h
+++ b/Face.h
@@ -13,13 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _FACE_h
 #define _FACE_h
 
-#include "config.h"
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "Common.h"
 #include "Animations.h"
 #include "EyePresets.h"
diff --git a/FaceBehavior.h b/FaceBehavior.h
index 317bb11..28f2f1f 100644
--- a/FaceBehavior.h
+++ b/FaceBehavior.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _FACEBEHAVIOR_h
 #define _FACEBEHAVIOR_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
-#else
-	#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "FaceEmotions.hpp"
 #include "AsyncTimer.h"
 
diff --git a/FaceEmotions.hpp b/FaceEmotions.hpp
index 9bb2565..1ff583f 100644
--- a/FaceEmotions.hpp
+++ b/FaceEmotions.hpp
@@ -13,11 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _FACEEMOTIONS_h
 #define _FACEEMOTIONS_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
-#else
-	#include "WProgram.h"
-#endif
+#include <Arduino.h>
 
 enum eEmotions {
 	Normal=0,
diff --git a/FaceExpression.h b/FaceExpression.h
index 2fb49bc..30f555a 100644
--- a/FaceExpression.h
+++ b/FaceExpression.h
@@ -13,11 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _FACEEXPRESSION_h
 #define _FACEEXPRESSION_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "arduino.h"
-#else
-#include "WProgram.h"
-#endif
+#include <Arduino.h>
 
 class Face;
 
diff --git a/LookAssistant.h b/LookAssistant.h
index e2e93bd..7663552 100644
--- a/LookAssistant.h
+++ b/LookAssistant.h
@@ -13,12 +13,7 @@ You should have received a copy of the GNU Affero General Public License along w
 #ifndef _LOOKASSISTANT_h
 #define _LOOKASSISTANT_h
 
-#if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
-#else
-	#include "WProgram.h"
-#endif
-
+#include <Arduino.h>
 #include "EyeTransformation.h"
 #include "AsyncTimer.h"