MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the ug8 and ucg modules broken by eaac369. (#2927)

This commit is contained in:
f4grx 2019-09-27 04:29:43 +02:00 committed by Johny Mattsson
parent d20778ed09
commit a4fa6c5cd3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/modules/u8g2.c
View File

@ -802,7 +802,7 @@ U8G2_DISPLAY_TABLE_SPI
#undef U8G2_FONT_TABLE_ENTRY
#undef U8G2_DISPLAY_TABLE_ENTRY
#define U8G2_DISPLAY_TABLE_ENTRY(function, binding) \
LROT_FUNCENTRY( #binding, l ## binding )
LROT_FUNCENTRY( binding, l ## binding )
LROT_BEGIN(lu8g2)
U8G2_DISPLAY_TABLE_I2C
@ -810,7 +810,7 @@ LROT_BEGIN(lu8g2)
//
// Register fonts
#define U8G2_FONT_TABLE_ENTRY(font) \
LROT_LUDENTRY( #font, (void *)(u8g2_ ## font) )
LROT_LUDENTRY( font, (void *)(u8g2_ ## font) )
U8G2_FONT_TABLE
//
LROT_NUMENTRY( DRAW_UPPER_RIGHT, U8G2_DRAW_UPPER_RIGHT )

4
components/modules/ucg.c
View File

@ -734,12 +734,12 @@ LROT_END(lucg_display, NULL, 0)
LROT_BEGIN(lucg)
#undef UCG_DISPLAY_TABLE_ENTRY
#define UCG_DISPLAY_TABLE_ENTRY(binding, device, extension) LROT_FUNCENTRY( #binding, l ## binding )
#define UCG_DISPLAY_TABLE_ENTRY(binding, device, extension) LROT_FUNCENTRY( binding, l ## binding )
UCG_DISPLAY_TABLE
// Register fonts
#undef UCG_FONT_TABLE_ENTRY
#define UCG_FONT_TABLE_ENTRY(font) LROT_LUDENTRY( #font, (void *)(ucg_ ## font) )
#define UCG_FONT_TABLE_ENTRY(font) LROT_LUDENTRY( font, (void *)(ucg_ ## font) )
UCG_FONT_TABLE
// Font modes