UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add your name in the settings

Browse Source
This commit is contained in:
Quentin
2019-11-02 19:29:06 +01:00
parent 145c028d3a
commit aacdce34ba
14 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/settings/base.de.i18n
View File

@@ -23,6 +23,7 @@ Polar = "Polar "
Brightness = "Helligkeit"
SoftwareVersion = "Epsilon version"
CustomSoftwareVersion = "Omega version"
Username = "Name"
SerialNumber = "Seriennummer"
UpdatePopUp = "Erinnerung: Update"
BetaPopUp = "Beta pop-up"

1
apps/settings/base.en.i18n
View File

@@ -23,6 +23,7 @@ Polar = "Polar "
Brightness = "Brightness"
SoftwareVersion = "Epsilon version"
CustomSoftwareVersion = "Omega version"
Username = "Name"
SerialNumber = "Serial number"
UpdatePopUp = "Update pop-up"
BetaPopUp = "Beta pop-up"

1
apps/settings/base.es.i18n
View File

@@ -23,6 +23,7 @@ Polar = "Polar "
Brightness = "Brillo"
SoftwareVersion = "Versión de Epsilon"
CustomSoftwareVersion = "Versión de Omega"
Username = "Apellido"
SerialNumber = "Número serie"
UpdatePopUp = "Pop-up de actualización"
BetaPopUp = "Beta pop-up"

1
apps/settings/base.fr.i18n
View File

@@ -23,6 +23,7 @@ Polar = "Exponentielle "
Brightness = "Luminosité"
SoftwareVersion = "Version d'Epsilon"
CustomSoftwareVersion = "Version d'Omega"
Username = "Nom"
SerialNumber = "Numéro série"
UpdatePopUp = "Rappel mise à jour"
BetaPopUp = "Rappel version bêta"

1
apps/settings/base.pt.i18n
View File

@@ -23,6 +23,7 @@ Polar = "Polar "
Brightness = "Brilho"
SoftwareVersion = "Versão do Epsilon"
CustomSoftwareVersion = "Versão do Omega"
Username = "Nome"
SerialNumber = "Número serie"
UpdatePopUp = "Alertas de atualização"
BetaPopUp = "Beta pop-up"

4
apps/settings/main_controller_prompt_beta.cpp
View File

@@ -8,7 +8,7 @@ constexpr SettingsMessageTree s_modelEditionModeChildren[2] = {SettingsMessageTr
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::Engineering), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
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_modelAboutChildren[5] = {SettingsMessageTree(I18n::Message::Username), 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_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)};
constexpr SettingsMessageTree s_contributorsChildren[5] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess)};
@@ -22,7 +22,7 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::Language),
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 1),
SettingsMessageTree(I18n::Message::BetaPopUp),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 5),
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5)};

4
apps/settings/main_controller_prompt_none.cpp
View File

@@ -9,7 +9,7 @@ constexpr SettingsMessageTree s_modelEditionModeChildren[2] = {SettingsMessageTr
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::Engineering), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
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_modelAboutChildren[5] = {SettingsMessageTree(I18n::Message::Username), 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_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)};
constexpr SettingsMessageTree s_contributorsChildren[5] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess)};
@@ -22,7 +22,7 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::Brightness),
SettingsMessageTree(I18n::Message::Language),
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 1),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 5),
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5)};

4
apps/settings/main_controller_prompt_update.cpp
View File

@@ -8,7 +8,7 @@ constexpr SettingsMessageTree s_modelEditionModeChildren[2] = {SettingsMessageTr
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::Engineering), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
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_modelAboutChildren[5] = {SettingsMessageTree(I18n::Message::Username), 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_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)};
constexpr SettingsMessageTree s_contributorsChildren[5] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess)};
@@ -22,7 +22,7 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::Language),
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 1),
SettingsMessageTree(I18n::Message::UpdatePopUp),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 4),
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 5),
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5)};

7
apps/settings/sub_menu/about_controller.cpp
View File

