diff options
| author | Ryan <fauxpark@gmail.com> | 2020-03-01 17:56:50 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 17:56:50 +1100 |
| commit | c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 (patch) | |
| tree | 14c44c3670da10f6e286ad4e14e6af2bc5cc015f /users | |
| parent | f513a9193cdde47d1da7f647088beec8f280e4f3 (diff) | |
| download | qmk_firmware-c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8.tar.gz qmk_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')
| -rw-r--r-- | users/drashna/font_gmk_bad.h | 9 | ||||
| -rw-r--r-- | users/drashna/hue_manitee_font.h | 9 | ||||
| -rw-r--r-- | users/tominabox1/doug.c | 13 |
3 files changed, 3 insertions, 28 deletions
diff --git a/users/drashna/font_gmk_bad.h b/users/drashna/font_gmk_bad.h index c1c5c390a9..2f660d7eb5 100644 --- a/users/drashna/font_gmk_bad.h +++ b/users/drashna/font_gmk_bad.h @@ -1,13 +1,6 @@ #pragma once -#ifdef __AVR__ -# include <avr/io.h> -# include <avr/pgmspace.h> -#elif defined(ESP8266) -# include <pgmspace.h> -#else -# define PROGMEM -#endif +#include "progmem.h" // Corne 8x6 font with QMK Firmware Logo // Online editor: https://helixfonteditor.netlify.com/ diff --git a/users/drashna/hue_manitee_font.h b/users/drashna/hue_manitee_font.h index 72d50f7a6a..2deb4d32dc 100644 --- a/users/drashna/hue_manitee_font.h +++ b/users/drashna/hue_manitee_font.h @@ -1,13 +1,6 @@ #pragma once -#ifdef __AVR__ -# include <avr/io.h> -# include <avr/pgmspace.h> -#elif defined(ESP8266) -# include <pgmspace.h> -#else -# define PROGMEM -#endif +#include "progmem.h" // Corne 8x6 font with QMK Firmware Logo // Online editor: https://helixfonteditor.netlify.com/ diff --git a/users/tominabox1/doug.c b/users/tominabox1/doug.c index d1f92ecf30..fccb1bb6fd 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 |