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 c1c5c390a..2f660d7eb 100644 --- a/users/drashna/font_gmk_bad.h +++ b/users/drashna/font_gmk_bad.h | |||
| @@ -1,13 +1,6 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #ifdef __AVR__ | 3 | #include "progmem.h" |
| 4 | # include <avr/io.h> | ||
| 5 | # include <avr/pgmspace.h> | ||
| 6 | #elif defined(ESP8266) | ||
| 7 | # include <pgmspace.h> | ||
| 8 | #else | ||
| 9 | # define PROGMEM | ||
| 10 | #endif | ||
| 11 | 4 | ||
| 12 | // Corne 8x6 font with QMK Firmware Logo | 5 | // Corne 8x6 font with QMK Firmware Logo |
| 13 | // Online editor: https://helixfonteditor.netlify.com/ | 6 | // Online editor: https://helixfonteditor.netlify.com/ |
diff --git a/users/drashna/hue_manitee_font.h b/users/drashna/hue_manitee_font.h index 72d50f7a6..2deb4d32d 100644 --- a/users/drashna/hue_manitee_font.h +++ b/users/drashna/hue_manitee_font.h | |||
| @@ -1,13 +1,6 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #ifdef __AVR__ | 3 | #include "progmem.h" |
| 4 | # include <avr/io.h> | ||
| 5 | # include <avr/pgmspace.h> | ||
| 6 | #elif defined(ESP8266) | ||
| 7 | # include <pgmspace.h> | ||
| 8 | #else | ||
| 9 | # define PROGMEM | ||
| 10 | #endif | ||
| 11 | 4 | ||
| 12 | // Corne 8x6 font with QMK Firmware Logo | 5 | // Corne 8x6 font with QMK Firmware Logo |
| 13 | // Online editor: https://helixfonteditor.netlify.com/ | 6 | // Online editor: https://helixfonteditor.netlify.com/ |
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 @@ | |||
| 1 | // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. | 1 | // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. |
| 2 | // See gfxfont.h for newer custom bitmap font info. | 2 | // See gfxfont.h for newer custom bitmap font info. |
| 3 | 3 | ||
| 4 | #ifndef FONT5X7_H | 4 | #include "progmem.h" |
| 5 | #define FONT5X7_H | ||
| 6 | |||
| 7 | #ifdef __AVR__ | ||
| 8 | #include <avr/io.h> | ||
| 9 | #include <avr/pgmspace.h> | ||
| 10 | #elif defined(ESP8266) | ||
| 11 | #include <pgmspace.h> | ||
| 12 | #else | ||
| 13 | #define PROGMEM | ||
| 14 | #endif | ||
| 15 | 5 | ||
| 16 | // Standard ASCII 5x7 font | 6 | // Standard ASCII 5x7 font |
| 17 | const unsigned char font[] PROGMEM = { | 7 | const unsigned char font[] PROGMEM = { |
| @@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = { | |||
| 240 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 230 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 241 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 231 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
| 242 | }; | 232 | }; |
| 243 | #endif // FONT5X7_H | ||