provide non-pgmspace support for default font

Author: Owen L - SFE

src/hyperdisplay.cpp

@@ -11,11 +11,9 @@ wind_info_t hyperdisplayDefaultWindow;		// This window is used by default so tha
 char_info_t hyperdisplayDefaultCharacter;	// The default character to use
 
 #if HYPERDISPLAY_USE_PRINT
-    #if HYPERDISPLAY_INCLUDE_DEFAULT_FONT   
-		#if __has_include ( <avr/pgmspace.h> )
-			hd_font_extent_t hyperdisplayDefaultXloc[HYPERDISPLAY_DEFAULT_FONT_WIDTH*HYPERDISPLAY_DEFAULT_FONT_HEIGHT];
-			hd_font_extent_t hyperdisplayDefaultYloc[HYPERDISPLAY_DEFAULT_FONT_WIDTH*HYPERDISPLAY_DEFAULT_FONT_HEIGHT];
-		#endif /* __has_include( <avr/pgmspace.h> ) */
+	#if HYPERDISPLAY_INCLUDE_DEFAULT_FONT   
+		hd_font_extent_t hyperdisplayDefaultXloc[HYPERDISPLAY_DEFAULT_FONT_WIDTH*HYPERDISPLAY_DEFAULT_FONT_HEIGHT];
+		hd_font_extent_t hyperdisplayDefaultYloc[HYPERDISPLAY_DEFAULT_FONT_WIDTH*HYPERDISPLAY_DEFAULT_FONT_HEIGHT];
 	#endif
 #endif
 
@@ -783,8 +781,7 @@ void        hyperdisplay::show( wind_info_t * wind ){   // Outputs the current w
 		return numWritten;				
 	}
 
-#if HYPERDISPLAY_INCLUDE_DEFAULT_FONT 		
-	#if __has_include ( <avr/pgmspace.h> )     
+#if HYPERDISPLAY_INCLUDE_DEFAULT_FONT 		  
 		void hyperdisplay::getCharInfo(uint8_t character, char_info_t * character_info) 
 		{
 			// This is the most basic font implementation, it only prints a monochrome character using the first color of the current window's current color sequence
@@ -841,13 +838,12 @@ void        hyperdisplay::show( wind_info_t * wind ){   // Outputs the current w
 			}
 		}
 	#else
-		#warning "HyperDisplay Default Font Not Supported. Printing will not work without a custom implementation"
+		#warning "HyperDisplay Default Font Not Included. Printing will not work without a custom implementation"
 		void hyperdisplay::getCharInfo(uint8_t character, char_info_t * character_info) 
 		{
 			// A blank implementation of getCharInfo for when the target does not support <avr/pgmspace.h>
 			character_info->show = false;
-		}
-	#endif /* __has_include( <avr/pgmspace.h> ) */	   
+		}  
 #endif /* HYPERDISPLAY_INCLUDE_DEFAULT_FONT */
 
 #else /* HYPERDISPLAY_USE_PRINT */

src/hyperdisplay.h

@@ -36,11 +36,9 @@ Purpose: This library standardizes interfaces to displays of many types.
 
 #if HYPERDISPLAY_USE_PRINT                  // 
     #if HYPERDISPLAY_INCLUDE_DEFAULT_FONT   
-        #if __has_include ( <avr/pgmspace.h> )
-            #include "util/font5x7.h"
-            #define HYPERDISPLAY_DEFAULT_FONT_WIDTH 5
-            #define HYPERDISPLAY_DEFAULT_FONT_HEIGHT 8
-        #endif /* __has_include( "util/font5x7.h" ) */
+        #include "util/font5x7.h"
+        #define HYPERDISPLAY_DEFAULT_FONT_WIDTH 5
+        #define HYPERDISPLAY_DEFAULT_FONT_HEIGHT 8
     #endif
 #endif
 

src/util/font5x7.h

@@ -19,10 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef FONT5X7_H
 #define FONT5X7_H
 
+#if __has_include ( <avr/pgmspace.h> )
 #include <avr/pgmspace.h>
+#endif /* __has_include( "util/font5x7.h" ) */
 
 // Standard ASCII 5x7 font
-static const unsigned char font5x7[] PROGMEM = {
+static const unsigned char font5x7[] 
+
+#if __has_include ( <avr/pgmspace.h> )
+PROGMEM 
+#endif /* __has_include( "util/font5x7.h" ) */
+
+= {
 	// first row defines - FONTWIDTH, FONTHEIGHT, ASCII START CHAR, TOTAL CHARACTERS, FONT MAP WIDTH HIGH, FONT MAP WIDTH LOW (2,56 meaning 256)
 	5,8,0,255,12,75,
 	0x00, 0x00, 0x00, 0x00, 0x00,