Skip to content

Commit

Permalink
Clean up includes for glcdfont headers (qmk#7745)
Browse files Browse the repository at this point in the history
* Clean up includes for glcdfont headers

* Remove pragma once, most of these are not headers

* Missed these
  • Loading branch information
fauxpark authored and rhruiz committed Mar 1, 2020
1 parent ae50c61 commit 7e390b5
Show file tree
Hide file tree
Showing 28 changed files with 31 additions and 286 deletions.
13 changes: 1 addition & 12 deletions drivers/avr/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
11 changes: 1 addition & 10 deletions drivers/oled/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
11 changes: 3 additions & 8 deletions drivers/oled/oled_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 1 addition & 12 deletions keyboards/claw44/lib/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#endif // FONT5X7_H
13 changes: 1 addition & 12 deletions keyboards/comet46/lib/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -145,4 +135,3 @@ const unsigned char font[] PROGMEM = {
0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
};
#endif // FONT5X7_H
8 changes: 1 addition & 7 deletions keyboards/comet46/lib/keylogger.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 1 addition & 10 deletions keyboards/crkbd/keymaps/drashna/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
13 changes: 1 addition & 12 deletions keyboards/crkbd/keymaps/kidbrazil/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#endif // FONT5X7_H
11 changes: 1 addition & 10 deletions keyboards/crkbd/keymaps/rpbaptist/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
11 changes: 1 addition & 10 deletions keyboards/crkbd/keymaps/soundmonster/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
13 changes: 1 addition & 12 deletions keyboards/crkbd/lib/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#endif // FONT5X7_H
3 changes: 1 addition & 2 deletions keyboards/gergo/keymaps/oled/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
11 changes: 1 addition & 10 deletions keyboards/handwired/owlet60/keymaps/oled_testing/customfont.c
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
13 changes: 1 addition & 12 deletions keyboards/helix/common/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
13 changes: 2 additions & 11 deletions keyboards/helix/rev2/keymaps/froggy/helixfont.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
13 changes: 1 addition & 12 deletions keyboards/lily58/lib/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -240,4 +230,3 @@ const unsigned char font[] PROGMEM = {
0x0F, 0x0F, 0x03, 0x03, 0x01, 0x01,
0x07, 0x3F, 0xFF, 0x00, 0x00, 0x00,
};
#endif // FONT5X7_H
13 changes: 1 addition & 12 deletions keyboards/orthodox/common/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
11 changes: 1 addition & 10 deletions keyboards/rgbkb/sol/common/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
11 changes: 1 addition & 10 deletions keyboards/rgbkb/zen/common/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
13 changes: 1 addition & 12 deletions keyboards/rgbkb/zygomorph/common/glcdfont.c
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Loading

0 comments on commit 7e390b5

Please sign in to comment.