diff options
| author |  Ryan <fauxpark@gmail.com> | 2020-03-01 17:56:50 +1100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-03-01 17:56:50 +1100 |
| commit | c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 (patch) | |
| tree | 14c44c3670da10f6e286ad4e14e6af2bc5cc015f /drivers | |
| parent | f513a9193cdde47d1da7f647088beec8f280e4f3 (diff) | |
| download | qmk_firmware-c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8.tar.gz | |
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 (limited to 'drivers')
| -rw-r--r-- | drivers/avr/glcdfont.c | 13 | ||||
| -rw-r--r-- | drivers/oled/glcdfont.c | 11 | ||||
| -rw-r--r-- | drivers/oled/oled_driver.c | 11 |
3 files changed, 5 insertions, 30 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 @@ // 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 95c5d2ebf..de5896018 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 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/>. #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 |