From 2374fe4cf8b54b571b179651120ef334701f6963 Mon Sep 17 00:00:00 2001 From: Yaya-Cout Date: Thu, 29 Feb 2024 12:49:58 +0100 Subject: [PATCH] [bootloader] Fix exam mode with Epsilon 16-19 --- bootloader/interface/static/messages.h | 2 +- bootloader/slots/slot_exam_mode.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootloader/interface/static/messages.h b/bootloader/interface/static/messages.h index 7574b6deef2..2cb3cc9d7d2 100644 --- a/bootloader/interface/static/messages.h +++ b/bootloader/interface/static/messages.h @@ -72,7 +72,7 @@ class Messages { constexpr static const char * aboutMessage4 = "and select the OS"; constexpr static const char * aboutMessage5 = "to boot."; - constexpr static const char * bootloaderVersion = "Version 1.0.9 - FREED0M.22"; + constexpr static const char * bootloaderVersion = "Version 1.0.10 - FREED0M.22.2"; //USB NAMES constexpr static const char * usbUpsilonBootloader = "NumWorks Calculator"; diff --git a/bootloader/slots/slot_exam_mode.cpp b/bootloader/slots/slot_exam_mode.cpp index 8fc18abc737..8f7db8114b6 100644 --- a/bootloader/slots/slot_exam_mode.cpp +++ b/bootloader/slots/slot_exam_mode.cpp @@ -51,7 +51,7 @@ uint8_t SlotsExamMode::FetchSlotExamMode(const char * version, const char * Slot end = getSlotAEndExamAddress(0); } // Else versions before 22 - else if (version[0] == '2' && version[1] < '2') { + else if ((version[0] == '2' && version[1] < '2') || (version[0] == '1')) { start = getSlotAStartExamAddress(1); end = getSlotAEndExamAddress(1); } @@ -68,7 +68,7 @@ uint8_t SlotsExamMode::FetchSlotExamMode(const char * version, const char * Slot end = getSlotBEndExamAddress(0); } // Else versions before 22 - else if (version[0] == '2' && version[1] < '2') { + else if ((version[0] == '2' && version[1] < '2') || (version[0] == '1')) { start = getSlotBStartExamAddress(1); end = getSlotBEndExamAddress(1); }