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 /keyboards/yosino58/lib | |
| 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 'keyboards/yosino58/lib')
| -rw-r--r-- | keyboards/yosino58/lib/glcdfont.c | 13 | ||||
| -rw-r--r-- | keyboards/yosino58/lib/glcdfont_.c | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/keyboards/yosino58/lib/glcdfont.c b/keyboards/yosino58/lib/glcdfont.c index 01b656cc62..f393df3342 100644 --- a/keyboards/yosino58/lib/glcdfont.c +++ b/keyboards/yosino58/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 = { @@ -272,4 +262,3 @@ const unsigned char font[] PROGMEM = { 0xF0, 0xF8, 0xF8, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F }; -#endif // FONT5X7_H diff --git a/keyboards/yosino58/lib/glcdfont_.c b/keyboards/yosino58/lib/glcdfont_.c index 122b26afa3..ad7a564a6c 100644 --- a/keyboards/yosino58/lib/glcdfont_.c +++ b/keyboards/yosino58/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 |