summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-10 02:08:06 +0000
committerQMK Bot <hello@qmk.fm>2020-12-10 02:08:06 +0000
commitb8b8a294d3c5bd0c0a3b2804262cf6eba0c91caf (patch)
treeb81a342b3da1d32acf653f0564538a782b13f0a9 /keyboards
parent5e04ed9f53209cf44dc90ce1eba9d563564ac404 (diff)
parent79d992d1e7b4fc3615a0d01b8b3186cdb83e6a14 (diff)
downloadqmk_firmware-b8b8a294d3c5bd0c0a3b2804262cf6eba0c91caf.tar.gz
qmk_firmware-b8b8a294d3c5bd0c0a3b2804262cf6eba0c91caf.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/claw44/lib/glcdfont.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/keyboards/claw44/lib/glcdfont.c b/keyboards/claw44/lib/glcdfont.c
index 91f53d9c24..9fa1c806aa 100644
--- a/keyboards/claw44/lib/glcdfont.c
+++ b/keyboards/claw44/lib/glcdfont.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