From aed18445db8c87549e7248a5533e690575c4d651 Mon Sep 17 00:00:00 2001
From: David Meenan <0b101@users.noreply.github.com>
Date: Sun, 31 Mar 2019 09:03:01 -0500
Subject: [PATCH] Display MicroPython version in settings

---
 apps/settings/base.de.i18n                  | 1 +
 apps/settings/base.en.i18n                  | 1 +
 apps/settings/base.es.i18n                  | 1 +
 apps/settings/base.fr.i18n                  | 1 +
 apps/settings/base.pt.i18n                  | 1 +
 apps/settings/main_controller.cpp           | 4 ++--
 apps/settings/sub_menu/about_controller.cpp | 4 +++-
 apps/settings/sub_menu/about_controller.h   | 2 +-
 8 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n
index b0a434359..790750205 100644
--- a/apps/settings/base.de.i18n
+++ b/apps/settings/base.de.i18n
@@ -20,6 +20,7 @@ Cartesian = "Algebraische "
 Polar = "Polar "
 Brightness = "Helligkeit"
 SoftwareVersion = "Softwareversion"
+MicroPythonVersion = "MicroPythonversion"
 SerialNumber = "Seriennummer"
 UpdatePopUp = "Erinnerung: Update"
 BetaPopUp = "Beta pop-up"
diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n
index 3b706c0e7..efa53836d 100644
--- a/apps/settings/base.en.i18n
+++ b/apps/settings/base.en.i18n
@@ -20,6 +20,7 @@ Cartesian = "Cartesian "
 Polar = "Polar "
 Brightness = "Brightness"
 SoftwareVersion = "Software version"
+MicroPythonVersion = "MicroPython version"
 SerialNumber = "Serial number"
 UpdatePopUp = "Update pop-up"
 BetaPopUp = "Beta pop-up"
diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n
index 68d1ca4b5..80ed70628 100644
--- a/apps/settings/base.es.i18n
+++ b/apps/settings/base.es.i18n
@@ -20,6 +20,7 @@ Cartesian = "Binómica "
 Polar = "Polar "
 Brightness = "Brillo"
 SoftwareVersion = "Version de software"
+MicroPythonVersion = "Version de MicroPython"
 SerialNumber = "Numero serie"
 UpdatePopUp = "Pop-up de actualizacion"
 BetaPopUp = "Beta pop-up"
diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n
index c2d22b74a..563df45ed 100644
--- a/apps/settings/base.fr.i18n
+++ b/apps/settings/base.fr.i18n
@@ -20,6 +20,7 @@ Cartesian = "Algébrique "
 Polar = "Exponentielle "
 Brightness = "Luminosite"
 SoftwareVersion = "Version du logiciel"
+MicroPythonVersion = "Version du MicroPython"
 SerialNumber = "Numero serie"
 UpdatePopUp = "Rappel mise a jour"
 BetaPopUp = "Rappel version bêta"
diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n
index 86f277900..17aa9518a 100644
--- a/apps/settings/base.pt.i18n
+++ b/apps/settings/base.pt.i18n
@@ -20,6 +20,7 @@ Cartesian = "Cartesiana "
 Polar = "Polar "
 Brightness = "Brilho"
 SoftwareVersion = "Versao do software"
+MicroPythonVersion = "Versao do MicroPython"
 SerialNumber = "Numero serie"
 UpdatePopUp = "Alertas de atualizacao"
 BetaPopUp = "Beta pop-up"
diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp
index df748f77e..f639b1c2c 100644
--- a/apps/settings/main_controller.cpp
+++ b/apps/settings/main_controller.cpp
@@ -12,7 +12,7 @@ const SettingsMessageTree editionModeChildren[2] = {SettingsMessageTree(I18n::Me
 const SettingsMessageTree floatDisplayModeChildren[3] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::SignificantFigures)};
 const SettingsMessageTree complexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
 const SettingsMessageTree examChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
-const SettingsMessageTree aboutChildren[3] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
+const SettingsMessageTree aboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
 
 #ifdef EPSILON_BOOT_PROMPT
 const SettingsMessageTree menu[9] =
@@ -31,7 +31,7 @@ const SettingsMessageTree menu[8] =
 #elif EPSILON_BOOT_PROMPT == EPSILON_UPDATE_PROMPT
   SettingsMessageTree(I18n::Message::UpdatePopUp),
 #endif
-  SettingsMessageTree(I18n::Message::About, aboutChildren, 3)};
+  SettingsMessageTree(I18n::Message::About, aboutChildren, 4)};
 #ifdef EPSILON_BOOT_PROMPT
 const SettingsMessageTree model = SettingsMessageTree(I18n::Message::SettingsApp, menu, 9);
 #else
diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp
index a8096d0de..4afacf5bc 100644
--- a/apps/settings/sub_menu/about_controller.cpp
+++ b/apps/settings/sub_menu/about_controller.cpp
@@ -1,5 +1,6 @@
 #include "about_controller.h"
 #include "../../apps_container.h"
+#include "../../../python/port/genhdr/mpversion.h"
 #include <assert.h>
 #include <cmath>
 
@@ -55,10 +56,11 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell;
   static const char * messages[] = {
     Ion::softwareVersion(),
+    MICROPY_VERSION_STRING,
     Ion::serialNumber(),
     Ion::fccId()
   };
-  assert(index >= 0 && index < 3);
+  assert(index >= 0 && index < 4);
   myCell->setAccessoryText(messages[index]);
 }
 
diff --git a/apps/settings/sub_menu/about_controller.h b/apps/settings/sub_menu/about_controller.h
index 57d66087b..5ecbeb23b 100644
--- a/apps/settings/sub_menu/about_controller.h
+++ b/apps/settings/sub_menu/about_controller.h
@@ -14,7 +14,7 @@ public:
   int reusableCellCount(int type) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
-  constexpr static int k_totalNumberOfCell = 3;
+  constexpr static int k_totalNumberOfCell = 4;
   MessageTableCellWithBuffer m_cells[k_totalNumberOfCell];
   HardwareTest::PopUpController m_hardwareTestPopUpController;
 };