Skip to content

Commit d49e9e3

Browse files
lovyan03lovyan03
authored
Merge pull request #26 from m5stack/develop
0.0.16
2 parents a8e406a + 3f54b0c commit d49e9e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+7416
-2119
lines changed

‎library.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"type": "git",
1111
"url": "https://github.com/m5stack/M5GFX.git"
1212
},
13-
"version": "0.0.15",
14-
"framework": "arduino",
13+
"version": "0.0.16",
14+
"frameworks": "arduino",
1515
"platforms": "espressif32",
1616
"headers": "M5GFX.h"
1717
}

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=M5GFX
2-
version=0.0.15
2+
version=0.0.16
33
author=M5Stack
44
maintainer=M5Stack
55
sentence=Library for M5Stack All Display

‎src/M5AtomDisplay.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "M5GFX.h"
1212

1313
#include <sdkconfig.h>
14-
#include <esp_efuse.h>
1514
#include <soc/efuse_reg.h>
1615

1716
#ifndef M5ATOMDISPLAY_LOGICAL_WIDTH

‎src/M5GFX.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <nvs.h>
1616
#include <esp_log.h>
1717
#include <driver/i2c.h>
18-
#include <esp_efuse.h>
1918
#include <soc/efuse_reg.h>
2019

2120
namespace m5gfx
@@ -537,7 +536,8 @@ namespace m5gfx
537536
board = board_t::board_M5ATOM;
538537
goto init_clear;
539538
}
540-
else /// not PICO-D4
539+
else
540+
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6)
541541
{
542542

543543
/// AXP192の有無を最初に判定し、分岐する。;

‎src/M5GFX.h‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ namespace m5gfx
8585
static constexpr int ILI9341_MAROON = 0x7800; /* 128, 0, 0 */
8686
static constexpr int ILI9341_PURPLE = 0x780F; /* 128, 0, 128 */
8787
static constexpr int ILI9341_OLIVE = 0x7BE0; /* 128, 128, 0 */
88-
static constexpr int ILI9341_LIGHTGREY = 0xC618; /* 192, 192, 192 */
88+
static constexpr int ILI9341_LIGHTGREY = 0xD69A; /* 211, 211, 211 */
8989
static constexpr int ILI9341_DARKGREY = 0x7BEF; /* 128, 128, 128 */
9090
static constexpr int ILI9341_BLUE = 0x001F; /* 0, 0, 255 */
9191
static constexpr int ILI9341_GREEN = 0x07E0; /* 0, 255, 0 */
@@ -94,29 +94,39 @@ namespace m5gfx
9494
static constexpr int ILI9341_MAGENTA = 0xF81F; /* 255, 0, 255 */
9595
static constexpr int ILI9341_YELLOW = 0xFFE0; /* 255, 255, 0 */
9696
static constexpr int ILI9341_WHITE = 0xFFFF; /* 255, 255, 255 */
97-
static constexpr int ILI9341_ORANGE = 0xFD20; /* 255, 165, 0 */
98-
static constexpr int ILI9341_GREENYELLOW = 0xAFE5; /* 173, 255, 47 */
99-
static constexpr int ILI9341_PINK = 0xF81F;
100-
101-
static constexpr int BLACK = 0x0000; /* 0, 0, 0 */
102-
static constexpr int NAVY = 0x000F; /* 0, 0, 128 */
103-
static constexpr int DARKGREEN = 0x03E0; /* 0, 128, 0 */
104-
static constexpr int DARKCYAN = 0x03EF; /* 0, 128, 128 */
105-
static constexpr int MAROON = 0x7800; /* 128, 0, 0 */
106-
static constexpr int PURPLE = 0x780F; /* 128, 0, 128 */
107-
static constexpr int OLIVE = 0x7BE0; /* 128, 128, 0 */
108-
static constexpr int LIGHTGREY = 0xC618; /* 192, 192, 192 */
109-
static constexpr int DARKGREY = 0x7BEF; /* 128, 128, 128 */
110-
static constexpr int BLUE = 0x001F; /* 0, 0, 255 */
111-
static constexpr int GREEN = 0x07E0; /* 0, 255, 0 */
112-
static constexpr int CYAN = 0x07FF; /* 0, 255, 255 */
113-
static constexpr int RED = 0xF800; /* 255, 0, 0 */
114-
static constexpr int MAGENTA = 0xF81F; /* 255, 0, 255 */
115-
static constexpr int YELLOW = 0xFFE0; /* 255, 255, 0 */
116-
static constexpr int WHITE = 0xFFFF; /* 255, 255, 255 */
117-
static constexpr int ORANGE = 0xFD20; /* 255, 165, 0 */
118-
static constexpr int GREENYELLOW = 0xAFE5; /* 173, 255, 47 */
119-
static constexpr int PINK = 0xF81F;
97+
static constexpr int ILI9341_ORANGE = 0xFDA0; /* 255, 180, 0 */
98+
static constexpr int ILI9341_GREENYELLOW = 0xB7E0; /* 180, 255, 0 */
99+
static constexpr int ILI9341_PINK = 0xFE19; /* 255, 192, 203 */
100+
static constexpr int ILI9341_BROWN = 0x9A60; /* 150, 75, 0 */
101+
static constexpr int ILI9341_GOLD = 0xFEA0; /* 255, 215, 0 */
102+
static constexpr int ILI9341_SILVER = 0xC618; /* 192, 192, 192 */
103+
static constexpr int ILI9341_SKYBLUE = 0x867D; /* 135, 206, 235 */
104+
static constexpr int ILI9341_VIOLET = 0x915C; /* 180, 46, 226 */
105+
106+
static constexpr int BLACK = 0x0000; /* 0, 0, 0 */
107+
static constexpr int NAVY = 0x000F; /* 0, 0, 128 */
108+
static constexpr int DARKGREEN = 0x03E0; /* 0, 128, 0 */
109+
static constexpr int DARKCYAN = 0x03EF; /* 0, 128, 128 */
110+
static constexpr int MAROON = 0x7800; /* 128, 0, 0 */
111+
static constexpr int PURPLE = 0x780F; /* 128, 0, 128 */
112+
static constexpr int OLIVE = 0x7BE0; /* 128, 128, 0 */
113+
static constexpr int LIGHTGREY = 0xD69A; /* 211, 211, 211 */
114+
static constexpr int DARKGREY = 0x7BEF; /* 128, 128, 128 */
115+
static constexpr int BLUE = 0x001F; /* 0, 0, 255 */
116+
static constexpr int GREEN = 0x07E0; /* 0, 255, 0 */
117+
static constexpr int CYAN = 0x07FF; /* 0, 255, 255 */
118+
static constexpr int RED = 0xF800; /* 255, 0, 0 */
119+
static constexpr int MAGENTA = 0xF81F; /* 255, 0, 255 */
120+
static constexpr int YELLOW = 0xFFE0; /* 255, 255, 0 */
121+
static constexpr int WHITE = 0xFFFF; /* 255, 255, 255 */
122+
static constexpr int ORANGE = 0xFDA0; /* 255, 180, 0 */
123+
static constexpr int GREENYELLOW = 0xB7E0; /* 180, 255, 0 */
124+
static constexpr int PINK = 0xFE19; /* 255, 192, 203 */
125+
static constexpr int BROWN = 0x9A60; /* 150, 75, 0 */
126+
static constexpr int GOLD = 0xFEA0; /* 255, 215, 0 */
127+
static constexpr int SILVER = 0xC618; /* 192, 192, 192 */
128+
static constexpr int SKYBLUE = 0x867D; /* 135, 206, 235 */
129+
static constexpr int VIOLET = 0x915C; /* 180, 46, 226 */
120130
}
121131

