Merge pull request #6 from code0100fun/arm-pgmspace

Jim Lindblom · Jim Lindblom · commit 2b7ef3e5c807 · 2015-10-20T14:42:10.000-06:00
Load &lt;avr/pgmspace.h&gt; for Teensy3
diff --git a/src/SFE_MicroOLED.cpp b/src/SFE_MicroOLED.cpp
@@ -34,7 +34,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 #include <Arduino.h>
-#ifdef __AVR__
+#if defined(__AVR__) || defined(__arm__)
 	#include <avr/pgmspace.h>
 #else
 	#include <pgmspace.h>
diff --git a/src/SFE_MicroOLED.h b/src/SFE_MicroOLED.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <Arduino.h>
 
-#ifdef __AVR__
+#if defined(__AVR__) || defined(__arm__)
 	#include <avr/pgmspace.h>
 #else
 	#include <pgmspace.h>
diff --git a/src/util/7segment.h b/src/util/7segment.h
@@ -25,7 +25,7 @@ July 27, 2015
 #ifndef FONT7SEGMENT_H
 #define FONT7SEGMENT_H
 
-#ifdef __AVR__
+#if defined(__AVR__) || defined(__arm__)
 	#include <avr/pgmspace.h>
 #else
 	#include <pgmspace.h>
diff --git a/src/util/font5x7.h b/src/util/font5x7.h
@@ -25,7 +25,7 @@ July 27, 2015
 #ifndef FONT5X7_H
 #define FONT5X7_H
 
-#ifdef __AVR__
+#if defined(__AVR__) || defined(__arm__)
 	#include <avr/pgmspace.h>
 #else
 	#include <pgmspace.h>
diff --git a/src/util/font8x16.h b/src/util/font8x16.h
@@ -24,7 +24,7 @@ July 27, 2015
 #ifndef FONT8X16_H
 #define FONT8X16_H
 
-#ifdef __AVR__
+#if defined(__AVR__) || defined(__arm__)
 	#include <avr/pgmspace.h>
 #else
 	#include <pgmspace.h>
diff --git a/src/util/fontlargeletter31x48.h b/src/util/fontlargeletter31x48.h
@@ -19,7 +19,11 @@ August 13, 2015
 
 #ifndef FONTLARGELETTER31X48_H
 #define FONTLARGELETTER31X48_H
-#include <avr/pgmspace.h>
+#if defined(__AVR__) || defined(__arm__)
+	#include <avr/pgmspace.h>
+#else
+	#include <pgmspace.h>
+#endif
 static const unsigned char fontlargeletter31x48 [] PROGMEM = {
     // first row defines - FONTWIDTH, FONTHEIGHT, ASCII START CHAR, TOTAL CHARACTERS, FONT MAP WIDTH HIGH, FONT MAP WIDTH LOW (2,56 meaning 256)
     31,48,65,58,0,62,
diff --git a/src/util/fontlargenumber.h b/src/util/fontlargenumber.h
@@ -25,7 +25,7 @@ July 27, 2015
 #ifndef FONTLARGENUMBER_H
 #define FONTLARGENUMBER_H
 
-#ifdef __AVR__
+#if defined(__AVR__) || defined(__arm__)
 	#include <avr/pgmspace.h>
 #else
 	#include <pgmspace.h>
