diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index e2fe3f5a6..d5f884aa8 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -156,7 +156,7 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) { MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell; static const char * mpVersion = MICROPY_VERSION_STRING; static const char * messages[] = { - Ion::username(), + (const char*) Ion::username(), Ion::softwareVersion(), Ion::omegaVersion(), mpVersion, diff --git a/ion/include/ion.h b/ion/include/ion.h index 78110f9f0..fb6bac017 100644 --- a/ion/include/ion.h +++ b/ion/include/ion.h @@ -32,7 +32,7 @@ void ion_main(int argc, const char * const argv[]); namespace Ion { const char * serialNumber(); -const char * username(); +const volatile char * username(); const char * softwareVersion(); const char * omegaVersion(); const char * patchLevel(); diff --git a/ion/src/shared/platform_info.cpp b/ion/src/shared/platform_info.cpp index d4249ebbc..cdf676a0c 100644 --- a/ion/src/shared/platform_info.cpp +++ b/ion/src/shared/platform_info.cpp @@ -57,7 +57,7 @@ public: assert(m_ohm_footer == OmegaMagic); return m_omegaVersion; } - const char * username() const { + const volatile char * username() const volatile { assert(m_storageAddress != nullptr); assert(m_storageSize != 0); assert(m_header == Magic); @@ -86,11 +86,11 @@ private: uint32_t m_footer; uint32_t m_ohm_header; const char m_omegaVersion[16]; - const char m_username[16]; + const volatile char m_username[16]; uint32_t m_ohm_footer; }; -constexpr PlatformInfo HEADER_SECTION platform_infos; +const PlatformInfo HEADER_SECTION platform_infos; const char * Ion::softwareVersion() { return platform_infos.version(); @@ -100,7 +100,7 @@ const char * Ion::omegaVersion() { return platform_infos.omegaVersion(); } -const char * Ion::username() { +const volatile char * Ion::username() { return platform_infos.username(); }