From 4242c77d64f22fb2e2dbdfe06d7c24905b652b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyprien=20M=C3=A9jat?= <52292872+A2drien@users.noreply.github.com> Date: Tue, 16 Mar 2021 23:55:44 +0100 Subject: [PATCH 1/4] [themes] Omega Atomic dark theme (#516) * update dark mode in atomic * Fix mistake * update atomic epsilon dark --- themes/themes/local/epsilon_dark.json | 22 +++++++++++----------- themes/themes/local/omega_dark.json | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/themes/themes/local/epsilon_dark.json b/themes/themes/local/epsilon_dark.json index 9121a7efe36..665d2d0b8fc 100644 --- a/themes/themes/local/epsilon_dark.json +++ b/themes/themes/local/epsilon_dark.json @@ -130,18 +130,18 @@ "CellTextExternalActive": "008f87" }, "Atom": { - "Unknown": "eeeeee", - "Text": "000000", - "AlkaliMetal": "CC9E7E", - "AlkaliEarthMetal": "D69477", - "Lanthanide": "A5DDAD", - "Actinide": "96D481", - "TransitionMetal": "99C6E7", - "PostTransitionMetal": "D69877", - "Metalloid": "D6B071", + "Unknown": "2c2c39", + "Text": "ffffff", + "AlkaliMetal": "B15a3b", + "AlkaliEarthMetal": "Fb3d19", + "Lanthanide": "157305", + "Actinide": "0F3B08", + "TransitionMetal": "1B1BB1", + "PostTransitionMetal": "62090a", + "Metalloid": "Daa811", "Halogen": "84ABE3", - "ReactiveNonmetal": "DBC377", - "NobleGas": "8FC2E6", + "ReactiveNonmetal": "Fb7b19", + "NobleGas": "348989", "TableLines": "323532", "Highlight": "000000", "Background": "d9d9d9" diff --git a/themes/themes/local/omega_dark.json b/themes/themes/local/omega_dark.json index adf64c2c507..79a72dca0bf 100644 --- a/themes/themes/local/omega_dark.json +++ b/themes/themes/local/omega_dark.json @@ -130,18 +130,18 @@ "CellTextExternalActive": "008f87" }, "Atom": { - "Unknown": "eeeeee", - "Text": "000000", - "AlkaliMetal": "CC9E7E", - "AlkaliEarthMetal": "D69477", - "Lanthanide": "A5DDAD", - "Actinide": "96D481", - "TransitionMetal": "99C6E7", - "PostTransitionMetal": "D69877", - "Metalloid": "D6B071", + "Unknown": "2c2c39", + "Text": "ffffff", + "AlkaliMetal": "B15a3b", + "AlkaliEarthMetal": "Fb3d19", + "Lanthanide": "157305", + "Actinide": "0F3B08", + "TransitionMetal": "1B1BB1", + "PostTransitionMetal": "62090a", + "Metalloid": "Daa811", "Halogen": "84ABE3", - "ReactiveNonmetal": "DBC377", - "NobleGas": "8FC2E6", + "ReactiveNonmetal": "Fb7b19", + "NobleGas": "348989", "TableLines": "323532", "Highlight": "000000", "Background": "d9d9d9" From a35fb141c4d8959ab90346ba6ff3d640ad954141 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sat, 20 Mar 2021 20:14:12 +0100 Subject: [PATCH 2/4] [ion] Made username volatile This ensures the compiler doesn't assume that the username is fixed, allowing us top change it before flashing, to let the user change his username. --- apps/settings/sub_menu/about_controller.cpp | 2 +- ion/include/ion.h | 2 +- ion/src/shared/platform_info.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index e2fe3f5a611..d5f884aa89b 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 78110f9f0b7..fb6bac01767 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 d4249ebbc46..cdf676a0c65 100644 --- a/ion/src/shared/platform_info.cpp +++ b/ion/src/shared/platform_info.cpp @@ -57,7 +57,7 @@ class PlatformInfo { 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 @@ class PlatformInfo { 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(); } From 4e7a84654022be531d0822dbbb3fda7fe7bd8495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyprien=20M=C3=A9jat?= <52292872+A2drien@users.noreply.github.com> Date: Sun, 21 Mar 2021 18:24:46 +0100 Subject: [PATCH 3/4] [config.mak] Dev Branch 1.22 incrementation (#517) --- build/config.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/config.mak b/build/config.mak index 29fa167625a..27ad582c17c 100644 --- a/build/config.mak +++ b/build/config.mak @@ -5,7 +5,7 @@ DEBUG ?= 0 HOME_DISPLAY_EXTERNALS ?= 1 EPSILON_VERSION ?= 15.3.1 -OMEGA_VERSION ?= 1.21.0 +OMEGA_VERSION ?= 1.22.0 # OMEGA_USERNAME ?= N/A OMEGA_STATE ?= dev EPSILON_APPS ?= calculation rpn graph code statistics probability solver atomic sequence regression settings external From 44d745eff304bcb1383fcad047c8e20ed257f582 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sun, 21 Mar 2021 20:24:23 +0100 Subject: [PATCH 4/4] [apps] Updates atomic --- apps/atomic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/atomic b/apps/atomic index 69f7a06ba53..64f2e38ed1e 160000 --- a/apps/atomic +++ b/apps/atomic @@ -1 +1 @@ -Subproject commit 69f7a06ba53eaae9ba2ab8f0c0318e2f77455f4d +Subproject commit 64f2e38ed1e4b8a896b0488039fb866b7015ff3f