UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix OmegaVersion in settings

Browse Source
This commit is contained in:
Yaya.Cout
2021-09-05 11:49:42 +02:00
parent ebe6a7cc5f
commit 9eb81a6daf
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/main_controller.cpp
View File

@@ -20,7 +20,7 @@ constexpr SettingsMessageTree s_modelMathOptionsChildren[6] = {SettingsMessageTr
constexpr SettingsMessageTree s_modelFontChildren[2] = {SettingsMessageTree(I18n::Message::LargeFont), SettingsMessageTree(I18n::Message::SmallFont)};
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[23] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::SandraSimmons), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::AntoninLoubiere), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::JulieC), SettingsMessageTree(I18n::Message::LelahelHideux), SettingsMessageTree(I18n::Message::Madil), SettingsMessageTree(I18n::Message::HilaireLeRoux), SettingsMessageTree(I18n::Message::HectorNussbaumer), SettingsMessageTree(I18n::Message::RaphaelDyda), SettingsMessageTree(I18n::Message::ThibautC)};
constexpr SettingsMessageTree s_modelAboutChildren[8] = {SettingsMessageTree(I18n::Message::Username), SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::OmegaVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)};
constexpr SettingsMessageTree s_modelAboutChildren[8] = {SettingsMessageTree(I18n::Message::Username), SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::UpsilonVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)};
MainController::MainController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate) :
ViewController(parentResponder),

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

@@ -59,13 +59,13 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
}
return true;
}
if (childLabel == I18n::Message::OmegaVersion) {
if (childLabel == I18n::Message::UpsilonVersion) {
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
if (strcmp(myCell->accessoryText(), Ion::omegaVersion()) == 0) {
if (strcmp(myCell->accessoryText(), Ion::UpsilonVersion()) == 0) {
myCell->setAccessoryText(MP_STRINGIFY(OMEGA_STATE)); //Change for public/dev
return true;
}
myCell->setAccessoryText(Ion::omegaVersion());
myCell->setAccessoryText(Ion::UpsilonVersion());
return true;
}
if (childLabel == I18n::Message::MemUse) {
@@ -162,7 +162,7 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
static const char * messages[] = {
(const char*) Ion::username(),
Ion::softwareVersion(),
Ion::omegaVersion(),
Ion::UpsilonVersion(),
mpVersion,
"",
Ion::serialNumber(),

2
ion/include/ion.h
View File

@@ -35,7 +35,7 @@ namespace Ion {
const char * serialNumber();
const volatile char * username();
const char * softwareVersion();
const char * omegaVersion();
const char * UpsilonVersion();
const char * patchLevel();
const char * fccId();
const char * pcbVersion();

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

@@ -32,7 +32,7 @@ public:
m_storageSize(Ion::Storage::k_storageSize),
m_footer(Magic),
m_ohm_header(OmegaMagic),
m_omegaVersion{OMEGA_VERSION},
m_UpsilonVersion{OMEGA_VERSION},
#ifdef OMEGA_USERNAME
m_username{OMEGA_USERNAME},
#else
@@ -48,14 +48,14 @@ public:
assert(m_ohm_footer == OmegaMagic);
return m_version;
}
const char * omegaVersion() const {
const char * UpsilonVersion() const {
assert(m_storageAddress != nullptr);
assert(m_storageSize != 0);
assert(m_header == Magic);
assert(m_footer == Magic);
assert(m_ohm_header == OmegaMagic);
assert(m_ohm_footer == OmegaMagic);
return m_omegaVersion;
return m_UpsilonVersion;
}
const volatile char * username() const volatile {
assert(m_storageAddress != nullptr);
@@ -85,7 +85,7 @@ private:
size_t m_storageSize;
uint32_t m_footer;
uint32_t m_ohm_header;
const char m_omegaVersion[16];
const char m_UpsilonVersion[16];
const volatile char m_username[16];
uint32_t m_ohm_footer;
};
@@ -96,8 +96,8 @@ const char * Ion::softwareVersion() {
return platform_infos.version();
}
const char * Ion::omegaVersion() {
return platform_infos.omegaVersion();
const char * Ion::UpsilonVersion() {
return platform_infos.UpsilonVersion();
}
const volatile char * Ion::username() {