fix chars

radio/src/gui/128x64/lcd.cpp

@@ -202,7 +202,7 @@ void getCharPattern(PatternData * pattern, unsigned char c, LcdFlags flags)
   else {
     pattern->width = 5;
     pattern->height = 7;
-    pattern->data = (c < 0xC0) ? &font_5x7[(c-0x20)*5] : &font_5x7_extra[(c-0xC0)*5];
+    pattern->data = &font_5x7[(c - 0x20) * 5];
   }
 #else
   pattern->width = 5;
@@ -218,7 +218,7 @@ uint8_t getCharWidth(char c, LcdFlags flags)
   return getPatternWidth(&pattern);
 }
 
-void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags flags)
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c, LcdFlags flags)
 {
   const unsigned char * q;
 
@@ -277,16 +277,12 @@ void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags flags)
   else
 #endif
   {
-#if !defined(BOOT)
-    q = (c < 0x80) ? &font_5x7[(c-0x20)*5] : &font_5x7_extra[(c-0x80)*5];
-#else
-    q = &font_5x7[(c-0x20)*5];
-#endif
+    q = &font_5x7[(c - 0x20) * 5];
     lcdPutPattern(x, y, q, 5, 7, flags);
   }
 }
 
-void lcdDrawChar(coord_t x, coord_t y, char c)
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c)
 {
   lcdDrawChar(x, y, c, 0);
 }
@@ -713,7 +709,7 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
 #endif
     {
       drawStringWithIndex(x, y, "LUA", qr.quot+1, att);
-      lcdDrawChar(lcdLastRightPos, y, 'a'+qr.rem, att);
+      lcdDrawChar(lcdLastRightPos, y, 'a' + qr.rem, att);
     }
   }
 #endif

radio/src/gui/128x64/lcd.h

@@ -98,8 +98,8 @@ extern coord_t lcdNextPos;
   extern volatile uint32_t lcdInputs ;
 #endif
 
-void lcdDrawChar(coord_t x, coord_t y, char c);
-void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags flags);
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c);
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c, LcdFlags flags);
 void lcdDrawCenteredText(coord_t y, const char * s, LcdFlags flags = 0);
 void lcdDrawText(coord_t x, coord_t y, const char * s, LcdFlags flags);
 void lcdDrawTextAtIndex(coord_t x, coord_t y, const char * s, uint8_t idx, LcdFlags flags);

radio/src/gui/212x64/lcd.cpp

@@ -214,12 +214,12 @@ void getCharPattern(PatternData * pattern, unsigned char c, LcdFlags flags)
   else {
     pattern->width = 5;
     pattern->height = 7;
-    pattern->data = (c < 0x80) ? &font_5x7[(c - 0x20) * 5] : &font_5x7_extra[(c - 0x80) * 5];
+    pattern->data = &font_5x7[(c - 0x20) * 5];
   }
 #else
   pattern->width = 5;
   pattern->height = 7;
-  pattern->data = &font_5x7[(c-0x20) * 5];
+  pattern->data = &font_5x7[(c - 0x20) * 5];
 #endif
 }
 
@@ -230,7 +230,7 @@ uint8_t getCharWidth(char c, LcdFlags flags)
   return getPatternWidth(&pattern);
 }
 
-void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags flags)
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c, LcdFlags flags)
 {
   lcdNextPos = x - 1;
 #if defined(BOOT)
@@ -243,7 +243,7 @@ void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags flags)
 #endif
 }
 
-void lcdDrawChar(coord_t x, coord_t y, char c)
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c)
 {
   lcdDrawChar(x, y, c, 0);
 }

radio/src/gui/212x64/lcd.h

@@ -100,8 +100,8 @@ extern coord_t lcdNextPos;
 #define DISPLAY_END                    (displayBuf + DISPLAY_BUFFER_SIZE)
 #define ASSERT_IN_DISPLAY(p)           assert((p) >= displayBuf && (p) < DISPLAY_END)
 
-void lcdDrawChar(coord_t x, coord_t y, char c);
-void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags mode);
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c);
+void lcdDrawChar(coord_t x, coord_t y, uint8_t c, LcdFlags mode);
 void lcdDrawCenteredText(coord_t y, const char * s, LcdFlags flags = 0);
 void lcdDrawText(coord_t x, coord_t y, const char * s, LcdFlags mode);
 void lcdDrawTextAtIndex(coord_t x, coord_t y, const char * s,uint8_t idx, LcdFlags mode);

radio/src/gui/common/stdlcd/fonts.cpp

@@ -22,6 +22,7 @@
 
 const unsigned char font_5x7[]  = {
 #include "font_05x07.lbm"
+#include "font_05x07_extra.lbm"
 #if defined(TRANSLATIONS_DE)
 #include "font_de_05x07.lbm"
 #elif defined(TRANSLATIONS_CZ)
@@ -129,10 +130,6 @@ const unsigned char font_4x6_extra[]  = {
 #include "font_04x06_extra.lbm"
 };
 
-const unsigned char font_5x7_extra[]  = {
-#include "font_05x07_extra.lbm"
-};
-
 const unsigned char font_10x14_extra[]  = {
 #include "font_10x14_extra.lbm"
 };

radio/src/gui/common/stdlcd/fonts.h

@@ -30,7 +30,6 @@ extern const unsigned char font_10x14[];
   extern const unsigned char font_4x6[];
   extern const unsigned char font_8x10[];
   extern const unsigned char font_22x38_num[];
-  extern const unsigned char font_5x7_extra[];
   extern const unsigned char font_10x14_extra[];
   extern const unsigned char font_4x6_extra[];
 #endif