Tue 1 Oct 2019 12:12:43 EDT - Resolving #26 - System Font - Hard to Read

Author: 32teeth

Components/go-play/odroid-go-common/components/odroid/odroid_hud.c

@@ -128,13 +128,15 @@
 //}#pragma endregion Structs  
 
 //{#pragma region Sprites
-  const uint16_t characters[5][245] = {
-    {65535,65535,65535,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,65535,0,65535,0,0,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,0,0,65535,65535,0,0,0,65535,65535,0,0,65535,65535,65535,65535,0,65535,0,0,65535,0,0,65535,65535,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,0,0,65535,0,0,0,0,0,0,0,0,0,65535,0,0,0,65535,0,0,0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0},
-    {65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,0,0,65535,0,0,65535,0,65535,0,65535,0,0,0,0,65535,65535,0,65535,65535,65535,65535,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,0,0,65535,0,0,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,0,65535,0,65535,0,0,65535,0,65535,0,0,0,0,65535,0,65535,0,0,0,65535,0,0,65535,0,0,65535,0,0,65535,0,0,0,0,65535,0,65535,0,0,65535,0,65535,0,0,0,0,65535,0,0,0,0,0,0,0,65535,0,65535,0,0,65535,0,65535,0,0,65535,0,0,0,65535,0,0,0,0,0,0,0,0,0,65535,0,0,65535,0,65535,0,0,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0},
-    {65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,65535,65535,65535,0,65535,65535,65535,65535,0,65535,0,65535,65535,65535,65535,65535,65535,65535,65535,0,0,65535,0,0,0,0,0,65535,0,0,65535,65535,0,0,65535,0,0,0,0,65535,0,65535,0,65535,65535,0,65535,0,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,65535,0,0,65535,0,0,0,65535,0,65535,0,65535,0,65535,0,65535,0,65535,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,0,65535,0,0,0,65535,65535,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,0,0,65535,0,0,0,65535,65535,0,0,65535,65535,65535,65535,0,0,0,65535,0,0,0,65535,65535,65535,0,0,0,0,0,0,0,65535,0,0,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0},
-    {65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,0,0,65535,0,65535,0,0,65535,0,65535,0,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,65535,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,65535,65535,65535,0,0,65535,0,0,0,0,0,65535,0,0,65535,0,0,65535,0,0,0,65535,0,65535,0,65535,0,0,65535,65535,65535,0,0,65535,0,65535,0,0,0,65535,0,0,0,65535,0,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,65535,0,0,65535,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0},
-    {65535,0,0,0,65535,65535,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,0,0,0,0,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,65535,65535,0,65535,0,0,0,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,0,0,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,0,0,65535,0,0,65535,65535,65535,65535,65535,0,0,65535,0,0,0,65535,0,65535,0,65535,0,0,0,65535,0,0,65535,0,0,65535,65535,65535,65535,65535,0,65535,65535,65535,0,0,0,65535,0,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,0,0,0,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,65535,0,0,0,0,65535,65535,65535,65535,0,65535,65535,65535,65535,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,65535,0,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0},
-  };  
+const uint16_t FONT_5x7[7][250] = {
+  {0,65535,65535,65535,0,65535,65535,65535,65535,0,0,65535,65535,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,0,65535,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,0,65535,65535,65535,0,65535,65535,65535,65535,0,0,65535,65535,65535,0,65535,65535,65535,65535,0,0,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,0,0,0,65535,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,0,65535,65535,65535,65535,65535,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,65535,0,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0},
+  {65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,0,0,0,65535,0,0,65535,0,0,65535,0,65535,0,0,0,0,65535,65535,0,65535,65535,65535,65535,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,0,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,0,65535,0,65535,0,0,0,0,0,65535,65535,0,0,0,65535,0,65535,65535,0,0,65535,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,65535,65535,0,0,0,0,65535,0,0,0,65535,0,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,65535,0,0,65535,0,65535,0,65535,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0},
+  {65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,0,65535,0,0,65535,0,65535,0,0,65535,0,0,0,0,65535,0,65535,0,65535,65535,0,65535,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,0,0,65535,0,0,65535,0,0,0,65535,0,65535,0,65535,0,65535,0,0,0,65535,0,65535,0,65535,0,0,0,65535,0,0,0,0,0,65535,0,65535,0,0,0,65535,65535,0,65535,0,0,0,0,0,0,65535,0,0,0,0,65535,0,65535,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,0,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,65535,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0},
+  {65535,65535,65535,65535,65535,65535,65535,65535,65535,0,65535,0,0,0,0,65535,0,0,0,65535,65535,65535,65535,65535,0,65535,65535,65535,65535,0,65535,0,0,0,0,65535,65535,65535,65535,65535,0,0,65535,0,0,0,0,65535,0,0,65535,65535,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,65535,65535,65535,0,0,0,65535,65535,65535,65535,65535,0,65535,0,0,0,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,0,0,65535,0,0,65535,0,0,0,65535,0,65535,0,65535,0,65535,0,65535,0,65535,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,0,0,65535,0,0,0,65535,65535,0,65535,0,0,0,65535,0,65535,65535,65535,0,65535,65535,65535,65535,0,0,0,0,65535,0,0,65535,65535,65535,0,0,65535,65535,65535,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,0,0,65535,0,65535,0,65535,0,65535,0,0,0,0,0},
+  {65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,65535,0,65535,65535,65535,65535,0,0,0,65535,0,0,65535,0,0,65535,0,65535,0,0,65535,0,65535,0,0,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,65535,65535,0,65535,0,0,0,0,0,0,65535,0,0,65535,0,0,65535,0,0,0,65535,0,65535,0,65535,0,65535,0,65535,0,65535,0,65535,0,65535,0,0,0,65535,0,0,0,65535,0,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,0,65535,0,0,0,0,0,0,65535,65535,65535,65535,65535,65535,0,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,0,65535,0,0,0,65535,0,0,0,0,65535,0,0,65535,0,0,0,65535,65535,65535,0,0,0,0,0,0,65535,0,65535,0,65535,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,65535,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,0,0,65535,0,0,65535,0,65535,0,0,0,0,0,0},
+  {65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,0,0,65535,0,0,65535,0,65535,0,0,65535,0,0,65535,0,65535,0,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,0,0,65535,65535,65535,0,65535,0,0,65535,0,65535,0,0,0,65535,0,0,65535,0,0,65535,0,0,0,65535,0,0,65535,0,0,65535,0,65535,0,65535,65535,0,0,0,65535,0,0,65535,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,65535,0,0,0,65535,0,0,0,65535,0,0,0,65535,0,0,0,0,65535,65535,0,0,0,65535,65535,0,0,0,65535,0,65535,0,0,0,65535,0,0,0,65535,65535,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,65535,0,0,0,65535,0,0,0,0,0,65535,0,0,0,0,65535,0,0,0,65535,0,0,0,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0},
+  {65535,0,0,0,65535,65535,65535,65535,65535,0,0,65535,65535,65535,0,65535,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,0,0,0,0,0,65535,65535,65535,0,65535,0,0,0,65535,65535,65535,65535,65535,65535,0,65535,65535,0,0,65535,0,0,0,65535,65535,65535,65535,65535,65535,65535,0,0,0,65535,65535,0,0,0,65535,0,65535,65535,65535,0,65535,0,0,0,0,0,0,0,0,65535,65535,0,0,0,65535,0,65535,65535,65535,0,0,0,65535,0,0,0,65535,65535,65535,0,0,0,65535,0,0,0,65535,0,65535,0,65535,0,0,0,65535,0,0,65535,0,0,65535,65535,65535,65535,65535,0,65535,65535,65535,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,65535,65535,65535,0,0,0,0,0,65535,0,65535,65535,65535,0,0,65535,65535,65535,0,65535,0,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,65535,0,0,0,65535,0,0,0,0,65535,0,0,0,0,65535,0,0,65535,0,0,0,0,0,0,0,65535,0,0,65535,0,0,0,0,65535,65535,65535,0,0,65535,65535,65535,0,0,0,0,0,0,0,0,0,0,0},
+};
 
   const uint16_t icons[30][5] = {
     {0,65535,65535,0,0},
@@ -297,22 +299,25 @@
   void hud_text(short x, short y, char *string, bool ext, bool current) {
     int length = strlen(string);
     int size = 5;
-    for(int n = 0; n < length; n++) {                                     
+    int rows = 7;
+    int cols = 5;
+    for(int n = 0; n < length; n++) {
       int dx = hud_letter(string[n]);
-      int i = 0;       
-      for(int r = 0; r < (size); r++) {
+      int i = 0;
+      for(int r = 0; r < (rows); r++) {
         if(string[n] != ' ') {
-          for(int c = dx; c < (dx+size); c++) {
-            buffer[i] = characters[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
+          for(int c = dx; c < (dx+cols); c++) {
+            //buffer[i] = FONT_5x5[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
+            buffer[i] = FONT_5x7[r][c] == 0 ? GUI.bg : current ? WHITE : GUI.fg;
             i++;
-          }                                            
-        }                                       
+          }
+        }
       }
       if(string[n] != ' ') {
-        ili9341_write_frame_rectangleLE(x, y, size, size, buffer);                            
+        ili9341_write_frame_rectangleLE(x, y-1, cols, rows, buffer);
       }
-      x+= string[n] != ' ' ? 6 : 2;
-    }  
+      x+= string[n] != ' ' ? 7 : 3;
+    }
   }
 //}#pragma endregion Text