Merge branch 'UpsilonNumworks:upsilon-dev' into superOS-dev

AngeDieu · Aug 30, 2023 · afebe1c · afebe1c
2 parents 7b4680c + fd159fe
commit afebe1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bootloader/boot.cpp b/bootloader/boot.cpp
@@ -107,7 +107,7 @@ void Boot::bootSlot(Bootloader::Slot s) {
   if (!s.userlandHeader()->isOmega() && !s.userlandHeader()->isUpsilon()) {
     // We are trying to boot epsilon, so we check the version and show an advertisement if needed
     const char * version = s.userlandHeader()->version();
-    const char * min = "20.4.1";
+    const char * min = "21.1.2";
     int versionSum = Utility::versionSum(version, strlen(version));
     int minimalVersionTrigger = Utility::versionSum(min, strlen(min));
     if (versionSum >= minimalVersionTrigger) {

diff --git 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.5 - FREED0M.20.4";
+  constexpr static const char * bootloaderVersion = "Version 1.0.6 - FREED0M.21.1";
 
   //USB NAMES
   constexpr static const char * usbUpsilonBootloader = "Upsilon Bootloader";