g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up includes for glcdfont headers (#7745) 

* Clean up includes for glcdfont headers

* Remove pragma once, most of these are not headers

* Missed these
master
Ryan 2020-03-01 17:56:50 +11:00 committed by GitHub
parent f513a9193c
commit c9e3fa6f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 31 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/avr/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
# include <avr/io.h>
# include <avr/pgmspace.h>
#elif defined(ESP8266)
# include <pgmspace.h>
#else
# define PROGMEM
#endif
// Standard ASCII 5x7 font // 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 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 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

11
drivers/oled/glcdfont.c
View File

@ -1,13 +1,4 @@
#pragma once #include "progmem.h"
#ifdef __AVR__
# include <avr/io.h>
# include <avr/pgmspace.h>
#elif defined(ESP8266)
# include <pgmspace.h>
#else
# define PROGMEM
#endif
// Helidox 8x6 font with QMK Firmware Logo // Helidox 8x6 font with QMK Firmware Logo
// Online editor: http://teripom.x0.com/ // Online editor: http://teripom.x0.com/

11
drivers/oled/oled_driver.c
View File

@ -22,15 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <string.h> #include <string.h>
#if defined(__AVR__) #include "progmem.h"
# include <avr/io.h> #ifndef __AVR__
# include <avr/pgmspace.h>
#elif defined(ESP8266)
# include <pgmspace.h>
#else // defined(ESP8266)
# define PROGMEM
# define memcpy_P(des, src, len) memcpy(des, src, len) # 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 // 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 // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf

13
keyboards/claw44/lib/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
#endif // FONT5X7_H

13
keyboards/comet46/lib/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
@ -145,4 +135,3 @@ const unsigned char font[] PROGMEM = {
0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
}; };
#endif // FONT5X7_H

8
keyboards/comet46/lib/keylogger.c
View File

@ -1,11 +1,5 @@
#include <stdio.h> #include <stdio.h>
#include "progmem.h"
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#else
#define PROGMEM
#endif
#define NUM_USB_HID_KEYCODES 255 #define NUM_USB_HID_KEYCODES 255
#define LEN_KEYCODE_STR 4 #define LEN_KEYCODE_STR 4

11
keyboards/crkbd/keymaps/drashna/glcdfont.c
View File

@ -1,13 +1,4 @@
#pragma once #include "progmem.h"
#ifdef __AVR__
# include <avr/io.h>
# include <avr/pgmspace.h>
#elif defined(ESP8266)
# include <pgmspace.h>
#else
# define PROGMEM
#endif
// Corne 8x6 font with QMK Firmware Logo // Corne 8x6 font with QMK Firmware Logo
// Online editor: https://helixfonteditor.netlify.com/ // Online editor: https://helixfonteditor.netlify.com/

13
keyboards/crkbd/keymaps/kidbrazil/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
#endif // FONT5X7_H

11
keyboards/crkbd/keymaps/rpbaptist/glcdfont.c
View File

@ -1,13 +1,4 @@
#pragma once #include "progmem.h"
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Helidox 8x6 font with QMK Firmware Logo // Helidox 8x6 font with QMK Firmware Logo
// Online editor: http://teripom.x0.com/ // Online editor: http://teripom.x0.com/

11
keyboards/crkbd/keymaps/soundmonster/glcdfont.c
View File

@ -1,13 +1,4 @@
#pragma once #include "progmem.h"
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Corne 8x6 font with QMK Firmware Logo // Corne 8x6 font with QMK Firmware Logo
// Online editor: https://helixfonteditor.netlify.com/ // Online editor: https://helixfonteditor.netlify.com/

13
keyboards/crkbd/lib/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
#endif // FONT5X7_H

3
keyboards/gergo/keymaps/oled/glcdfont.c
View File

@ -1,7 +1,6 @@
// 'loveLain', 128x32px // 'loveLain', 128x32px
#include <avr/io.h> #include "progmem.h"
#include <avr/pgmspace.h>
static const unsigned char font[] PROGMEM = { static const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

11
keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c
View File

@ -1,13 +1,4 @@
#pragma once #include "progmem.h"
#ifdef __AVR__
# include <avr/io.h>
# include <avr/pgmspace.h>
#elif defined(ESP8266)
# include <pgmspace.h>
#else
# define PROGMEM
#endif
// Helidox 8x6 font with QMK Firmware Logo // Helidox 8x6 font with QMK Firmware Logo
// Online editor: http://teripom.x0.com/ // Online editor: http://teripom.x0.com/

13
keyboards/helix/common/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}; };
#endif // FONT5X7_H

