me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Ben V. Brown
2022-08-03 20:35:28 +10:00
parent 6cc9b29058
commit 47c1792024
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/Core/Threads/GUIThread.cpp
View File

@@ -42,7 +42,7 @@ void showWarnings();
#define BUTTON_INACTIVITY_TIME (60 * configTICK_RATE_HZ)
static TickType_t lastHallEffectSleepStart = 0;
static uint16_t min(uint16_t a, uint16_t b) {
if (a > b)
if (a > b)
return b;
else
return a;
@@ -997,10 +997,8 @@ void startGUITask(void const *argument) {
#endif
#endif
// If the boot logo is enabled (but it times out) and the autostart mode is enabled (but not set to sleep w/o heat), start heating during boot logo
if (getSettingValue(SettingsOptions::LOGOTime) > 0 &&
getSettingValue(SettingsOptions::LOGOTime) < 5 &&
getSettingValue(SettingsOptions::AutoStartMode) > 0 &&
getSettingValue(SettingsOptions::AutoStartMode) < 3) {
if (getSettingValue(SettingsOptions::LOGOTime) > 0 && getSettingValue(SettingsOptions::LOGOTime) < 5 && getSettingValue(SettingsOptions::AutoStartMode) > 0
&& getSettingValue(SettingsOptions::AutoStartMode) < 3) {
uint16_t sleepTempDegC;
if (getSettingValue(SettingsOptions::TemperatureInF)) {
sleepTempDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SleepTemp));
@@ -1011,7 +1009,6 @@ void startGUITask(void const *argument) {
currentTempTargetDegC = min(sleepTempDegC, 75);
}
BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR);
showWarnings();