Obbart/EnergyMonitor_Pico
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chardacters render

Browse Source
This commit is contained in:
Emanuele Trabattoni
2021-08-15 18:54:16 +02:00
parent 487054ff76
commit c34e6931eb
8 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/epaper/Fonts/font12.c
View File

@@ -1375,7 +1375,7 @@ const uint8_t Font12_Table[] =
0x00, //
};
sFONT Font12 = {
sFONT Font12_t = {
Font12_Table,
7, /* Width */
12, /* Height */

2
libs/epaper/Fonts/font16.c
View File

@@ -1755,7 +1755,7 @@ const uint8_t Font16_Table[] =
0x00, 0x00, //
};
sFONT Font16 = {
sFONT Font16_t = {
Font16_Table,
11, /* Width */
16, /* Height */

2
libs/epaper/Fonts/font20.c
View File

@@ -2133,7 +2133,7 @@ const uint8_t Font20_Table[] =
};
sFONT Font20 = {
sFONT Font20_t = {
Font20_Table,
14, /* Width */
20, /* Height */

2
libs/epaper/Fonts/font24.c
View File

@@ -2511,7 +2511,7 @@ const uint8_t Font24_Table [] =
0x00, 0x00, 0x00, //
};
sFONT Font24 = {
sFONT Font24_t = {
Font24_Table,
17, /* Width */
24, /* Height */

2
libs/epaper/Fonts/font8.c
View File

@@ -995,7 +995,7 @@ const uint8_t Font8_Table[] =
0x00, //
};
sFONT Font8 = {
const sFONT Font8_t = {
Font8_Table,
5, /* Width */
8, /* Height */

31
libs/epaper/Fonts/fonts.h
View File

@@ -55,38 +55,11 @@
typedef struct _tFont
{
const uint8_t *table;
uint16_t Width;
uint16_t Height;
const uint16_t Width;
const uint16_t Height;
} sFONT;
//GB2312
// typedef struct // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD>ݽṹ
// {
// const char index[2]; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// const char matrix[MAX_HEIGHT_FONT*MAX_WIDTH_FONT/8+2]; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// }CH_CN;
// typedef struct
// {
// const CH_CN *table;
// uint16_t size;
// uint16_t ASCII_Width;
// uint16_t Width;
// uint16_t Height;
// }cFONT;
// extern sFONT Font24;
// extern sFONT Font20;
// extern sFONT Font16;
// extern sFONT Font12;
// extern sFONT Font8;
// extern cFONT Font12CN;
// extern cFONT Font24CN;
#ifdef __cplusplus
}
#endif