From 3a4ffa9fb97689997444e0cbc1f155333204fe8e Mon Sep 17 00:00:00 2001
From: M4x1m3 <M4x1me@protonmail.com>
Date: Fri, 27 Dec 2019 20:31:41 +0100
Subject: [PATCH 1/2] [settings/about] MicroPython version from mpconfig.h

---
 apps/settings/sub_menu/about_controller.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp
index 8ad0bbb74..fd5d92e6d 100644
--- a/apps/settings/sub_menu/about_controller.cpp
+++ b/apps/settings/sub_menu/about_controller.cpp
@@ -4,6 +4,9 @@
 #include <cmath>
 #include <apps/settings/main_controller.h>
 
+#define MP_STRINGIFY_HELPER(x) #x
+#define MP_STRINGIFY(x) MP_STRINGIFY_HELPER(x)
+
 namespace Settings {
 
 AboutController::AboutController(Responder * parentResponder) :
@@ -94,8 +97,7 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   }
   else {
     MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell;
-    // TODO: Use MICROPY_VERSION_STRING from "mpconfig"
-    static const char * mpVersion = "1.11.0";
+    static const char * mpVersion = MICROPY_VERSION_STRING;
     static const char * messages[] = {
 #ifdef USERNAME
       Ion::username(),

From 76a6678a299f95f2fd14c691fcc36925bd63cd0a Mon Sep 17 00:00:00 2001
From: M4x1m3 <M4x1me@protonmail.com>
Date: Fri, 27 Dec 2019 20:36:59 +0100
Subject: [PATCH 2/2] =?UTF-8?q?[settings/about]=20MicroPython=20->=20?=
 =?UTF-8?q?=C2=B5Python,=20fixes=20offset=20of=20the=20version.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/settings/base.de.i18n | 2 +-
 apps/settings/base.en.i18n | 4 ++--
 apps/settings/base.es.i18n | 4 ++--
 apps/settings/base.fr.i18n | 2 +-
 apps/settings/base.pt.i18n | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n
index 048f88912..1d86d9af5 100644
--- a/apps/settings/base.de.i18n
+++ b/apps/settings/base.de.i18n
@@ -25,7 +25,7 @@ Brightness = "Helligkeit"
 SoftwareVersion = "Epsilon version"
 CustomSoftwareVersion = "Omega version"
 Username = "Name"
-MicroPythonVersion = "MicroPythonversion"
+MicroPythonVersion = "µPythonversion"
 SerialNumber = "Seriennummer"
 UpdatePopUp = "Erinnerung: Update"
 BetaPopUp = "Beta pop-up"
diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n
index b9c411b26..a356a0c37 100644
--- a/apps/settings/base.en.i18n
+++ b/apps/settings/base.en.i18n
@@ -25,7 +25,7 @@ Brightness = "Brightness"
 SoftwareVersion = "Epsilon version"
 CustomSoftwareVersion = "Omega version"
 Username = "Name"
-MicroPythonVersion = "MicroPython version"
+MicroPythonVersion = "µPython version"
 SerialNumber = "Serial number"
 UpdatePopUp = "Update pop-up"
 BetaPopUp = "Beta pop-up"
@@ -48,4 +48,4 @@ SymbolMultiplicationCross = "Cross "
 SymbolMultiplicationMiddleDot = "Dot "
 SymbolMultiplicationStar = "Star "
 SymbolMultiplicationAutoSymbol = "Auto "
-SymbolicEnabled = "Symbolic calculation"
\ No newline at end of file
+SymbolicEnabled = "Symbolic calculation"
diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n
index bd100e830..e73bb0c58 100644
--- a/apps/settings/base.es.i18n
+++ b/apps/settings/base.es.i18n
@@ -25,7 +25,7 @@ Brightness = "Brillo"
 SoftwareVersion = "Versión de Epsilon"
 CustomSoftwareVersion = "Versión de Omega"
 Username = "Apellido"
-MicroPythonVersion = "Version de MicroPython"
+MicroPythonVersion = "Version de µPython"
 SerialNumber = "Número serie"
 UpdatePopUp = "Pop-up de actualización"
 BetaPopUp = "Beta pop-up"
@@ -48,4 +48,4 @@ SymbolMultiplicationCross = "Contrariar "
 SymbolMultiplicationMiddleDot = "Punto "
 SymbolMultiplicationStar = "Estrella "
 SymbolMultiplicationAutoSymbol = "Auto "
-SymbolicEnabled = "Cálculo simbólico"
\ No newline at end of file
+SymbolicEnabled = "Cálculo simbólico"
diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n
index 3e87a529c..395772e3b 100644
--- a/apps/settings/base.fr.i18n
+++ b/apps/settings/base.fr.i18n
@@ -25,7 +25,7 @@ Brightness = "Luminosité"
 SoftwareVersion = "Version d'Epsilon"
 CustomSoftwareVersion = "Version d'Omega"
 Username = "Nom"
-MicroPythonVersion = "Version de MicroPython"
+MicroPythonVersion = "Version de µPython"
 SerialNumber = "Numéro série"
 UpdatePopUp = "Rappel mise à jour"
 BetaPopUp = "Rappel version bêta"
diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n
index cfff892d8..0e3a9d55b 100644
--- a/apps/settings/base.pt.i18n
+++ b/apps/settings/base.pt.i18n
@@ -25,7 +25,7 @@ Brightness = "Brilho"
 SoftwareVersion = "Versão do Epsilon"
 CustomSoftwareVersion = "Versão do Omega"
 Username = "Nome"
-MicroPythonVersion = "Versao do MicroPython"
+MicroPythonVersion = "Versao do µPython"
 SerialNumber = "Número serie"
 UpdatePopUp = "Alertas de atualização"
 BetaPopUp = "Beta pop-up"