From 50b67916920f968cd02f2c14d1d736bbd0e8ed6f Mon Sep 17 00:00:00 2001 From: Lisra-git <89012417+Lisra-git@users.noreply.github.com> Date: Sat, 9 Jul 2022 23:54:31 +0200 Subject: [PATCH 1/4] Lock Hardware Test while Exam Mode enabled This allow to avoid any inconvenience around LED usage such as overirding colours and taking LED off --- apps/settings/sub_menu/about_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index 220a2c39647..d9038a7ff35 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -32,7 +32,7 @@ bool AboutController::handleEvent(Ion::Events::Event event) { I18n::Message childLabel = m_messageTreeModel->childAtIndex(selectedRow()+(!hasUsernameCell()))->label(); /* We hide here the activation hardware test app: in the menu "about", by * clicking on '6' on the last row. */ - if ((event == Ion::Events::Six || event == Ion::Events::LowerT || event == Ion::Events::UpperT) && childLabel == I18n::Message::FccId) { +if ((event == Ion::Events::Six || event == Ion::Events::LowerT || event == Ion::Events::UpperT) && childLabel == I18n::Message::FccId && !GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) { Container::activeApp()->displayModalViewController(&m_hardwareTestPopUpController, 0.f, 0.f, Metric::ExamPopUpTopMargin, Metric::PopUpRightMargin, Metric::ExamPopUpBottomMargin, Metric::PopUpLeftMargin); return true; } From a8f450ba8aeefb17d5968fdf169638aa43982bbf Mon Sep 17 00:00:00 2001 From: Lisra-git <89012417+Lisra-git@users.noreply.github.com> Date: Sun, 10 Jul 2022 00:10:39 +0200 Subject: [PATCH 2/4] Fix E19 boot --- ion/src/device/n0110/internal_flash.ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ion/src/device/n0110/internal_flash.ld b/ion/src/device/n0110/internal_flash.ld index 924c67f7d01..4b521892878 100644 --- a/ion/src/device/n0110/internal_flash.ld +++ b/ion/src/device/n0110/internal_flash.ld @@ -1,7 +1,7 @@ /* Same as flash.ld but everything is linked in internal flash */ MEMORY { - INTERNAL_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 64K + INTERNAL_FLASH (rx) : ORIGIN = 0x00200000, LENGTH = 64K SRAM (rw) : ORIGIN = 0x20000000, LENGTH = 256K } From 0a635868fb2e1b64d12d3a1acde9c33c7e10e77c Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sun, 10 Jul 2022 15:58:51 +0200 Subject: [PATCH 3/4] [ion/ld] Fixed running slot B --- ion/src/device/n0110/internal_flash.ld | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ion/src/device/n0110/internal_flash.ld b/ion/src/device/n0110/internal_flash.ld index 4b521892878..9eb035afc08 100644 --- a/ion/src/device/n0110/internal_flash.ld +++ b/ion/src/device/n0110/internal_flash.ld @@ -2,6 +2,7 @@ MEMORY { INTERNAL_FLASH (rx) : ORIGIN = 0x00200000, LENGTH = 64K + INTERNAL_FLASH_AXIM (rx) : ORIGIN = 0x08000000, LENGTH = 64K SRAM (rw) : ORIGIN = 0x20000000, LENGTH = 256K } @@ -40,11 +41,11 @@ SECTIONS { } >INTERNAL_FLASH .exam_mode_buffer ORIGIN(INTERNAL_FLASH) + FLASH_SECOND_SECTOR_OFFSET : { - _exam_mode_buffer_start = .; + _exam_mode_buffer_start = ORIGIN(INTERNAL_FLASH_AXIM) + FLASH_SECOND_SECTOR_OFFSET; KEEP(*(.exam_mode_buffer)) /* Note: We don't increment "." here, we set it. */ . = ORIGIN(INTERNAL_FLASH) + FLASH_SECOND_SECTOR_OFFSET + FLASH_SECOND_SECTOR_SIZE; - _exam_mode_buffer_end = .; + _exam_mode_buffer_end = ORIGIN(INTERNAL_FLASH_AXIM) + FLASH_SECOND_SECTOR_OFFSET + FLASH_SECOND_SECTOR_SIZE; } >INTERNAL_FLASH .text : { From d0308f8a4dd1a6cd30a6d7f1250855fd15270202 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Wed, 16 Nov 2022 23:13:02 +0100 Subject: [PATCH 4/4] [config.mak] Omega 2.0.3 --- build/config.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/config.mak b/build/config.mak index c0d1848ccd9..7154676d9fc 100644 --- a/build/config.mak +++ b/build/config.mak @@ -5,7 +5,7 @@ DEBUG ?= 0 HOME_DISPLAY_EXTERNALS ?= 1 EPSILON_VERSION ?= 15.5.0 -OMEGA_VERSION ?= 2.0.2 +OMEGA_VERSION ?= 2.0.3 # OMEGA_USERNAME ?= N/A OMEGA_STATE ?= public EPSILON_APPS ?= calculation rpn graph code statistics probability solver atomic sequence regression settings external