diff options
28 files changed, 31 insertions, 286 deletions
diff --git a/drivers/avr/glcdfont.c b/drivers/avr/glcdfont.c index 2c332ea6db..5e763b054f 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 <avr/io.h> -# include <avr/pgmspace.h> -#elif defined(ESP8266) -# include <pgmspace.h> -#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 95c5d2ebf4..de58960189 100644 --- a/drivers/oled/glcdfont.c +++ b/drivers/oled/glcdfont.c @@ -1,13 +1,4 @@ -#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" // 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 e541228ea9..d03b2de3a2 100644 --- a/drivers/oled/oled_driver.c +++ b/drivers/oled/oled_driver.c @@ -22,15 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <string.h> -#if defined(__AVR__) -# include <avr/io.h> -# include <avr/pgmspace.h> -#elif defined(ESP8266) -# include <pgmspace.h> -#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 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 diff --git a/keyboards/comet46/lib/glcdfont.c b/keyboards/comet46/lib/glcdfont.c index e912d2233c..361d0c3dc6 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 <avr/io.h> - #include <avr/pgmspace.h> -#elif defined(ESP8266) - #include <pgmspace.h> -#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 184f601095..a0abdd79ab 100644 --- a/keyboards/comet46/lib/keylogger.c +++ b/keyboards/comet46/lib/keylogger.c @@ -1,11 +1,5 @@ #include <stdio.h> - -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/pgmspace.h> -#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 2bfc3fac6d..10ce3b3457 100644 --- a/keyboards/crkbd/keymaps/drashna/glcdfont.c +++ b/keyboards/crkbd/keymaps/drashna/glcdfont.c @@ -1,13 +1,4 @@ -#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/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c b/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c index a67c329242..ea1f3bd76b 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 <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 diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c index 044c16d9c1..ac1f11dbbe 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c +++ b/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c @@ -1,13 +1,4 @@ -#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" // 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 291445b5e3..588ecfd8c8 100644 --- a/keyboards/crkbd/keymaps/soundmonster/glcdfont.c +++ b/keyboards/crkbd/keymaps/soundmonster/glcdfont.c @@ -1,13 +1,4 @@ -#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/keyboards/crkbd/lib/glcdfont.c b/keyboards/crkbd/lib/glcdfont.c index f7567c57c6..41041f12bb 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 <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 diff --git a/keyboards/gergo/keymaps/oled/glcdfont.c b/keyboards/gergo/keymaps/oled/glcdfont.c index cf189e6e5a..687f1a6a92 100644 --- a/keyboards/gergo/keymaps/oled/glcdfont.c +++ b/keyboards/gergo/keymaps/oled/glcdfont.c @@ -1,7 +1,6 @@ // 'loveLain', 128x32px -#include <avr/io.h> -#include <avr/pgmspace.h> +#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 b7ad73bfa2..181b073ab5 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 <avr/io.h> -# include <avr/pgmspace.h> -#elif defined(ESP8266) -# include <pgmspace.h> -#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 89665ba074..697d58886e 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 <avr/io.h> - #include <avr/pgmspace.h> -#elif defined(ESP8266) - #include <pgmspace.h> -#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 7f54748151..5360eace95 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 <avr/io.h> - #include <avr/pgmspace.h> -#elif defined(ESP8266) - #include <pgmspace.h> -#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 c691ea9d0b..94f026ba97 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 <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 diff --git a/keyboards/orthodox/common/glcdfont.c b/keyboards/orthodox/common/glcdfont.c index 6f88bd23a7..d607d34b77 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 <avr/io.h> - #include <avr/pgmspace.h> -#elif defined(ESP8266) - #include <pgmspace.h> -#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 61b40c092e..6b75af8483 100644 --- a/keyboards/rgbkb/sol/common/glcdfont.c +++ b/keyboards/rgbkb/sol/common/glcdfont.c @@ -1,13 +1,4 @@ -#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" // 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 3b4ccfa95c..bc68c87296 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 <avr/io.h> - #include <avr/pgmspace.h> -#elif defined(ESP8266) - #include <pgmspace.h> -#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 89665ba074..697d58886e 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 <avr/io.h> - #include <avr/pgmspace.h> -#elif defined(ESP8266) - #include <pgmspace.h> -#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 32c688e2bb..003ce1a87b 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 <avr/io.h> - #include <avr/pgmspace.h> -#elif defined(ESP8266) - #include <pgmspace.h> -#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 f5524ec737..5c3fa80d70 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 <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 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 diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h index 88373f478b..a06d0f940f 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 <avr/pgmspace.h> @@ -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 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 |