aboutsummaryrefslogtreecommitdiffstats
path: root/users/tominabox1
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-01 17:56:50 +1100
committerGitHub <noreply@github.com>2020-03-01 17:56:50 +1100
commitc9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 (patch)
tree14c44c3670da10f6e286ad4e14e6af2bc5cc015f /users/tominabox1
parentf513a9193cdde47d1da7f647088beec8f280e4f3 (diff)
downloadfirmware-c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8.tar.gz
firmware-c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8.tar.bz2
firmware-c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8.zip
Clean up includes for glcdfont headers (#7745)
* Clean up includes for glcdfont headers * Remove pragma once, most of these are not headers * Missed these
Diffstat (limited to 'users/tominabox1')
-rw-r--r--users/tominabox1/doug.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/users/tominabox1/doug.c b/users/tominabox1/doug.c
index d1f92ecf3..fccb1bb6f 100644
--- a/users/tominabox1/doug.c
+++ b/users/tominabox1/doug.c
@@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info.
-#ifndef FONT5X7_H
-#define FONT5X7_H
-
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/pgmspace.h>
-#elif defined(ESP8266)
- #include <pgmspace.h>
-#else
- #define PROGMEM
-#endif
+#include "progmem.h"
// Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = {
@@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-#endif // FONT5X7_H