Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b8b8a294d3
|
@ -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
|
|
||||||
|
|
Loading…
Reference in New Issue