UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upsilon-dev' of https://github.com/UpsilonNumworks/Upsilon into upsilon-dev

Browse Source
This commit is contained in:
Yaya-Cout
2023-11-23 19:21:13 +01:00
parent 458c9316f1 9ac62c0496
commit 52bc616cd2
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/math_toolbox.cpp
View File

@@ -38,7 +38,8 @@ const ToolboxMessageTree complexChildren[] = {
const ToolboxMessageTree combinatoricsChildren[] = { const ToolboxMessageTree combinatoricsChildren[] = {
ToolboxMessageTree::Leaf(I18n::Message::BinomialCommandWithArg, I18n::Message::Combination), ToolboxMessageTree::Leaf(I18n::Message::BinomialCommandWithArg, I18n::Message::Combination),
ToolboxMessageTree::Leaf(I18n::Message::PermuteCommandWithArg, I18n::Message::Permutation) ToolboxMessageTree::Leaf(I18n::Message::PermuteCommandWithArg, I18n::Message::Permutation),
ToolboxMessageTree::Leaf(I18n::Message::FactorialCommandWithArg, I18n::Message::Factorial)
}; };
const ToolboxMessageTree normalDistributionChildren[] = { const ToolboxMessageTree normalDistributionChildren[] = {

2
bootloader/boot.cpp
View File

@@ -107,7 +107,7 @@ void Boot::bootSlot(Bootloader::Slot s) {
if (!s.userlandHeader()->isOmega() && !s.userlandHeader()->isUpsilon()) { if (!s.userlandHeader()->isOmega() && !s.userlandHeader()->isUpsilon()) {
// We are trying to boot epsilon, so we check the version and show an advertisement if needed // 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 * version = s.userlandHeader()->version();
const char * min = "21.2.1"; const char * min = "21.3.1";
int versionSum = Utility::versionSum(version, strlen(version)); int versionSum = Utility::versionSum(version, strlen(version));
int minimalVersionTrigger = Utility::versionSum(min, strlen(min)); int minimalVersionTrigger = Utility::versionSum(min, strlen(min));
if (versionSum >= minimalVersionTrigger) { if (versionSum >= minimalVersionTrigger) {

2
bootloader/interface/static/messages.h
View File

@@ -72,7 +72,7 @@ public:
constexpr static const char * aboutMessage4 = "and select the OS"; constexpr static const char * aboutMessage4 = "and select the OS";
constexpr static const char * aboutMessage5 = "to boot."; constexpr static const char * aboutMessage5 = "to boot.";
constexpr static const char * bootloaderVersion = "Version 1.0.7 - FREED0M.21.2"; constexpr static const char * bootloaderVersion = "Version 1.0.8 - FREED0M.21.3";
//USB NAMES //USB NAMES
constexpr static const char * usbUpsilonBootloader = "Upsilon Bootloader"; constexpr static const char * usbUpsilonBootloader = "Upsilon Bootloader";