Commit a4fa6c5c authored by f4grx's avatar f4grx Committed by Johny Mattsson
Browse files

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

parent d20778ed
...@@ -802,7 +802,7 @@ U8G2_DISPLAY_TABLE_SPI ...@@ -802,7 +802,7 @@ U8G2_DISPLAY_TABLE_SPI
#undef U8G2_FONT_TABLE_ENTRY #undef U8G2_FONT_TABLE_ENTRY
#undef U8G2_DISPLAY_TABLE_ENTRY #undef U8G2_DISPLAY_TABLE_ENTRY
#define U8G2_DISPLAY_TABLE_ENTRY(function, binding) \ #define U8G2_DISPLAY_TABLE_ENTRY(function, binding) \
LROT_FUNCENTRY( #binding, l ## binding ) LROT_FUNCENTRY( binding, l ## binding )
LROT_BEGIN(lu8g2) LROT_BEGIN(lu8g2)
U8G2_DISPLAY_TABLE_I2C U8G2_DISPLAY_TABLE_I2C
...@@ -810,7 +810,7 @@ LROT_BEGIN(lu8g2) ...@@ -810,7 +810,7 @@ LROT_BEGIN(lu8g2)
// //
// Register fonts // Register fonts
#define U8G2_FONT_TABLE_ENTRY(font) \ #define U8G2_FONT_TABLE_ENTRY(font) \
LROT_LUDENTRY( #font, (void *)(u8g2_ ## font) ) LROT_LUDENTRY( font, (void *)(u8g2_ ## font) )
U8G2_FONT_TABLE U8G2_FONT_TABLE
// //
LROT_NUMENTRY( DRAW_UPPER_RIGHT, U8G2_DRAW_UPPER_RIGHT ) LROT_NUMENTRY( DRAW_UPPER_RIGHT, U8G2_DRAW_UPPER_RIGHT )
......
...@@ -734,12 +734,12 @@ LROT_END(lucg_display, NULL, 0) ...@@ -734,12 +734,12 @@ LROT_END(lucg_display, NULL, 0)
LROT_BEGIN(lucg) LROT_BEGIN(lucg)
#undef UCG_DISPLAY_TABLE_ENTRY #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 UCG_DISPLAY_TABLE
// Register fonts // Register fonts
#undef UCG_FONT_TABLE_ENTRY #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 UCG_FONT_TABLE
// Font modes // Font modes
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment