diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index d24d93fa8..60027ff92 100644 --- a/apps/settings/base.de.i18n +++ b/apps/settings/base.de.i18n @@ -35,3 +35,4 @@ Contributors = "Beiträger" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " JoachimLeFournis = "Joachim Le Fournis " +JeanBaptisteBoric = "Jean-Baptiste Boric " diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n index a10f90161..974a44a93 100644 --- a/apps/settings/base.en.i18n +++ b/apps/settings/base.en.i18n @@ -35,3 +35,4 @@ Contributors = "Contributors" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " JoachimLeFournis = "Joachim Le Fournis " +JeanBaptisteBoric = "Jean-Baptiste Boric " diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n index 829db3ead..9c79b28c9 100644 --- a/apps/settings/base.es.i18n +++ b/apps/settings/base.es.i18n @@ -35,3 +35,4 @@ Contributors = "Contribuyentes" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " JoachimLeFournis = "Joachim Le Fournis " +JeanBaptisteBoric = "Jean-Baptiste Boric " diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n index 5b874b253..b7b72a2fd 100644 --- a/apps/settings/base.fr.i18n +++ b/apps/settings/base.fr.i18n @@ -35,3 +35,4 @@ Contributors = "Contributeurs" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " JoachimLeFournis = "Joachim Le Fournis " +JeanBaptisteBoric = "Jean-Baptiste Boric " diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n index cce3905ca..88095b21c 100644 --- a/apps/settings/base.pt.i18n +++ b/apps/settings/base.pt.i18n @@ -35,3 +35,4 @@ Contributors = "Contribuidores" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " JoachimLeFournis = "Joachim Le Fournis " +JeanBaptisteBoric = "Jean-Baptiste Boric " diff --git a/apps/settings/main_controller_prompt_beta.cpp b/apps/settings/main_controller_prompt_beta.cpp index 422e451fa..599d12576 100644 --- a/apps/settings/main_controller_prompt_beta.cpp +++ b/apps/settings/main_controller_prompt_beta.cpp @@ -10,7 +10,7 @@ constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessage constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)}; constexpr SettingsMessageTree s_modelAboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)}; constexpr SettingsMessageTree s_ledColorChildren[4] = {SettingsMessageTree(I18n::Message::ColorWhite), SettingsMessageTree(I18n::Message::ColorGreen), SettingsMessageTree(I18n::Message::ColorBlue), SettingsMessageTree(I18n::Message::ColorYellow)}; -constexpr SettingsMessageTree s_contributorsChildren[3] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis)}; +constexpr SettingsMessageTree s_contributorsChildren[4] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric)}; constexpr SettingsMessageTree s_modelMenu[] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3), @@ -23,7 +23,7 @@ constexpr SettingsMessageTree s_modelMenu[] = SettingsMessageTree(I18n::Message::BetaPopUp), SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4), SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4), - SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 3)}; + SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 4)}; constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 11); diff --git a/apps/settings/main_controller_prompt_none.cpp b/apps/settings/main_controller_prompt_none.cpp index da22114ab..8a59de5de 100644 --- a/apps/settings/main_controller_prompt_none.cpp +++ b/apps/settings/main_controller_prompt_none.cpp @@ -11,7 +11,7 @@ constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessage constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)}; constexpr SettingsMessageTree s_modelAboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)}; constexpr SettingsMessageTree s_ledColorChildren[4] = {SettingsMessageTree(I18n::Message::ColorWhite), SettingsMessageTree(I18n::Message::ColorGreen), SettingsMessageTree(I18n::Message::ColorBlue), SettingsMessageTree(I18n::Message::ColorYellow)}; -constexpr SettingsMessageTree s_contributorsChildren[3] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis)}; +constexpr SettingsMessageTree s_contributorsChildren[4] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric)}; constexpr SettingsMessageTree s_modelMenu[] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3), @@ -23,7 +23,7 @@ constexpr SettingsMessageTree s_modelMenu[] = SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 1), SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4), SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4), - SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 3)}; + SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 4)}; constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 10); diff --git a/apps/settings/main_controller_prompt_update.cpp b/apps/settings/main_controller_prompt_update.cpp index d2374c5c3..c9b41b540 100644 --- a/apps/settings/main_controller_prompt_update.cpp +++ b/apps/settings/main_controller_prompt_update.cpp @@ -10,7 +10,7 @@ constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessage constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)}; constexpr SettingsMessageTree s_modelAboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)}; constexpr SettingsMessageTree s_ledColorChildren[4] = {SettingsMessageTree(I18n::Message::ColorWhite), SettingsMessageTree(I18n::Message::ColorGreen), SettingsMessageTree(I18n::Message::ColorBlue), SettingsMessageTree(I18n::Message::ColorYellow)}; -constexpr SettingsMessageTree s_contributorsChildren[3] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis)}; +constexpr SettingsMessageTree s_contributorsChildren[4] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric)}; constexpr SettingsMessageTree s_modelMenu[] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3), @@ -23,7 +23,7 @@ constexpr SettingsMessageTree s_modelMenu[] = SettingsMessageTree(I18n::Message::UpdatePopUp), SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4), SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4), - SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 3)}; + SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 4)}; constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 11); diff --git a/apps/settings/sub_menu/contributors_controller.h b/apps/settings/sub_menu/contributors_controller.h index 7c7291cb5..9a048e7cc 100644 --- a/apps/settings/sub_menu/contributors_controller.h +++ b/apps/settings/sub_menu/contributors_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]; }; diff --git a/build/config.mak b/build/config.mak index 138d585ff..97f43a696 100644 --- a/build/config.mak +++ b/build/config.mak @@ -4,7 +4,7 @@ PLATFORM ?= device DEBUG ?= 0 EPSILON_VERSION ?= 12.0.0 -EPSILON_CUSTOM_VERSION ?= 1.10.0-0 +EPSILON_CUSTOM_VERSION ?= 1.10.1-0 # Valid values are "none", "update", "beta" EPSILON_APPS ?= calculation rpn graph code statistics probability solver sequence regression settings EPSILON_I18N ?= en fr es de pt diff --git a/ion/src/shared/platform_info.cpp b/ion/src/shared/platform_info.cpp index d5b6d0bd5..74d1f0f73 100644 --- a/ion/src/shared/platform_info.cpp +++ b/ion/src/shared/platform_info.cpp @@ -57,7 +57,7 @@ private: constexpr static uint32_t Magic = 0xDEC00DF0; uint32_t m_header; const char m_version[8]; - const char m_customVersion[8]; + const char m_customVersion[16]; const char m_patchLevel[8]; void * m_storageAddress; size_t m_storageSize;