bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix u8g.h search path error (#10419)

Browse Source 
Support env MARLIN_LANGS for user select generated language, and update doc; update script to generate dogm_font_data_ISO10646_1.h automatically.
This commit is contained in:
Yunhui Fu
2018-04-15 14:12:02 -04:00
committed by Scott Lahteine
parent 584735c994
commit 93273a4c9e
5 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/lcd/u8g_fontutf8.c
View File

@ -8,7 +8,6 @@
*/
#include <string.h>
#include <clib/u8g.h>
#include "fontutils.h"
#include "u8g_fontutf8.h"
@ -216,7 +215,7 @@ unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, wchar_t
const font_t *fnt_default = uxg_GetFont(pu8g);
if (!uxg_Utf8FontIsInited()) {
u8g_DrawStrP(pu8g, x, y, PSTR("Err: utf8 font not initialized."));
u8g_DrawStrP(pu8g, x, y, (const u8g_pgm_uint8_t *)PSTR("Err: utf8 font not initialized."));
return 0;
}
data.pu8g = pu8g;
@ -250,7 +249,7 @@ unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const
const font_t *fnt_default = uxg_GetFont(pu8g);
if (!uxg_Utf8FontIsInited()) {
u8g_DrawStrP(pu8g, x, y, PSTR("Err: utf8 font not initialized."));
u8g_DrawStrP(pu8g, x, y, (const u8g_pgm_uint8_t *)PSTR("Err: utf8 font not initialized."));
return 0;
}
data.pu8g = pu8g;
@ -285,7 +284,7 @@ unsigned int uxg_DrawUtf8StrP(u8g_t *pu8g, unsigned int x, unsigned int y, const
if (!uxg_Utf8FontIsInited()) {
TRACE("Error, utf8string not inited!");
u8g_DrawStrP(pu8g, x, y, PSTR("Err: utf8 font not initialized."));
u8g_DrawStrP(pu8g, x, y, (const u8g_pgm_uint8_t *)PSTR("Err: utf8 font not initialized."));
return 0;
}
data.pu8g = pu8g;