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

nodemcu · Sep 27, 2019 · a4fa6c5 · a4fa6c5
1 parent d20778e
commit a4fa6c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/components/modules/u8g2.c b/components/modules/u8g2.c
@@ -802,15 +802,15 @@ 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
   U8G2_DISPLAY_TABLE_SPI
   //
   // 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 )

diff --git a/components/modules/ucg.c b/components/modules/ucg.c
@@ -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