aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-01 17:56:50 +1100
committerGitHub <noreply@github.com>2020-03-01 17:56:50 +1100
commitc9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 (patch)
tree14c44c3670da10f6e286ad4e14e6af2bc5cc015f
parentf513a9193cdde47d1da7f647088beec8f280e4f3 (diff)
downloadqmk_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
-rw-r--r--drivers/avr/glcdfont.c13
-rw-r--r--drivers/oled/glcdfont.c11
-rw-r--r--drivers/oled/oled_driver.c11
-rw-r--r--keyboards/claw44/lib/glcdfont.c13
-rw-r--r--keyboards/comet46/lib/glcdfont.c13
-rw-r--r--keyboards/comet46/lib/keylogger.c8
-rw-r--r--keyboards/crkbd/keymaps/drashna/glcdfont.c11
-rw-r--r--keyboards/crkbd/keymaps/kidbrazil/glcdfont.c13
-rw-r--r--keyboards/crkbd/keymaps/rpbaptist/glcdfont.c11
-rw-r--r--keyboards/crkbd/keymaps/soundmonster/glcdfont.c11
-rw-r--r--keyboards/crkbd/lib/glcdfont.c13
-rw-r--r--keyboards/gergo/keymaps/oled/glcdfont.c3
-rw-r--r--keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c11
-rw-r--r--keyboards/helix/common/glcdfont.c13
-rw-r--r--keyboards/helix/rev2/keymaps/froggy/helixfont.h13
-rw-r--r--keyboards/lily58/lib/glcdfont.c13
-rw-r--r--keyboards/orthodox/common/glcdfont.c13
-rw-r--r--keyboards/rgbkb/sol/common/glcdfont.c11
-rw-r--r--keyboards/rgbkb/zen/common/glcdfont.c11
-rw-r--r--keyboards/rgbkb/zygomorph/common/glcdfont.c13
-rw-r--r--keyboards/treadstone48/common/glcdfont.c13
-rw-r--r--keyboards/uzu42/keymaps/default/glcdfont_uzu42.c13
-rw-r--r--keyboards/yosino58/lib/glcdfont.c13
-rw-r--r--keyboards/yosino58/lib/glcdfont_.c13
-rw-r--r--tmk_core/common/progmem.h5
-rw-r--r--users/drashna/font_gmk_bad.h9
-rw-r--r--users/drashna/hue_manitee_font.h9
-rw-r--r--users/tominabox1/doug.c13
28 files changed, 31 insertions, 286 deletions
diff --git a/drivers/avr/glcdfont.c b/drivers/avr/glcdfont.c
index 2c332ea6d..5e763b054 100644
--- a/drivers/avr/glcdfont.c
+++ b/drivers/avr/glcdfont.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 7
@@ -31,4 +21,3 @@ static const unsigned char font[] PROGMEM = {
31 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 21 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
32 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 22 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
33}; 23};
34#endif // FONT5X7_H
diff --git a/drivers/oled/glcdfont.c b/drivers/oled/glcdfont.c
index 95c5d2ebf..de5896018 100644
--- a/drivers/oled/glcdfont.c
+++ b/drivers/oled/glcdfont.c
@@ -1,13 +1,4 @@
1#pragma once 1#include "progmem.h"
2
3#ifdef __AVR__
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 2
12// Helidox 8x6 font with QMK Firmware Logo 3// Helidox 8x6 font with QMK Firmware Logo
13// Online editor: http://teripom.x0.com/ 4// Online editor: http://teripom.x0.com/
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
index e541228ea..d03b2de3a 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/>.
22 22
23#include <string.h> 23#include <string.h>
24 24
25#if defined(__AVR__) 25#include "progmem.h"
26# include <avr/io.h> 26#ifndef __AVR__
27# include <avr/pgmspace.h>
28#elif defined(ESP8266)
29# include <pgmspace.h>
30#else // defined(ESP8266)
31# define PROGMEM
32# define memcpy_P(des, src, len) memcpy(des, src, len) 27# define memcpy_P(des, src, len) memcpy(des, src, len)
33#endif // defined(__AVR__) 28#endif
34 29
35// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf 30// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
36// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf 31// 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 91f53d9c2..9fa1c806a 100644
--- a/keyboards/claw44/lib/glcdfont.c
+++ b/keyboards/claw44/lib/glcdfont.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
17const unsigned char font[] PROGMEM = { 7const unsigned char font[] PROGMEM = {
@@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
2400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2300x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2410x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2310x00, 0x00, 0x00, 0x00, 0x00, 0x00,
242}; 232};
243#endif // FONT5X7_H
diff --git a/keyboards/comet46/lib/glcdfont.c b/keyboards/comet46/lib/glcdfont.c
index e912d2233..361d0c3dc 100644
--- a/keyboards/comet46/lib/glcdfont.c
+++ b/keyboards/comet46/lib/glcdfont.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 7
@@ -145,4 +135,3 @@ const unsigned char font[] PROGMEM = {
145 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 135 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
146 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00 136 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
147}; 137};
148#endif // FONT5X7_H
diff --git a/keyboards/comet46/lib/keylogger.c b/keyboards/comet46/lib/keylogger.c
index 184f60109..a0abdd79a 100644
--- a/keyboards/comet46/lib/keylogger.c
+++ b/keyboards/comet46/lib/keylogger.c
@@ -1,11 +1,5 @@
1#include <stdio.h> 1#include <stdio.h>
2 2#include "progmem.h"
3#ifdef __AVR__
4 #include <avr/io.h>
5 #include <avr/pgmspace.h>
6#else
7 #define PROGMEM
8#endif
9 3
10#define NUM_USB_HID_KEYCODES 255 4#define NUM_USB_HID_KEYCODES 255
11#define LEN_KEYCODE_STR 4 5#define LEN_KEYCODE_STR 4
diff --git a/keyboards/crkbd/keymaps/drashna/glcdfont.c b/keyboards/crkbd/keymaps/drashna/glcdfont.c
index 2bfc3fac6..10ce3b345 100644
--- a/keyboards/crkbd/keymaps/drashna/glcdfont.c
+++ b/keyboards/crkbd/keymaps/drashna/glcdfont.c
@@ -1,13 +1,4 @@
1#pragma once 1#include "progmem.h"
2
3#ifdef __AVR__
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 2
12// Corne 8x6 font with QMK Firmware Logo 3// Corne 8x6 font with QMK Firmware Logo
13// Online editor: https://helixfonteditor.netlify.com/ 4// Online editor: https://helixfonteditor.netlify.com/
diff --git a/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c b/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c
index a67c32924..ea1f3bd76 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c
+++ b/keyboards/crkbd/keymaps/kidbrazil/glcdfont.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
17const unsigned char font[] PROGMEM = { 7const 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
diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c
index 044c16d9c..ac1f11dbb 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c
@@ -1,13 +1,4 @@
1#pragma once 1#include "progmem.h"
2
3#ifdef __AVR__
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 2
12// Helidox 8x6 font with QMK Firmware Logo 3// Helidox 8x6 font with QMK Firmware Logo
13// Online editor: http://teripom.x0.com/ 4// Online editor: http://teripom.x0.com/
diff --git a/keyboards/crkbd/keymaps/soundmonster/glcdfont.c b/keyboards/crkbd/keymaps/soundmonster/glcdfont.c
index 291445b5e..588ecfd8c 100644
--- a/keyboards/crkbd/keymaps/soundmonster/glcdfont.c
+++ b/keyboards/crkbd/keymaps/soundmonster/glcdfont.c
@@ -1,13 +1,4 @@
1#pragma once 1#include "progmem.h"
2
3#ifdef __AVR__
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 2
12// Corne 8x6 font with QMK Firmware Logo 3// Corne 8x6 font with QMK Firmware Logo
13// Online editor: https://helixfonteditor.netlify.com/ 4// Online editor: https://helixfonteditor.netlify.com/
diff --git a/keyboards/crkbd/lib/glcdfont.c b/keyboards/crkbd/lib/glcdfont.c
index f7567c57c..41041f12b 100644
--- a/keyboards/crkbd/lib/glcdfont.c
+++ b/keyboards/crkbd/lib/glcdfont.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
17const unsigned char font[] PROGMEM = { 7const unsigned char font[] PROGMEM = {
@@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
2400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2300x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2410x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2310x00, 0x00, 0x00, 0x00, 0x00, 0x00,
242}; 232};
243#endif // FONT5X7_H
diff --git a/keyboards/gergo/keymaps/oled/glcdfont.c b/keyboards/gergo/keymaps/oled/glcdfont.c
index cf189e6e5..687f1a6a9 100644
--- a/keyboards/gergo/keymaps/oled/glcdfont.c
+++ b/keyboards/gergo/keymaps/oled/glcdfont.c
@@ -1,7 +1,6 @@
1// 'loveLain', 128x32px 1// 'loveLain', 128x32px
2 2
3#include <avr/io.h> 3#include "progmem.h"
4#include <avr/pgmspace.h>
5 4
6static const unsigned char font[] PROGMEM = { 5static const unsigned char font[] PROGMEM = {
70x00, 0x00, 0x00, 0x00, 0x00, 0x00, 60x00, 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 b7ad73bfa..181b073ab 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c
@@ -1,13 +1,4 @@
1#pragma once 1#include "progmem.h"
2
3#ifdef __AVR__
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 2
12// Helidox 8x6 font with QMK Firmware Logo 3// Helidox 8x6 font with QMK Firmware Logo
13// Online editor: http://teripom.x0.com/ 4// Online editor: http://teripom.x0.com/
diff --git a/keyboards/helix/common/glcdfont.c b/keyboards/helix/common/glcdfont.c
index 89665ba07..697d58886 100644
--- a/keyboards/helix/common/glcdfont.c
+++ b/keyboards/helix/common/glcdfont.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 7
@@ -241,4 +231,3 @@ static const unsigned char font[] PROGMEM = {
241 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 231 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
242 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 232 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
243}; 233};
244#endif // FONT5X7_H
diff --git a/keyboards/helix/rev2/keymaps/froggy/helixfont.h b/keyboards/helix/rev2/keymaps/froggy/helixfont.h
index 7f5474815..5360eace9 100644
--- a/keyboards/helix/rev2/keymaps/froggy/helixfont.h
+++ b/keyboards/helix/rev2/keymaps/froggy/helixfont.h
@@ -1,17 +1,9 @@
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#pragma once
5#define FONT5X7_H
6 5
7#ifdef __AVR__ 6#include "progmem.h"
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 7
16// Standard ASCII 5x7 font 8// Standard ASCII 5x7 font
17 9
@@ -241,4 +233,3 @@ static const unsigned char font[] PROGMEM = {
2410x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2330x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2420x00, 0x00, 0x00, 0x00, 0x00, 0x00 2340x00, 0x00, 0x00, 0x00, 0x00, 0x00
243}; 235};
244#endif // FONT5X7_H
diff --git a/keyboards/lily58/lib/glcdfont.c b/keyboards/lily58/lib/glcdfont.c
index c691ea9d0..94f026ba9 100644
--- a/keyboards/lily58/lib/glcdfont.c
+++ b/keyboards/lily58/lib/glcdfont.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
17const unsigned char font[] PROGMEM = { 7const 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
diff --git a/keyboards/orthodox/common/glcdfont.c b/keyboards/orthodox/common/glcdfont.c
index 6f88bd23a..d607d34b7 100644
--- a/keyboards/orthodox/common/glcdfont.c
+++ b/keyboards/orthodox/common/glcdfont.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 7
@@ -273,4 +263,3 @@ static const unsigned char font[] PROGMEM = {
273 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 263 0x00, 0x3C, 0x3C, 0x3C, 0x3C,
274 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP 264 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP
275}; 265};
276#endif // FONT5X7_H
diff --git a/keyboards/rgbkb/sol/common/glcdfont.c b/keyboards/rgbkb/sol/common/glcdfont.c
index 61b40c092..6b75af848 100644
--- a/keyboards/rgbkb/sol/common/glcdfont.c
+++ b/keyboards/rgbkb/sol/common/glcdfont.c
@@ -1,13 +1,4 @@
1#pragma once 1#include "progmem.h"
2
3#ifdef __AVR__
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 2
12// Helidox 8x6 font with RGBKB SOL Logo 3// Helidox 8x6 font with RGBKB SOL Logo
13// Online editor: http://teripom.x0.com/ 4// Online editor: http://teripom.x0.com/
diff --git a/keyboards/rgbkb/zen/common/glcdfont.c b/keyboards/rgbkb/zen/common/glcdfont.c
index 3b4ccfa95..bc68c8729 100644
--- a/keyboards/rgbkb/zen/common/glcdfont.c
+++ b/keyboards/rgbkb/zen/common/glcdfont.c
@@ -1,15 +1,6 @@
1// This is the SOL 6x8 font 1// This is the SOL 6x8 font
2 2
3#pragma once 3#include "progmem.h"
4
5#ifdef __AVR__
6 #include <avr/io.h>
7 #include <avr/pgmspace.h>
8#elif defined(ESP8266)
9 #include <pgmspace.h>
10#else
11 #define PROGMEM
12#endif
13 4
14static const unsigned char font[] PROGMEM = { 5static const unsigned char font[] PROGMEM = {
15 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 6 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/keyboards/rgbkb/zygomorph/common/glcdfont.c b/keyboards/rgbkb/zygomorph/common/glcdfont.c
index 89665ba07..697d58886 100644
--- a/keyboards/rgbkb/zygomorph/common/glcdfont.c
+++ b/keyboards/rgbkb/zygomorph/common/glcdfont.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 7
@@ -241,4 +231,3 @@ static const unsigned char font[] PROGMEM = {
241 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 231 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
242 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 232 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
243}; 233};
244#endif // FONT5X7_H
diff --git a/keyboards/treadstone48/common/glcdfont.c b/keyboards/treadstone48/common/glcdfont.c
index 32c688e2b..003ce1a87 100644
--- a/keyboards/treadstone48/common/glcdfont.c
+++ b/keyboards/treadstone48/common/glcdfont.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 7
@@ -241,4 +231,3 @@ static const unsigned char font[] PROGMEM = {
241 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 231 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
242 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 232 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
243}; 233};
244#endif // FONT5X7_H
diff --git a/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c b/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c
index f5524ec73..5c3fa80d7 100644
--- a/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c
+++ b/keyboards/uzu42/keymaps/default/glcdfont_uzu42.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
17const unsigned char font[] PROGMEM = { 7const unsigned char font[] PROGMEM = {
@@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
2400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2300x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2410x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2310x00, 0x00, 0x00, 0x00, 0x00, 0x00,
242}; 232};
243#endif // FONT5X7_H
diff --git a/keyboards/yosino58/lib/glcdfont.c b/keyboards/yosino58/lib/glcdfont.c
index 01b656cc6..f393df334 100644
--- a/keyboards/yosino58/lib/glcdfont.c
+++ b/keyboards/yosino58/lib/glcdfont.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
17const unsigned char font[] PROGMEM = { 7const unsigned char font[] PROGMEM = {
@@ -272,4 +262,3 @@ const unsigned char font[] PROGMEM = {
272 0xF0, 0xF8, 0xF8, 0xFC, 0xFE, 0xFF, 262 0xF0, 0xF8, 0xF8, 0xFC, 0xFE, 0xFF,
273 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F 263 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F
274}; 264};
275#endif // FONT5X7_H
diff --git a/keyboards/yosino58/lib/glcdfont_.c b/keyboards/yosino58/lib/glcdfont_.c
index 122b26afa..ad7a564a6 100644
--- a/keyboards/yosino58/lib/glcdfont_.c
+++ b/keyboards/yosino58/lib/glcdfont_.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
17const unsigned char font[] PROGMEM = { 7const 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
diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h
index 88373f478..a06d0f940 100644
--- a/tmk_core/common/progmem.h
+++ b/tmk_core/common/progmem.h
@@ -1,5 +1,4 @@
1#ifndef PROGMEM_H 1#pragma once
2#define PROGMEM_H 1
3 2
4#if defined(__AVR__) 3#if defined(__AVR__)
5# include <avr/pgmspace.h> 4# include <avr/pgmspace.h>
@@ -9,5 +8,3 @@
9# define pgm_read_word(p) *((uint16_t*)(p)) 8# define pgm_read_word(p) *((uint16_t*)(p))
10# define pgm_read_dword(p) *((uint32_t*)(p)) 9# define pgm_read_dword(p) *((uint32_t*)(p))
11#endif 10#endif
12
13#endif
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
17const unsigned char font[] PROGMEM = { 7const unsigned char font[] PROGMEM = {
@@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
2400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2300x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2410x00, 0x00, 0x00, 0x00, 0x00, 0x00, 2310x00, 0x00, 0x00, 0x00, 0x00, 0x00,
242}; 232};
243#endif // FONT5X7_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 12:25:05 +0000