From fcea9519914217219fd64c4aa9d0f4745a548d45 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Thu, 12 Sep 2019 09:52:17 +0200
Subject: [PATCH] Fix swedish font (#6750)

Swedish font fix
---
 radio/src/gui/480x272/lcd.cpp | 8 ++------
 radio/util/font2png.py        | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/480x272/lcd.cpp b/radio/src/gui/480x272/lcd.cpp
index c260bf54b..52d2a75c1 100644
--- a/radio/src/gui/480x272/lcd.cpp
+++ b/radio/src/gui/480x272/lcd.cpp
@@ -52,7 +52,7 @@ uint8_t getMappedChar(uint8_t c)
   else if (c >= 0x80 && c <= 0x81) {
     result = 157 + c - 0x80;
   }
-#elif defined(TRANSLATIONS_FI)
+#elif defined(TRANSLATIONS_FI) || defined(TRANSLATIONS_SE)
   else if (c >= 0x80 && c <= 0x85) {
     result = 159 + c - 0x80;
   }
@@ -68,16 +68,12 @@ uint8_t getMappedChar(uint8_t c)
   else if (c >= 0x80 && c <= 0x80+21) {
     result = 185 + c - 0x80;
   }
-#elif defined(TRANSLATIONS_SE)
-  else if (c >= 0x80 && c <= 0x85) {
-    result = 207 + c - 0x80;
-  }
 #endif
   else if (c < 0xC0)
     result = c - 0x20;
   else
     result = c - 0xC0 + 96;
-  // TRACE("getMappedChar '%c' (%d) = %d", c, c, result);
+   // TRACE("getMappedChar '%c' (%d) = %d", c, c, result);
   return result;
 }
 
diff --git a/radio/util/font2png.py b/radio/util/font2png.py
index caadfac11..e734cc0a6 100755
--- a/radio/util/font2png.py
+++ b/radio/util/font2png.py
@@ -15,12 +15,11 @@ chars_fi = u"""åäöÅÄÖ"""
 chars_it = u"""àù"""
 chars_pl = u"""ąćęłńóśżźĄĆĘŁŃÓŚŻŹ"""
 chars_pt = u"""ÁáÂâÃãÀàÇçÉéÊêÍíÓóÔôÕõÚú"""
-chars_se = u"""åäöÅÄÖ"""
 
 COUNT_EXTRA_CHARS = 21
 
 chars_extra = u"".join([chr(1+i) for i in range(COUNT_EXTRA_CHARS)])
-chars = chars_en + chars_extra + chars_fr + chars_de + chars_cz + chars_es + chars_fi + chars_it + chars_pl + chars_se
+chars = chars_en + chars_extra + chars_fr + chars_de + chars_cz + chars_es + chars_fi + chars_it + chars_pl
 
 
 def createFontBitmap(filename, fontname, fontsize, fontoffset, foreground, background, coordsfile=True):