From 08f89dbbdfb35470ebfdf82dc1ee31039ba74b63 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Fri, 14 Oct 2022 02:55:27 +0200
Subject: [PATCH] fix(B&W): `a~x` not being displayed correctly (#2539)

---
 radio/src/translations/cn.h           | 2 +-
 radio/src/translations/cz.h           | 2 +-
 radio/src/translations/da.h           | 2 +-
 radio/src/translations/de.h           | 2 +-
 radio/src/translations/en.h           | 2 +-
 radio/src/translations/es.h           | 2 +-
 radio/src/translations/fi.h           | 2 +-
 radio/src/translations/fr.h           | 2 +-
 radio/src/translations/it.h           | 2 +-
 radio/src/translations/jp.h           | 2 +-
 radio/src/translations/nl.h           | 2 +-
 radio/src/translations/pl.h           | 2 +-
 radio/src/translations/pt.h           | 2 +-
 radio/src/translations/se.h           | 2 +-
 radio/src/translations/tw.h           | 2 +-
 radio/src/translations/untranslated.h | 7 +++++++
 16 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h
index a434511f6..8fa55c39d 100644
--- a/radio/src/translations/cn.h
+++ b/radio/src/translations/cn.h
@@ -93,7 +93,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO                    "Vario传感器"
diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h
index d8f8c6ecb..c16ac61b8 100644
--- a/radio/src/translations/cz.h
+++ b/radio/src/translations/cz.h
@@ -96,7 +96,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #define TR_TEXT_SIZE                   "Standard","Nejmenší","Malé","Střední","Dvojité"
 
diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h
index af6e6d3db..33a43c4eb 100644
--- a/radio/src/translations/da.h
+++ b/radio/src/translations/da.h
@@ -93,7 +93,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO                    "Vario"
diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h
index 89f9ead25..cf1282a40 100644
--- a/radio/src/translations/de.h
+++ b/radio/src/translations/de.h
@@ -97,7 +97,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC            			"---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC            			"---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO                    "Vario"
diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
index c7d607087..f0f6b113b 100644
--- a/radio/src/translations/en.h
+++ b/radio/src/translations/en.h
@@ -93,7 +93,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO                    "Vario"
diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h
index eec160f00..4236aab8b 100644
--- a/radio/src/translations/es.h
+++ b/radio/src/translations/es.h
@@ -96,7 +96,7 @@
 
 #define TR_CSWEQUAL      "a=x"
 
-#define TR_VCSWFUNC      "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC      "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO            "Vario"
diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h
index cf4757fd4..b17e48187 100644
--- a/radio/src/translations/fi.h
+++ b/radio/src/translations/fi.h
@@ -98,7 +98,7 @@
 
 #define TR_CSWEQUAL                    "a=x"
 
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b","Δ≥x","|Δ|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #define TR_TEXT_SIZE                   "Standard","Tiny","Small","Mid","Double"
 
diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h
index b00de356e..82d19cf6f 100644
--- a/radio/src/translations/fr.h
+++ b/radio/src/translations/fr.h
@@ -97,7 +97,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","ET","OU","OUX",TR_CSWSTAY,"a=b","a>b","a<b","Δ≥x","|Δ|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","ET","OU","OUX",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #define TR_TEXT_SIZE                   "Standard","Tiny","Small","Mid","Double"
 
diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h
index 2fafe90f1..9138cc8dd 100644
--- a/radio/src/translations/it.h
+++ b/radio/src/translations/it.h
@@ -97,7 +97,7 @@
 #endif
 
 #define TR_CSWEQUAL  "a=x"
-#define TR_VCSWFUNC  "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC  "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO            "Vario"
diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h
index 38e5693ad..159a27e3c 100644
--- a/radio/src/translations/jp.h
+++ b/radio/src/translations/jp.h
@@ -93,7 +93,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA,"}x","|",STR_CHAR_DELTA,"|}x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA,"≥x","|",STR_CHAR_DELTA,"|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO                    "バリオ"
diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h
index c96c714a1..45a8c3bc4 100644
--- a/radio/src/translations/nl.h
+++ b/radio/src/translations/nl.h
@@ -96,7 +96,7 @@
 #endif
 
 #define TR_CSWEQUAL            "a=x"
-#define TR_VCSWFUNC            "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC            "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO            "Vario"
diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h
index c386553e4..a3bb2bf65 100644
--- a/radio/src/translations/pl.h
+++ b/radio/src/translations/pl.h
@@ -94,7 +94,7 @@
 #endif
 
 #define TR_CSWEQUAL  "a=x"
-#define TR_VCSWFUNC  "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC  "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO            "Wario"
diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h
index d86831d6a..66f352cbd 100644
--- a/radio/src/translations/pt.h
+++ b/radio/src/translations/pt.h
@@ -94,7 +94,7 @@
 #endif
 
 #define TR_CSWEQUAL      "a=x"
-#define TR_VCSWFUNC      "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC      "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO        "Vario"
diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h
index dc5fc09be..dbca7d0cd 100644
--- a/radio/src/translations/se.h
+++ b/radio/src/translations/se.h
@@ -102,7 +102,7 @@
 #endif
 
 #define TR_CSWEQUAL                     "a=x"
-#define TR_VCSWFUNC                     "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b","Δ≥x","|Δ|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                     "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #define TR_TEXT_SIZE                    "Std","XS","S","M","L"
 
diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h
index 382eb8fd0..a1d84f55d 100644
--- a/radio/src/translations/tw.h
+++ b/radio/src/translations/tw.h
@@ -93,7 +93,7 @@
 #endif
 
 #define TR_CSWEQUAL                    "a=x"
-#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a~x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
+#define TR_VCSWFUNC                    "---",TR_CSWEQUAL,"a" STR_CHAR_TILDE "x","a>x","a<x",TR_CSWRANGE,"|a|>x","|a|<x","AND","OR","XOR",TR_CSWSTAY,"a=b","a>b","a<b",STR_CHAR_DELTA "≥x","|" STR_CHAR_DELTA "|≥x",TR_CSWTIMER,TR_CSWSTICKY
 
 #if defined(VARIO)
   #define TR_VVARIO                    "Vario傳感器"
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index 9e659687f..c1aa5f92a 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -279,6 +279,13 @@
 #define STR_CHAR_TELEMETRY "\302\223"
 #define STR_CHAR_LUA       "\302\224"
 
+#if !defined(COLORLCD)
+  // '~' is remapped to 0x7B in B&W font
+  #define STR_CHAR_TILDE "{"
+#else
+  #define STR_CHAR_TILDE "~"
+#endif
+
 #define STR_CHAR_BW_GREATEREQUAL '}'
 #define STR_CHAR_BW_DEGREE       '@'