Merge branch '2.3.0' into 2.3

# Conflicts:
#	companion/src/translations/companion_fr.ts
#	radio/src/gui/128x64/model_select.cpp
#	radio/src/gui/212x64/model_select.cpp
#	radio/src/gui/480x272/lcd.cpp
This commit is contained in:
Kilrah
2019-09-17 13:49:59 +02:00
8 changed files with 508 additions and 19 deletions
+2 -2
View File
@@ -52,7 +52,7 @@ uint8_t getMappedChar(uint8_t c)
else if (c >= 0x80 && c <= 0x81) {
result = 157 + c - 0x80;
}
#elif defined(TRANSLATIONS_FI) || defined(TRANSLATIONS_SE)
#elif defined(TRANSLATIONS_FI) || defined(TRANSLATIONS_SE)
else if (c >= 0x80 && c <= 0x85) {
result = 159 + c - 0x80;
}
@@ -73,7 +73,7 @@ uint8_t getMappedChar(uint8_t c)
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;
}