sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

AutoStartMode refactoring (#1712)

Browse Source 
* OperatingModes/Sleep: extend current mode with idle status

* OperatingModes/Sleep: tipTemp section refactoring

* source/Core - settings: tiny refactoring of AutoStartMode management

* OperatingModes/Sleep: rollback OperatingMode update
This commit is contained in:
Ivan Zorin
2023-06-17 10:07:26 +03:00
committed by GitHub
parent 5b1c273a78
commit c55a640d7f
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/Core/Inc/Settings.h
View File

@@ -78,6 +78,14 @@ typedef enum {
FAST = 3, // FAST = 3, //
MAX_VALUE = 4 // MAX_VALUE = 4 //
} settingOffSpeed_t; } settingOffSpeed_t;
typedef enum {
NO = 0, // Disabled
SOLDER = 1, // Gain default soldering temp (Soldering Mode)
SLEEP = 2, // Gain default sleeping temp (Idle/Standby Mode)
ZERO = 3, // Power on only (No heat Mode)
} autoStartMode_t;
// Settings wide operations // Settings wide operations
void saveSettings(); void saveSettings();
bool loadSettings(); bool loadSettings();

8
source/Core/Src/settingsGUI.cpp
View File

@@ -496,16 +496,16 @@ static void displayBoostTemp(void) {
static void displayAutomaticStartMode(void) { static void displayAutomaticStartMode(void) {
switch (getSettingValue(SettingsOptions::AutoStartMode)) { switch (getSettingValue(SettingsOptions::AutoStartMode)) {
case 0: case autoStartMode_t::NO:
OLED::print(translatedString(Tr->SettingStartNoneChar), FontStyle::LARGE); OLED::print(translatedString(Tr->SettingStartNoneChar), FontStyle::LARGE);
break; break;
case 1: case autoStartMode_t::SOLDER:
OLED::print(translatedString(Tr->SettingStartSolderingChar), FontStyle::LARGE); OLED::print(translatedString(Tr->SettingStartSolderingChar), FontStyle::LARGE);
break; break;
case 2: case autoStartMode_t::SLEEP:
OLED::print(translatedString(Tr->SettingStartSleepChar), FontStyle::LARGE); OLED::print(translatedString(Tr->SettingStartSleepChar), FontStyle::LARGE);
break; break;
case 3: case autoStartMode_t::ZERO:
OLED::print(translatedString(Tr->SettingStartSleepOffChar), FontStyle::LARGE); OLED::print(translatedString(Tr->SettingStartSleepOffChar), FontStyle::LARGE);
break; break;
default: default:

7
source/Core/Threads/OperatingModes/Sleep.cpp
View File

@@ -21,12 +21,7 @@ int gui_SolderingSleepingMode(bool stayOff, bool autoStarted) {
currentTempTargetDegC = stayOff ? 0 : min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp)); currentTempTargetDegC = stayOff ? 0 : min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp));
} }
// draw the lcd // draw the lcd
uint16_t tipTemp; uint16_t tipTemp = getSettingValue(SettingsOptions::TemperatureInF) ? TipThermoModel::getTipInF() : TipThermoModel::getTipInC();
if (getSettingValue(SettingsOptions::TemperatureInF))
tipTemp = TipThermoModel::getTipInF();
else {
tipTemp = TipThermoModel::getTipInC();
}
OLED::clearScreen(); OLED::clearScreen();
OLED::setCursor(0, 0); OLED::setCursor(0, 0);