122132
namespace tft_command

‎src/lgfx/Fonts/Custom/DejaVu12.h‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
/* DejaVu 12
2+
original ttf url : https://dejavu-fonts.github.io/
3+
original license : https://dejavu-fonts.github.io/License.html
4+
This data has been converted to AdafruitGFX font format from DejaVuSans.ttf.
5+
*/
6+
const uint8_t DejaVu12Bitmaps[] PROGMEM = {
7+
0xfd, 0x80, 0xb6, 0x80, 0x12, 0x14, 0x7f, 0x24, 0x24, 0xfe, 0x28, 0x48, 0x21, 0xca, 0xa8, 0xe0,
8+
0xe2, 0xaa, 0x70, 0x82, 0x00, 0x61, 0x24, 0x89, 0x22, 0x50, 0x6d, 0x82, 0x91, 0x24, 0x49, 0x21,
9+
0x80, 0x30, 0x24, 0x10, 0x0c, 0x05, 0x14, 0x4a, 0x19, 0x8c, 0x7b, 0x00, 0xe0, 0x69, 0x49, 0x24,
10+
0x48, 0x80, 0x89, 0x12, 0x49, 0x4a, 0x00, 0x25, 0x5c, 0xea, 0x90, 0x10, 0x20, 0x47, 0xf1, 0x02,
11+
0x04, 0x00, 0xe0, 0xe0, 0xc0, 0x11, 0x22, 0x24, 0x44, 0x88, 0x79, 0x28, 0x61, 0x86, 0x18, 0x52,
12+
0x78, 0xe1, 0x08, 0x42, 0x10, 0x84, 0xf8, 0x79, 0x18, 0x10, 0x20, 0x82, 0x08, 0x20, 0xfc, 0x7a,
13+
0x10, 0x41, 0x38, 0x30, 0x63, 0x78, 0x18, 0x62, 0x92, 0x4a, 0x2f, 0xc2, 0x08, 0xfa, 0x08, 0x3c,
14+
0x0c, 0x10, 0x63, 0x78, 0x39, 0x18, 0x3e, 0xce, 0x18, 0x53, 0x78, 0xfc, 0x10, 0x82, 0x10, 0x42,
15+
0x08, 0x40, 0x7b, 0x38, 0x73, 0x7b, 0x38, 0x73, 0x78, 0x7b, 0x28, 0x61, 0xcd, 0xd0, 0x62, 0x70,
16+
0xcc, 0xce, 0x03, 0x1e, 0xe0, 0xe0, 0x1e, 0x03, 0xff, 0x00, 0xff, 0xc0, 0x78, 0x07, 0x07, 0x78,
17+
0xc0, 0x74, 0x42, 0x22, 0x10, 0x04, 0x20, 0x1f, 0x06, 0x19, 0x01, 0x46, 0x99, 0x13, 0x22, 0x64,
18+
0x54, 0x6c, 0x40, 0x04, 0x10, 0x7c, 0x00, 0x18, 0x18, 0x24, 0x24, 0x24, 0x42, 0x7e, 0x42, 0x81,
19+
0xfa, 0x18, 0x61, 0xfa, 0x18, 0x61, 0xf8, 0x39, 0x18, 0x20, 0x82, 0x08, 0x11, 0x38, 0xf9, 0x0a,
20+
0x0c, 0x18, 0x30, 0x60, 0xc2, 0xf8, 0xfe, 0x08, 0x20, 0xfe, 0x08, 0x20, 0xfc, 0xfc, 0x21, 0x0f,
21+
0xc2, 0x10, 0x80, 0x3c, 0x86, 0x04, 0x08, 0xf0, 0x60, 0xa1, 0x3c, 0x83, 0x06, 0x0c, 0x1f, 0xf0,
22+
0x60, 0xc1, 0x82, 0xff, 0x80, 0x24, 0x92, 0x49, 0x27, 0x00, 0x85, 0x12, 0x45, 0x0c, 0x14, 0x24,
23+
0x44, 0x84, 0x84, 0x21, 0x08, 0x42, 0x10, 0xf8, 0x81, 0xc3, 0xc3, 0xa5, 0xa5, 0x99, 0x99, 0x81,
24+
0x81, 0xc3, 0x86, 0x8d, 0x19, 0x31, 0x62, 0xc3, 0x86, 0x38, 0x8a, 0x0c, 0x18, 0x30, 0x60, 0xa2,
25+
0x38, 0xfa, 0x38, 0x63, 0xfa, 0x08, 0x20, 0x80, 0x38, 0x8a, 0x0c, 0x18, 0x30, 0x60, 0xa2, 0x38,
26+
0x10, 0x10, 0xf9, 0x1a, 0x14, 0x6f, 0x91, 0x21, 0x42, 0x82, 0x7b, 0x18, 0x30, 0x78, 0x30, 0x63,
27+
0x78, 0xfe, 0x20, 0x40, 0x81, 0x02, 0x04, 0x08, 0x10, 0x83, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xa2,
28+
0x38, 0x40, 0x90, 0x22, 0x10, 0x84, 0x21, 0x04, 0x81, 0x20, 0x30, 0x0c, 0x00, 0x84, 0x28, 0x89,
29+
0x11, 0x27, 0x22, 0xa8, 0x55, 0x0e, 0xe0, 0x88, 0x11, 0x00, 0xc6, 0x88, 0xa1, 0xc1, 0x07, 0x0a,
30+
0x22, 0x82, 0x82, 0x89, 0x11, 0x43, 0x82, 0x04, 0x08, 0x10, 0xfe, 0x04, 0x10, 0x41, 0x04, 0x10,
31+
0x40, 0xfe, 0xea, 0xaa, 0xac, 0x88, 0x44, 0x42, 0x22, 0x11, 0xd5, 0x55, 0x5c, 0x18, 0x24, 0x42,
32+
0xfc, 0x44, 0x7a, 0x30, 0x5f, 0x86, 0x37, 0x40, 0x82, 0x08, 0x2e, 0xca, 0x18, 0x61, 0xce, 0xe0,
33+
0x72, 0x61, 0x08, 0x25, 0xc0, 0x04, 0x10, 0x5d, 0xce, 0x18, 0x61, 0xcd, 0xd0, 0x39, 0x38, 0x7f,
34+
0x81, 0x13, 0x80, 0x34, 0x4f, 0x44, 0x44, 0x44, 0x77, 0x38, 0x61, 0x87, 0x37, 0x41, 0x4c, 0xe0,
35+
0x82, 0x08, 0x2e, 0xc6, 0x18, 0x61, 0x86, 0x10, 0xbf, 0x80, 0x45, 0x55, 0x56, 0x82, 0x08, 0x22,
36+
0x92, 0x8e, 0x28, 0x92, 0x20, 0xff, 0xc0, 0xb3, 0x66, 0x62, 0x31, 0x18, 0x8c, 0x46, 0x22, 0xbb,
37+
0x18, 0x61, 0x86, 0x18, 0x40, 0x7b, 0x38, 0x61, 0x87, 0x37, 0x80, 0xbb, 0x28, 0x61, 0x87, 0x3b,
38+
0xa0, 0x82, 0x00, 0x77, 0x38, 0x61, 0x87, 0x37, 0x41, 0x04, 0x10, 0xbc, 0x88, 0x88, 0x80, 0x72,
39+
0x28, 0x1c, 0x0a, 0x27, 0x00, 0x44, 0xf4, 0x44, 0x44, 0x30, 0x86, 0x18, 0x61, 0x86, 0x37, 0x40,
40+
0x42, 0x42, 0x24, 0x24, 0x24, 0x18, 0x18, 0x88, 0xc4, 0x57, 0x4a, 0xa5, 0x51, 0x10, 0x88, 0x85,
41+
0x24, 0x8c, 0x49, 0x28, 0x40, 0x42, 0x42, 0x24, 0x24, 0x14, 0x18, 0x08, 0x08, 0x10, 0x60, 0xf8,
42+
0x44, 0x44, 0x43, 0xe0, 0x19, 0x08, 0x42, 0x60, 0x84, 0x21, 0x06, 0xff, 0xf0, 0xc1, 0x08, 0x42,
43+
0x0c, 0x84, 0x21, 0x30, 0x00, 0x71, 0x8e, };
44+
45+
const GFXglyph DejaVu12Glyphs[] PROGMEM = {
46+
{ 0, 0, 0, 5, 0, 1 }, // 0x20 ' '
47+
{ 0, 1, 9, 6, 2, -8 }, // 0x21 '!'
48+
{ 2, 3, 3, 6, 1, -8 }, // 0x22 '"'
49+
{ 4, 8, 8, 11, 1, -7 }, // 0x23 '#'
50+
{ 12, 6, 11, 9, 2, -8 }, // 0x24 '$'
51+
{ 21, 10, 9, 12, 0, -8 }, // 0x25 '%'
52+
{ 33, 9, 9, 11, 1, -8 }, // 0x26 '&'
53+
{ 44, 1, 3, 4, 1, -8 }, // 0x27 '''
54+
{ 45, 3, 11, 6, 1, -9 }, // 0x28 '('
55+
{ 50, 3, 11, 6, 1, -9 }, // 0x29 ')'
56+
{ 55, 5, 6, 7, 1, -8 }, // 0x2a '*'
57+
{ 59, 7, 7, 11, 1, -6 }, // 0x2b '+'
58+
{ 66, 1, 3, 5, 1, -1 }, // 0x2c ','
59+
{ 67, 3, 1, 5, 1, -3 }, // 0x2d '-'
60+
{ 68, 1, 2, 5, 1, -1 }, // 0x2e '.'
61+
{ 69, 4, 10, 5, 0, -8 }, // 0x2f '/'
62+
{ 74, 6, 9, 9, 1, -8 }, // 0x30 '0'
63+
{ 81, 5, 9, 9, 1, -8 }, // 0x31 '1'
64+
{ 87, 7, 9, 9, 1, -8 }, // 0x32 '2'
65+
{ 95, 6, 9, 9, 1, -8 }, // 0x33 '3'
66+
{ 102, 6, 9, 9, 1, -8 }, // 0x34 '4'
67+
{ 109, 6, 9, 9, 1, -8 }, // 0x35 '5'
68+
{ 116, 6, 9, 9, 1, -8 }, // 0x36 '6'
69+
{ 123, 6, 9, 9, 1, -8 }, // 0x37 '7'
70+
{ 130, 6, 9, 9, 1, -8 }, // 0x38 '8'
71+
{ 137, 6, 9, 9, 1, -8 }, // 0x39 '9'
72+
{ 144, 1, 6, 5, 1, -5 }, // 0x3a ':'
73+
{ 145, 1, 7, 5, 1, -5 }, // 0x3b ';'
74+
{ 146, 8, 6, 11, 1, -6 }, // 0x3c '<'
75+
{ 152, 8, 3, 11, 1, -4 }, // 0x3d '='
76+
{ 155, 8, 6, 11, 1, -6 }, // 0x3e '>'
77+
{ 161, 5, 9, 7, 0, -8 }, // 0x3f '?'
78+
{ 167, 11, 11, 14, 1, -8 }, // 0x40 '@'
79+
{ 183, 8, 9, 9, 0, -8 }, // 0x41 'A'
80+
{ 192, 6, 9, 9, 1, -8 }, // 0x42 'B'
81+
{ 199, 6, 9, 9, 1, -8 }, // 0x43 'C'
82+
{ 206, 7, 9, 10, 1, -8 }, // 0x44 'D'
83+
{ 214, 6, 9, 9, 1, -8 }, // 0x45 'E'
84+
{ 221, 5, 9, 8, 1, -8 }, // 0x46 'F'
85+
{ 227, 7, 9, 10, 1, -8 }, // 0x47 'G'
86+
{ 235, 7, 9, 10, 1, -8 }, // 0x48 'H'
87+
{ 243, 1, 9, 4, 1, -8 }, // 0x49 'I'
88+
{ 245, 3, 11, 4, -1, -8 }, // 0x4a 'J'
89+
{ 250, 7, 9, 8, 1, -8 }, // 0x4b 'K'
90+
{ 258, 5, 9, 7, 1, -8 }, // 0x4c 'L'
91+
{ 264, 8, 9, 11, 1, -8 }, // 0x4d 'M'
92+
{ 273, 7, 9, 10, 1, -8 }, // 0x4e 'N'
93+
{ 281, 7, 9, 10, 1, -8 }, // 0x4f 'O'
94+
{ 289, 6, 9, 9, 1, -8 }, // 0x50 'P'
95+
{ 296, 7, 11, 10, 1, -8 }, // 0x51 'Q'
96+
{ 306, 7, 9, 9, 1, -8 }, // 0x52 'R'
97+
{ 314, 6, 9, 9, 1, -8 }, // 0x53 'S'
98+
{ 321, 7, 9, 8, 0, -8 }, // 0x54 'T'
99+
{ 329, 7, 9, 10, 1, -8 }, // 0x55 'U'
100+
{ 337, 10, 9, 9, -1, -8 }, // 0x56 'V'
101+
{ 349, 11, 9, 12, 0, -8 }, // 0x57 'W'
102+
{ 362, 7, 9, 8, 0, -8 }, // 0x58 'X'
103+
{ 370, 7, 9, 8, 0, -8 }, // 0x59 'Y'
104+
{ 378, 7, 9, 10, 1, -8 }, // 0x5a 'Z'
105+
{ 386, 2, 11, 6, 2, -8 }, // 0x5b '['
106+
{ 389, 4, 10, 5, 0, -8 }, // 0x5c '\'
107+
{ 394, 2, 11, 6, 1, -8 }, // 0x5d ']'
108+
{ 397, 8, 3, 11, 1, -8 }, // 0x5e '^'
109+
{ 400, 6, 1, 7, 0, 3 }, // 0x5f '_'
110+
{ 401, 3, 2, 7, 1, -9 }, // 0x60 '`'
111+
{ 402, 6, 7, 9, 1, -6 }, // 0x61 'a'
112+
{ 408, 6, 10, 9, 1, -9 }, // 0x62 'b'
113+
{ 416, 5, 7, 8, 1, -6 }, // 0x63 'c'
114+
{ 421, 6, 10, 9, 1, -9 }, // 0x64 'd'
115+
{ 429, 6, 7, 9, 1, -6 }, // 0x65 'e'
116+
{ 435, 4, 10, 5, 0, -9 }, // 0x66 'f'
117+
{ 440, 6, 10, 9, 1, -6 }, // 0x67 'g'
118+
{ 448, 6, 10, 9, 1, -9 }, // 0x68 'h'
119+
{ 456, 1, 9, 4, 1, -8 }, // 0x69 'i'
120+
{ 458, 2, 12, 4, 0, -8 }, // 0x6a 'j'
121+
{ 461, 6, 10, 8, 1, -9 }, // 0x6b 'k'
122+
{ 469, 1, 10, 4, 1, -9 }, // 0x6c 'l'
123+
{ 471, 9, 7, 12, 1, -6 }, // 0x6d 'm'
124+
{ 479, 6, 7, 9, 1, -6 }, // 0x6e 'n'
125+
{ 485, 6, 7, 9, 1, -6 }, // 0x6f 'o'
126+
{ 491, 6, 10, 9, 1, -6 }, // 0x70 'p'
127+
{ 499, 6, 10, 9, 1, -6 }, // 0x71 'q'
128+
{ 507, 4, 7, 6, 1, -6 }, // 0x72 'r'
129+
{ 511, 6, 7, 8, 1, -6 }, // 0x73 's'
130+
{ 517, 4, 9, 6, 0, -8 }, // 0x74 't'
131+
{ 522, 6, 7, 9, 1, -6 }, // 0x75 'u'
132+
{ 528, 8, 7, 7, -1, -6 }, // 0x76 'v'
133+
{ 535, 9, 7, 10, 0, -6 }, // 0x77 'w'
134+
{ 543, 6, 7, 7, 0, -6 }, // 0x78 'x'
135+
{ 549, 8, 10, 7, -1, -6 }, // 0x79 'y'
136+
{ 559, 5, 7, 6, 0, -6 }, // 0x7a 'z'
137+
{ 564, 5, 11, 9, 2, -8 }, // 0x7b '{'
138+
{ 571, 1, 12, 5, 2, -8 }, // 0x7c '|'
139+
{ 573, 5, 11, 9, 1, -8 }, // 0x7d '}'
140+
{ 580, 8, 3, 11, 1, -5 }, // 0x7e '~'
141+
};
142+
143+
const GFXfont DejaVu12 PROGMEM = {
144+
(uint8_t*)DejaVu12Bitmaps,
145+
(GFXglyph*)DejaVu12Glyphs,
146+
0x20, 0x7e, 13 };
147+

0 commit comments

Comments
 (0)