From 4e7962da3823247864a83cf4761997ec3a34af33 Mon Sep 17 00:00:00 2001
From: Sjef Verhoeven PE5PVB <pe5pvb@het-bar.net>
Date: Thu, 12 Oct 2023 22:47:10 +0200
Subject: [PATCH] Updated LIC table

---
 src/language.h | 178 ++++++++++++++++++++++++++++++++++---------------
 src/rds.cpp    |  20 +-----
 2 files changed, 127 insertions(+), 71 deletions(-)

diff --git a/src/language.h b/src/language.h
index 2598acc..a9b0a7e 100644
--- a/src/language.h
+++ b/src/language.h
@@ -3530,58 +3530,128 @@ static const char* const myCountries[] {
 };
 
 static const char* const myLanguages[] {
-  "Unknown", // 0
-  "Albanian", // 1
-  "Breton", // 2
-  "Catalan", // 3
-  "Croatian", // 4
-  "Welsh", // 5
-  "Czech", // 6
-  "Danish", // 7
-  "German", // 8
-  "English", // 9
-  "Spanish", // 10
-  "Esperanto", // 11
-  "Estonian", // 12
-  "Basque", // 13
-  "Faroese", // 14
-  "French", // 15
-  "Frisian", // 16
-  "Irish", // 17
-  "Gaelic", // 18
-  "Galician", // 19
-  "Icelandic", // 20
-  "Italian", // 21
-  "Lappish", // 22
-  "Latin", // 23
-  "Latvian", // 24
-  "Luxemb.", // 25
-  "Lithuan.", // 26
-  "Hungarian", // 27
-  "Maltese", // 28
-  "Dutch", // 29
-  "Norwegian", // 30
-  "Occitan", // 31
-  "Polish", // 32
-  "Portug.", // 33
-  "Romanian", // 34
-  "Romansh", // 35
-  "Serbian", // 36
-  "Slovak", // 37
-  "Slovene", // 38
-  "Finnish", // 39
-  "Swedish", // 40
-  "Turkish", // 41
-  "Flemish", // 42
-  "Walloon", // 43
-  "Ukranian", // 44
-  "Russian", // 45
-  "Moldavian", // 46
-  "Macedon.", // 47
-  "Hebrew", // 48
-  "Greek", // 49
-  "Georgian", // 50
-  "Bulgarian", // 51
-  "Armenian", // 52
-  "Arabic" // 53
+  "Unknown",
+  "Albanian",
+  "Breton",
+  "Catalan",
+  "Croatian",
+  "Welsh",
+  "Czech",
+  "Danish",
+  "German",
+  "English",
+  "Spanish",
+  "Esperanto",
+  "Estonian",
+  "Basque",
+  "Faroese",
+  "French",
+  "Frisian",
+  "Irish",
+  "Gaelic",
+  "Galician",
+  "Icelandic",
+  "Italian",
+  "Lappish",
+  "Latin",
+  "Latvian",
+  "Luxembourgian",
+  "Lithuanian",
+  "Hungarian",
+  "Maltese",
+  "Dutch",
+  "Norwegian",
+  "Occitan",
+  "Polish",
+  "Portuguese",
+  "Romanian",
+  "Romansh",
+  "Serbian",
+  "Slovak",
+  "Slovene",
+  "Finnish",
+  "Swedish",
+  "Turkish",
+  "Flemish",
+  "Walloon",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "",
+  "Background",
+  "",
+  "",
+  "",
+  "",
+  "Zulu",
+  "Vietnamese",
+  "Uzbek",
+  "Urdu",
+  "Ukrainian",
+  "Thai",
+  "Telugu",
+  "Tatar",
+  "Tamil",
+  "Tadzhik",
+  "Swahili",
+  "SrananTongo",
+  "Somali",
+  "Sinhalese",
+  "Shona",
+  "Serbo-Croat",
+  "Ruthenian",
+  "Russian",
+  "Quechua",
+  "Pushtu",
+  "Punjabi",
+  "Persian",
+  "Papamiento",
+  "Oriya",
+  "Nepali",
+  "Ndebele",
+  "Marathi",
+  "Moldovian",
+  "Malaysian",
+  "Malagasay",
+  "Macedonian",
+  "Laotian",
+  "Korean",
+  "Khmer",
+  "Kazakh",
+  "Kannada",
+  "Japanese",
+  "Indonesian",
+  "Hindi",
+  "Hebrew",
+  "Hausa",
+  "Gurani",
+  "Gujurati",
+  "Greek",
+  "Georgian",
+  "Fulani",
+  "Dari",
+  "Churash",
+  "Chinese",
+  "Burmese",
+  "Bulgarian",
+  "Bengali",
+  "Belorussian",
+  "Bambora",
+  "Azerbaijan",
+  "Assamese",
+  "Armenian",
+  "Arabic",
+  "Amharic"
 };
\ No newline at end of file
diff --git a/src/rds.cpp b/src/rds.cpp
index b2e8708..a5f8afb 100644
--- a/src/rds.cpp
+++ b/src/rds.cpp
@@ -56,30 +56,16 @@ void ShowAdvancedRDS() {
     if (!screenmute) tftPrint(-1, "N/A", 242, 208, BackgroundColor, BackgroundColor, 16);
     if (!screenmute) tftPrint(-1, LIColdString, 242, 208, BackgroundColor, BackgroundColor, 16);
 
-    if (radio.rds.LIC > 0 && radio.rds.LIC < 44) {
+    if (radio.rds.LIC > 0 && radio.rds.LIC < 171) {
       if (!screenmute) {
         if (radio.rds.hasLIC) tftPrint(-1, myLanguages[radio.rds.LIC], 242, 208, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 208, PrimaryColor, PrimaryColorSmooth, 16);
       }
       LIColdString = myLanguages[radio.rds.LIC];
     } else {
-      byte lic;
-      switch (radio.rds.LIC) {
-        case 73: lic = 44; break;
-        case 86: lic = 45; break;
-        case 96: lic = 46; break;
-        case 99: lic = 47; break;
-        case 108: lic = 48; break;
-        case 112: lic = 49; break;
-        case 113: lic = 50; break;
-        case 119: lic = 51; break;
-        case 125: lic = 52; break;
-        case 126: lic = 53; break;
-        default: lic = 0; break;
-      }
       if (!screenmute) {
-        if (radio.rds.hasLIC) tftPrint(-1, myLanguages[lic], 242, 208, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 208, PrimaryColor, PrimaryColorSmooth, 16);
+        if (radio.rds.hasLIC) tftPrint(-1, myLanguages[0], 242, 208, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 208, PrimaryColor, PrimaryColorSmooth, 16);
       }
-      LIColdString = myLanguages[lic];
+      LIColdString = myLanguages[0];
     }
     licold = radio.rds.LIC;
   }