@@ -22,7 +22,7 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
return true;
}
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
if (selectedRow() == 0) {
if (selectedRow() == 1) {
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
if (strcmp(myCell->accessoryText(), Ion::patchLevel()) == 0) {
myCell->setAccessoryText(Ion::softwareVersion());
@@ -31,7 +31,7 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
myCell->setAccessoryText(Ion::patchLevel());
return true;
}
if (selectedRow() == 1) {
if (selectedRow() == 2) {
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
if (strcmp(myCell->accessoryText(), Ion::customSoftwareVersion()) == 0) {
myCell->setAccessoryText("Public"); //Change for public/dev
@@ -60,12 +60,13 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
GenericSubController::willDisplayCellForIndex(cell, index);
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell;
static const char * messages[] = {
Ion::username(),
Ion::softwareVersion(),
Ion::customSoftwareVersion(),
Ion::serialNumber(),
Ion::fccId()
};
assert(index >= 0 && index < 4);
assert(index >= 0 && index < 5);
myCell->setAccessoryText(messages[index]);
}

2
apps/settings/sub_menu/about_controller.h
View File

@@ -14,7 +14,7 @@ public:
int reusableCellCount(int type) override;
void willDisplayCellForIndex(HighlightCell * cell, int index) override;
private:
constexpr static int k_totalNumberOfCell = 4;
constexpr static int k_totalNumberOfCell = 5;
MessageTableCellWithBuffer m_cells[k_totalNumberOfCell];
HardwareTest::PopUpController m_hardwareTestPopUpController;
};

3
build/config.mak
View File

@@ -4,7 +4,8 @@ PLATFORM ?= device
DEBUG ?= 0
EPSILON_VERSION ?= 12.0.0
EPSILON_CUSTOM_VERSION ?= 1.13.3-0
EPSILON_CUSTOM_VERSION ?= 1.13.4-0
USERNAME ?= N/A
# Valid values are "none", "update", "beta"
EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings
EPSILON_I18N ?= en fr es de pt

2
ion/Makefile
View File

@@ -22,7 +22,7 @@ ion_console_display_src += ion/src/shared/console_display.cpp
# 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))" -DEPSILON_CUSTOM_VERSION="$(call initializer_list,$(EPSILON_CUSTOM_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))" -DUSERNAME="$(call initializer_list,$(USERNAME))"
ion_src += $(addprefix ion/src/shared/, \
console_line.cpp \

1
ion/include/ion.h
View File

@@ -28,6 +28,7 @@ void ion_main(int argc, const char * const argv[]);
namespace Ion {
const char * serialNumber();
const char * username();
const char * softwareVersion();
const char * customSoftwareVersion();
const char * patchLevel();

17
ion/src/shared/platform_info.cpp
View File

@@ -13,6 +13,10 @@
#error This file expects EPSILON_CUSTOM_VERSION to be defined
#endif
#ifndef USERNAME
#error This file expects USERNAME to be defined
#endif
#ifndef HEADER_SECTION
#define HEADER_SECTION
#endif
@@ -28,6 +32,7 @@ public:
m_header(Magic),
m_version{EPSILON_VERSION},
m_customVersion{EPSILON_CUSTOM_VERSION},
m_username{USERNAME},
m_patchLevel{PATCH_LEVEL},
m_storageAddress(storageAddress),
m_storageSize(Ion::Storage::k_storageSize),
@@ -46,6 +51,13 @@ public:
assert(m_footer == Magic);
return m_customVersion;
}
const char * username() const {
assert(m_storageAddress != nullptr);
assert(m_storageSize != 0);
assert(m_header == Magic);
assert(m_footer == Magic);
return m_username;
}
const char * patchLevel() const {
assert(m_storageAddress != nullptr);
assert(m_storageSize != 0);
@@ -58,6 +70,7 @@ private:
uint32_t m_header;
const char m_version[8];
const char m_customVersion[16];
const char m_username[16];
const char m_patchLevel[8];
void * m_storageAddress;
size_t m_storageSize;
@@ -74,6 +87,10 @@ const char * Ion::customSoftwareVersion() {
return platform_infos.customVersion();
}
const char * Ion::username() {
return platform_infos.username();
}
const char * Ion::patchLevel() {
return platform_infos.patchLevel();
}