13
keyboards/helix/rev2/keymaps/froggy/helixfont.h
View File

@ -1,17 +1,9 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #pragma once
#define FONT5X7_H
#ifdef __AVR__ #include "progmem.h"
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}; };
#endif // FONT5X7_H

13
keyboards/lily58/lib/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
#endif // FONT5X7_H

13
keyboards/orthodox/common/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
@ -273,4 +263,3 @@ static const unsigned char font[] PROGMEM = {
0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x3C, 0x3C, 0x3C, 0x3C,
0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP
}; };
#endif // FONT5X7_H

11
keyboards/rgbkb/sol/common/glcdfont.c
View File

@ -1,13 +1,4 @@
#pragma once #include "progmem.h"
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Helidox 8x6 font with RGBKB SOL Logo // Helidox 8x6 font with RGBKB SOL Logo
// Online editor: http://teripom.x0.com/ // Online editor: http://teripom.x0.com/

11
keyboards/rgbkb/zen/common/glcdfont.c
View File

@ -1,15 +1,6 @@
// This is the SOL 6x8 font // This is the SOL 6x8 font
#pragma once #include "progmem.h"
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
static const unsigned char font[] PROGMEM = { static const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

13
keyboards/rgbkb/zygomorph/common/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}; };
#endif // FONT5X7_H

13
keyboards/treadstone48/common/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
#endif // FONT5X7_H

13
keyboards/uzu42/keymaps/default/glcdfont_uzu42.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
#endif // FONT5X7_H

13
keyboards/yosino58/lib/glcdfont.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { const unsigned char font[] PROGMEM = {
@ -272,4 +262,3 @@ const unsigned char font[] PROGMEM = {
0xF0, 0xF8, 0xF8, 0xFC, 0xFE, 0xFF, 0xF0, 0xF8, 0xF8, 0xFC, 0xFE, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F
}; };
#endif // FONT5X7_H

13
keyboards/yosino58/lib/glcdfont_.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}; };
#endif // FONT5X7_H

5
tmk_core/common/progmem.h
View File

@ -1,5 +1,4 @@
#ifndef PROGMEM_H #pragma once
#define PROGMEM_H 1
#if defined(__AVR__) #if defined(__AVR__)
# include <avr/pgmspace.h> # include <avr/pgmspace.h>
@ -9,5 +8,3 @@
# define pgm_read_word(p) *((uint16_t*)(p)) # define pgm_read_word(p) *((uint16_t*)(p))
# define pgm_read_dword(p) *((uint32_t*)(p)) # define pgm_read_dword(p) *((uint32_t*)(p))
#endif #endif
#endif

9
users/drashna/font_gmk_bad.h
View File

@ -1,13 +1,6 @@
#pragma once #pragma once
#ifdef __AVR__ #include "progmem.h"
# include <avr/io.h>
# include <avr/pgmspace.h>
#elif defined(ESP8266)
# include <pgmspace.h>
#else
# define PROGMEM
#endif
// Corne 8x6 font with QMK Firmware Logo // Corne 8x6 font with QMK Firmware Logo
// Online editor: https://helixfonteditor.netlify.com/ // Online editor: https://helixfonteditor.netlify.com/

9
users/drashna/hue_manitee_font.h
View File

@ -1,13 +1,6 @@
#pragma once #pragma once
#ifdef __AVR__ #include "progmem.h"
# include <avr/io.h>
# include <avr/pgmspace.h>
#elif defined(ESP8266)
# include <pgmspace.h>
#else
# define PROGMEM
#endif
// Corne 8x6 font with QMK Firmware Logo // Corne 8x6 font with QMK Firmware Logo
// Online editor: https://helixfonteditor.netlify.com/ // Online editor: https://helixfonteditor.netlify.com/

13
users/tominabox1/doug.c
View File

@ -1,17 +1,7 @@
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0. // This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
// See gfxfont.h for newer custom bitmap font info. // See gfxfont.h for newer custom bitmap font info.
#ifndef FONT5X7_H #include "progmem.h"
#define FONT5X7_H
#ifdef __AVR__
#include <avr/io.h>
#include <avr/pgmspace.h>
#elif defined(ESP8266)
#include <pgmspace.h>
#else
#define PROGMEM
#endif
// Standard ASCII 5x7 font // Standard ASCII 5x7 font
const unsigned char font[] PROGMEM = { 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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
#endif // FONT5X7_H