From c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 1 Mar 2020 17:56:50 +1100 Subject: [PATCH] Clean up includes for glcdfont headers (#7745) * Clean up includes for glcdfont headers * Remove pragma once, most of these are not headers * Missed these --- drivers/avr/glcdfont.c | 13 +------------ drivers/oled/glcdfont.c | 11 +---------- drivers/oled/oled_driver.c | 11 +++-------- keyboards/claw44/lib/glcdfont.c | 13 +------------ keyboards/comet46/lib/glcdfont.c | 13 +------------ keyboards/comet46/lib/keylogger.c | 8 +------- keyboards/crkbd/keymaps/drashna/glcdfont.c | 11 +---------- keyboards/crkbd/keymaps/kidbrazil/glcdfont.c | 13 +------------ keyboards/crkbd/keymaps/rpbaptist/glcdfont.c | 11 +---------- keyboards/crkbd/keymaps/soundmonster/glcdfont.c | 11 +---------- keyboards/crkbd/lib/glcdfont.c | 13 +------------ keyboards/gergo/keymaps/oled/glcdfont.c | 3 +-- .../owlet60/keymaps/oled_testing/customfont.c | 11 +---------- keyboards/helix/common/glcdfont.c | 13 +------------ keyboards/helix/rev2/keymaps/froggy/helixfont.h | 13 ++----------- keyboards/lily58/lib/glcdfont.c | 13 +------------ keyboards/orthodox/common/glcdfont.c | 13 +------------ keyboards/rgbkb/sol/common/glcdfont.c | 11 +---------- keyboards/rgbkb/zen/common/glcdfont.c | 11 +---------- keyboards/rgbkb/zygomorph/common/glcdfont.c | 13 +------------ keyboards/treadstone48/common/glcdfont.c | 13 +------------ keyboards/uzu42/keymaps/default/glcdfont_uzu42.c | 13 +------------ keyboards/yosino58/lib/glcdfont.c | 13 +------------ keyboards/yosino58/lib/glcdfont_.c | 13 +------------ tmk_core/common/progmem.h | 5 +---- users/drashna/font_gmk_bad.h | 9 +-------- users/drashna/hue_manitee_font.h | 9 +-------- users/tominabox1/doug.c | 13 +------------ 28 files changed, 31 insertions(+), 286 deletions(-) diff --git a/drivers/avr/glcdfont.c b/drivers/avr/glcdfont.c index 2c332ea6db41919a8538e7fa7137989b398ad3bd..5e763b054f894b76721bc9ddcd549a65a41ddeec 100644 --- a/drivers/avr/glcdfont.c +++ b/drivers/avr/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 -# include -#elif defined(ESP8266) -# include -#else -# define PROGMEM -#endif +#include "progmem.h" // Standard ASCII 5x7 font @@ -31,4 +21,3 @@ static const unsigned char font[] PROGMEM = { 0x14, 0x14, 0x14, 0xF4, 0x14, 0x10, 0x10, 0xF0, 0x10, 0xF0, 0x00, 0x00, 0x1F, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x1F, 0x14, 0x00, 0x00, 0x00, 0xFC, 0x14, 0x00, 0x00, 0xF0, 0x10, 0xF0, 0x10, 0x10, 0xFF, 0x10, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x14, 0x10, 0x10, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x38, 0x44, 0x44, 0x38, 0x44, 0xFC, 0x4A, 0x4A, 0x4A, 0x34, // sharp-s or beta 0x7E, 0x02, 0x02, 0x06, 0x06, 0x02, 0x7E, 0x02, 0x7E, 0x02, 0x63, 0x55, 0x49, 0x41, 0x63, 0x38, 0x44, 0x44, 0x3C, 0x04, 0x40, 0x7E, 0x20, 0x1E, 0x20, 0x06, 0x02, 0x7E, 0x02, 0x02, 0x99, 0xA5, 0xE7, 0xA5, 0x99, 0x1C, 0x2A, 0x49, 0x2A, 0x1C, 0x4C, 0x72, 0x01, 0x72, 0x4C, 0x30, 0x4A, 0x4D, 0x4D, 0x30, 0x30, 0x48, 0x78, 0x48, 0x30, 0xBC, 0x62, 0x5A, 0x46, 0x3D, 0x3E, 0x49, 0x49, 0x49, 0x00, 0x7E, 0x01, 0x01, 0x01, 0x7E, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x44, 0x44, 0x5F, 0x44, 0x44, 0x40, 0x51, 0x4A, 0x44, 0x40, 0x40, 0x44, 0x4A, 0x51, 0x40, 0x00, 0x00, 0xFF, 0x01, 0x03, 0xE0, 0x80, 0xFF, 0x00, 0x00, 0x08, 0x08, 0x6B, 0x6B, 0x08, 0x36, 0x12, 0x36, 0x24, 0x36, 0x06, 0x0F, 0x09, 0x0F, 0x06, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x30, 0x40, 0xFF, 0x01, 0x01, 0x00, 0x1F, 0x01, 0x01, 0x1E, 0x00, 0x19, 0x1D, 0x17, 0x12, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP }; -#endif // FONT5X7_H diff --git a/drivers/oled/glcdfont.c b/drivers/oled/glcdfont.c index 95c5d2ebf417cb562b4d328fa21fbdbb5a52bc0a..de5896018986961f9afe3612195ba0010540316e 100644 --- a/drivers/oled/glcdfont.c +++ b/drivers/oled/glcdfont.c @@ -1,13 +1,4 @@ -#pragma once - -#ifdef __AVR__ -# include -# include -#elif defined(ESP8266) -# include -#else -# define PROGMEM -#endif +#include "progmem.h" // Helidox 8x6 font with QMK Firmware Logo // Online editor: http://teripom.x0.com/ diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c index e541228ea92dd4884260a9d29f2eecd786a5d6d5..d03b2de3a20fce8df6ba51e5efda7b3ec7c1fe1a 100644 --- a/drivers/oled/oled_driver.c +++ b/drivers/oled/oled_driver.c @@ -22,15 +22,10 @@ along with this program. If not, see . #include -#if defined(__AVR__) -# include -# include -#elif defined(ESP8266) -# include -#else // defined(ESP8266) -# define PROGMEM +#include "progmem.h" +#ifndef __AVR__ # define memcpy_P(des, src, len) memcpy(des, src, len) -#endif // defined(__AVR__) +#endif // Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf diff --git a/keyboards/claw44/lib/glcdfont.c b/keyboards/claw44/lib/glcdfont.c index 91f53d9c24eafddc2e9e86e5b68c7c293e7910e7..9fa1c806aa72f963904c27b40a0d27e86b93497b 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 - #include -#elif defined(ESP8266) - #include -#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 diff --git a/keyboards/comet46/lib/glcdfont.c b/keyboards/comet46/lib/glcdfont.c index e912d2233c424aaeed085d27774a0aa3a5b0cc0b..361d0c3dc65c60450a527e3d147fa8be44983856 100644 --- a/keyboards/comet46/lib/glcdfont.c +++ b/keyboards/comet46/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 - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Standard ASCII 5x7 font @@ -145,4 +135,3 @@ const unsigned char font[] PROGMEM = { 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00 }; -#endif // FONT5X7_H diff --git a/keyboards/comet46/lib/keylogger.c b/keyboards/comet46/lib/keylogger.c index 184f601095a1d372900de74fec293f6e3be4e0e7..a0abdd79abcfc8202984aac86d22292589af156a 100644 --- a/keyboards/comet46/lib/keylogger.c +++ b/keyboards/comet46/lib/keylogger.c @@ -1,11 +1,5 @@ #include - -#ifdef __AVR__ - #include - #include -#else - #define PROGMEM -#endif +#include "progmem.h" #define NUM_USB_HID_KEYCODES 255 #define LEN_KEYCODE_STR 4 diff --git a/keyboards/crkbd/keymaps/drashna/glcdfont.c b/keyboards/crkbd/keymaps/drashna/glcdfont.c index 2bfc3fac6d44e5cec91188d7b707436777d7326f..10ce3b3457376d0b9ae271d0e71501f785bf3727 100644 --- a/keyboards/crkbd/keymaps/drashna/glcdfont.c +++ b/keyboards/crkbd/keymaps/drashna/glcdfont.c @@ -1,13 +1,4 @@ -#pragma once - -#ifdef __AVR__ -# include -# include -#elif defined(ESP8266) -# include -#else -# define PROGMEM -#endif +#include "progmem.h" // Corne 8x6 font with QMK Firmware Logo // Online editor: https://helixfonteditor.netlify.com/ diff --git a/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c b/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c index a67c329242ed5b2a5a1dd82f647c019c56d4dd99..ea1f3bd76b0d246cc2f7f885e7e8daad41d96597 100644 --- a/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c +++ b/keyboards/crkbd/keymaps/kidbrazil/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 - #include -#elif defined(ESP8266) - #include -#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 diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c index 044c16d9c16b91cb445073dd6ff37b65c3e953ee..ac1f11dbbe2ba400d297553b921e8cd30f8b4454 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c +++ b/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c @@ -1,13 +1,4 @@ -#pragma once - -#ifdef __AVR__ - #include - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Helidox 8x6 font with QMK Firmware Logo // Online editor: http://teripom.x0.com/ diff --git a/keyboards/crkbd/keymaps/soundmonster/glcdfont.c b/keyboards/crkbd/keymaps/soundmonster/glcdfont.c index 291445b5e3df8e93d5cfbaa4d6ddf4130532b524..588ecfd8c88671b90152c613845b113c5b9db0a5 100644 --- a/keyboards/crkbd/keymaps/soundmonster/glcdfont.c +++ b/keyboards/crkbd/keymaps/soundmonster/glcdfont.c @@ -1,13 +1,4 @@ -#pragma once - -#ifdef __AVR__ - #include - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Corne 8x6 font with QMK Firmware Logo // Online editor: https://helixfonteditor.netlify.com/ diff --git a/keyboards/crkbd/lib/glcdfont.c b/keyboards/crkbd/lib/glcdfont.c index f7567c57c6c84e2d8c1370e2db0aaf8cac6a665f..41041f12bb3fa01965425e069682d3a6932efa4e 100644 --- a/keyboards/crkbd/lib/glcdfont.c +++ b/keyboards/crkbd/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 - #include -#elif defined(ESP8266) - #include -#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 diff --git a/keyboards/gergo/keymaps/oled/glcdfont.c b/keyboards/gergo/keymaps/oled/glcdfont.c index cf189e6e5a6dbfcfd71ff38ea0304bcbcab7ce84..687f1a6a92f6210ec8045ca00564484fbc008a49 100644 --- a/keyboards/gergo/keymaps/oled/glcdfont.c +++ b/keyboards/gergo/keymaps/oled/glcdfont.c @@ -1,7 +1,6 @@ // 'loveLain', 128x32px -#include -#include +#include "progmem.h" static const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c b/keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c index b7ad73bfa25d30eebf867a8bcb91fe307bbcb3dd..181b073ab5f5633ed66f70a51902f1e42632e01b 100644 --- a/keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c +++ b/keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c @@ -1,13 +1,4 @@ -#pragma once - -#ifdef __AVR__ -# include -# include -#elif defined(ESP8266) -# include -#else -# define PROGMEM -#endif +#include "progmem.h" // Helidox 8x6 font with QMK Firmware Logo // Online editor: http://teripom.x0.com/ diff --git a/keyboards/helix/common/glcdfont.c b/keyboards/helix/common/glcdfont.c index 89665ba07432d5dd4e20d0ca1f0212e45c45fce2..697d58886ec5b80ec901b7b1c247ffb41fc1c015 100644 --- a/keyboards/helix/common/glcdfont.c +++ b/keyboards/helix/common/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 - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Standard ASCII 5x7 font @@ -241,4 +231,3 @@ static const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -#endif // FONT5X7_H diff --git a/keyboards/helix/rev2/keymaps/froggy/helixfont.h b/keyboards/helix/rev2/keymaps/froggy/helixfont.h index 7f54748151a4de370547ab3b460a6c8069a3c3cc..5360eace95b62f423645fc45a10ddafd9a403f8e 100644 --- a/keyboards/helix/rev2/keymaps/froggy/helixfont.h +++ b/keyboards/helix/rev2/keymaps/froggy/helixfont.h @@ -1,17 +1,9 @@ // 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 +#pragma once -#ifdef __AVR__ - #include - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Standard ASCII 5x7 font @@ -241,4 +233,3 @@ static const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -#endif // FONT5X7_H diff --git a/keyboards/lily58/lib/glcdfont.c b/keyboards/lily58/lib/glcdfont.c index c691ea9d0be0ecab3ca20ac550a121595c17a420..94f026ba971edcee646f3cd0afc3e0846f342c8f 100644 --- a/keyboards/lily58/lib/glcdfont.c +++ b/keyboards/lily58/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 - #include -#elif defined(ESP8266) - #include -#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 diff --git a/keyboards/orthodox/common/glcdfont.c b/keyboards/orthodox/common/glcdfont.c index 6f88bd23a781d6376abbd2815dea9dcbc2508ae9..d607d34b779513938e197ccbc3e4f8fed6da51d5 100644 --- a/keyboards/orthodox/common/glcdfont.c +++ b/keyboards/orthodox/common/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 - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Standard ASCII 5x7 font @@ -273,4 +263,3 @@ static const unsigned char font[] PROGMEM = { 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP }; -#endif // FONT5X7_H diff --git a/keyboards/rgbkb/sol/common/glcdfont.c b/keyboards/rgbkb/sol/common/glcdfont.c index 61b40c092ef2d2eff7f94fed7fde9ee8cccbafe1..6b75af8483cbddfdaba525631738af8f9352c66b 100644 --- a/keyboards/rgbkb/sol/common/glcdfont.c +++ b/keyboards/rgbkb/sol/common/glcdfont.c @@ -1,13 +1,4 @@ -#pragma once - -#ifdef __AVR__ - #include - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Helidox 8x6 font with RGBKB SOL Logo // Online editor: http://teripom.x0.com/ diff --git a/keyboards/rgbkb/zen/common/glcdfont.c b/keyboards/rgbkb/zen/common/glcdfont.c index 3b4ccfa95c64770708d2c0e3accbe39ec12cacc8..bc68c872969e4e9bfe84dd0caa6a2c11a0bf8d63 100644 --- a/keyboards/rgbkb/zen/common/glcdfont.c +++ b/keyboards/rgbkb/zen/common/glcdfont.c @@ -1,15 +1,6 @@ // This is the SOL 6x8 font -#pragma once - -#ifdef __AVR__ - #include - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" static const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/keyboards/rgbkb/zygomorph/common/glcdfont.c b/keyboards/rgbkb/zygomorph/common/glcdfont.c index 89665ba07432d5dd4e20d0ca1f0212e45c45fce2..697d58886ec5b80ec901b7b1c247ffb41fc1c015 100644 --- a/keyboards/rgbkb/zygomorph/common/glcdfont.c +++ b/keyboards/rgbkb/zygomorph/common/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 - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Standard ASCII 5x7 font @@ -241,4 +231,3 @@ static const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -#endif // FONT5X7_H diff --git a/keyboards/treadstone48/common/glcdfont.c b/keyboards/treadstone48/common/glcdfont.c index 32c688e2bb383e61a8d8b7b4f23b9b2e29852402..003ce1a87bde3a5259eac7fdd502e4981a6d95db 100644 --- a/keyboards/treadstone48/common/glcdfont.c +++ b/keyboards/treadstone48/common/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 - #include -#elif defined(ESP8266) - #include -#else - #define PROGMEM -#endif +#include "progmem.h" // Standard ASCII 5x7 font @@ -241,4 +231,3 @@ static const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -#endif // FONT5X7_H diff --git a/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c b/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c index f5524ec73710a2939538654edb8592d4348b224a..5c3fa80d70ba007602a4119c7211dbeccebc539b 100644 --- a/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c +++ b/keyboards/uzu42/keymaps/default/glcdfont_uzu42.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 - #include -#elif defined(ESP8266) - #include -#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 diff --git a/keyboards/yosino58/lib/glcdfont.c b/keyboards/yosino58/lib/glcdfont.c index 01b656cc6266047b175ac03e575e6bbe68c836b5..f393df33423dd262c25cb6154f52e9e4a8442aa8 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 - #include -#elif defined(ESP8266) - #include -#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 122b26afa361b3a8f441e619a5672d7ce35b632f..ad7a564a6c0e96d79a20fb281fb602078fd3a06e 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 - #include -#elif defined(ESP8266) - #include -#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 diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h index 88373f478b3f69805b9b6b2d7eff545d43c8dad1..a06d0f940fbb95172cbb69bb53a39a3b10588ec2 100644 --- a/tmk_core/common/progmem.h +++ b/tmk_core/common/progmem.h @@ -1,5 +1,4 @@ -#ifndef PROGMEM_H -#define PROGMEM_H 1 +#pragma once #if defined(__AVR__) # include @@ -9,5 +8,3 @@ # define pgm_read_word(p) *((uint16_t*)(p)) # define pgm_read_dword(p) *((uint32_t*)(p)) #endif - -#endif diff --git a/users/drashna/font_gmk_bad.h b/users/drashna/font_gmk_bad.h index c1c5c390a95a852afd06f01da851483baa44398a..2f660d7eb58d6bb6058be53317669099444c56f5 100644 --- a/users/drashna/font_gmk_bad.h +++ b/users/drashna/font_gmk_bad.h @@ -1,13 +1,6 @@ #pragma once -#ifdef __AVR__ -# include -# include -#elif defined(ESP8266) -# include -#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 72d50f7a6ab46a97572f0ab75ddd91d860b33885..2deb4d32dc37301ad1cda3c6b1db41256246f862 100644 --- a/users/drashna/hue_manitee_font.h +++ b/users/drashna/hue_manitee_font.h @@ -1,13 +1,6 @@ #pragma once -#ifdef __AVR__ -# include -# include -#elif defined(ESP8266) -# include -#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 d1f92ecf30f8d085174d745cbfde05f8c6b56cd8..fccb1bb6fd9583248fd99a5f318342a0b807ce40 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 - #include -#elif defined(ESP8266) - #include -#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