JiXieShi/HW_Lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UP 支持直接字符配置

Browse Source
This commit is contained in:
jixishi
2024-07-05 23:09:54 +08:00
parent 7eb0f5e1f7
commit 3dd423da77
8 changed files with 180 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/inc/font/font.h
View File

@@ -33,9 +33,9 @@ struct Font {
#endif
};
char Font_utf8_to_unicode(uint8_t *pInput, uint32_t *unicode_letter);
uint8_t Font_utf8_to_unicode(uint8_t *pInput, uint32_t *unicode_letter);
char Font_draw_letter(const lv_font_t *font, Font_f_t *fd, uint32_t letter, int16_t pos_x, int16_t pos_y);
uint8_t Font_draw_letter(const lv_font_t *font, Font_f_t *fd, uint32_t letter, int16_t pos_x, int16_t pos_y);
#ifdef __cplusplus
}

2
lib/inc/font/lvgl.h
View File

@@ -175,7 +175,7 @@ typedef struct _lv_font_struct {
} lv_font_t;
#define NULL 0 /* see <stddef.h> */
//#define NULL 0 /* see <stddef.h> */
/** Bitmap formats*/
typedef enum {