From fe946bc0574cecc129d75daef6eda4efd791ffe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Sat, 10 Aug 2019 11:03:42 +0200 Subject: [PATCH] Add: LavaOS version in 'about' settings --- README.md | 6 +++++- 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 | 3 ++- apps/settings/sub_menu/about_controller.h | 2 +- ion/Makefile | 2 +- ion/include/ion.h | 1 + ion/src/shared/platform_info.cpp | 17 +++++++++++++++++ scripts/config.mak | 11 +++++++++++ 13 files changed, 45 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ab9fdf3c4..a7a7821c0 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,11 @@ We welcome contributions. For smaller changes just open a pull request straight ## License NumWorks Epsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode). NumWorks is a registered trademark. +<<<<<<< HEAD # Personal Changelog -- Revert: https://github.com/numworks/epsilon/commit/267d27f1145922b61b6171e14284534fa2256f0c \ No newline at end of file +# 1.0 + +- Revert: https://github.com/numworks/epsilon/commit/267d27f1145922b61b6171e14284534fa2256f0c +- Added: LavaOS version number diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index 3ed41780d..4c7a25dc5 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" +CustomSoftwareVersion = "LavaOS version" 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..af9104ce7 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" +CustomSoftwareVersion = "LavaOS 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 7c14e1e10..cd68365bb 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 = "Versión de software" +CustomSoftwareVersion = "Versión de LavaOS" SerialNumber = "Número serie" UpdatePopUp = "Pop-up de actualización" BetaPopUp = "Beta pop-up" diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n index 9a6cc3547..bbe9f3cbd 100644 --- a/apps/settings/base.fr.i18n +++ b/apps/settings/base.fr.i18n @@ -20,6 +20,7 @@ Cartesian = "Algébrique " Polar = "Exponentielle " Brightness = "Luminosité" SoftwareVersion = "Version du logiciel" +CustomSoftwareVersion = "Version de LavaOS" 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 85d70c976..1ba99f40e 100644 --- a/apps/settings/base.pt.i18n +++ b/apps/settings/base.pt.i18n @@ -20,6 +20,7 @@ Cartesian = "Cartesiana " Polar = "Polar " Brightness = "Brilho" SoftwareVersion = "Versão do software" +CustomSoftwareVersion = "Versão do LavaOS" SerialNumber = "Número serie" UpdatePopUp = "Alertas de atualização" BetaPopUp = "Beta pop-up" diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index df748f77e..5328bf3f9 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::CustomSoftwareVersion), 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..b33dc5d23 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -55,10 +55,11 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) { MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell; static const char * messages[] = { Ion::softwareVersion(), + Ion::customSoftwareVersion(), 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; }; diff --git a/ion/Makefile b/ion/Makefile index 1c3e616a4..c017b251e 100644 --- a/ion/Makefile +++ b/ion/Makefile @@ -14,7 +14,7 @@ include ion/src/shared/tools/Makefile # char test[4]= "ab"; is valid and should initialize test to 'a','b',0,0). # Older versions of GCC are not conformant so we resort to an initializer list. initializer_list = $(shell echo $(1) | sed "s/\(.\)/'\1',/g")0 -$(call object_for,ion/src/shared/platform_info.cpp): SFLAGS += -DPATCH_LEVEL="$(call initializer_list,$(PATCH_LEVEL))" -DEPSILON_VERSION="$(call initializer_list,$(EPSILON_VERSION))" +$(call object_for,ion/src/shared/platform_info.cpp): SFLAGS += -DPATCH_LEVEL="$(call initializer_list,$(PATCH_LEVEL))" -DEPSILON_VERSION="$(call initializer_list,$(EPSILON_VERSION))" -DEPSILON_CUSTOM_VERSION="$(call initializer_list,$(EPSILON_CUSTOM_VERSION))" src += $(addprefix ion/src/shared/, \ crc32_padded.cpp \ diff --git a/ion/include/ion.h b/ion/include/ion.h index 8049b52f8..a46c8bdc4 100644 --- a/ion/include/ion.h +++ b/ion/include/ion.h @@ -29,6 +29,7 @@ namespace Ion { const char * serialNumber(); const char * softwareVersion(); +const char * customSoftwareVersion(); const char * patchLevel(); const char * fccId(); diff --git a/ion/src/shared/platform_info.cpp b/ion/src/shared/platform_info.cpp index 135a6ca81..d5b6d0bd5 100644 --- a/ion/src/shared/platform_info.cpp +++ b/ion/src/shared/platform_info.cpp @@ -9,6 +9,10 @@ #error This file expects EPSILON_VERSION to be defined #endif +#ifndef EPSILON_CUSTOM_VERSION +#error This file expects EPSILON_CUSTOM_VERSION to be defined +#endif + #ifndef HEADER_SECTION #define HEADER_SECTION #endif @@ -23,6 +27,7 @@ public: constexpr PlatformInfo() : m_header(Magic), m_version{EPSILON_VERSION}, + m_customVersion{EPSILON_CUSTOM_VERSION}, m_patchLevel{PATCH_LEVEL}, m_storageAddress(storageAddress), m_storageSize(Ion::Storage::k_storageSize), @@ -34,6 +39,13 @@ public: assert(m_footer == Magic); return m_version; } + const char * customVersion() const { + assert(m_storageAddress != nullptr); + assert(m_storageSize != 0); + assert(m_header == Magic); + assert(m_footer == Magic); + return m_customVersion; + } const char * patchLevel() const { assert(m_storageAddress != nullptr); assert(m_storageSize != 0); @@ -45,6 +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_patchLevel[8]; void * m_storageAddress; size_t m_storageSize; @@ -57,6 +70,10 @@ const char * Ion::softwareVersion() { return platform_infos.version(); } +const char * Ion::customSoftwareVersion() { + return platform_infos.customVersion(); +} + const char * Ion::patchLevel() { return platform_infos.patchLevel(); } diff --git a/scripts/config.mak b/scripts/config.mak index 024f32ccf..894a3f4cf 100644 --- a/scripts/config.mak +++ b/scripts/config.mak @@ -3,8 +3,19 @@ PLATFORM ?= device DEBUG ?= 0 +<<<<<<< HEAD EPSILON_VERSION ?= 11.2.0 EPSILON_ONBOARDING_APP ?= 1 +======= +<<<<<<< Updated upstream +EPSILON_VERSION ?= 11.1.0 +EPSILON_ONBOARDING_APP ?= 0 +======= +EPSILON_VERSION ?= 11.2.0 +EPSILON_CUSTOM_VERSION ?= 1.0 +EPSILON_ONBOARDING_APP ?= 1 +>>>>>>> Stashed changes +>>>>>>> cfba77e1f... Add: LavaOS version in 'about' settings # Valid values are "none", "update", "beta" EPSILON_BOOT_PROMPT ?= none EPSILON_APPS ?= calculation graph code statistics probability solver sequence regression settings