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

refactor fahrenheit conversion to save some space

Browse Source
This commit is contained in:
Laura Klünder
2023-04-23 18:35:34 +02:00
parent dbdc0d1ef1
commit 5c69458f1a
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,7 +527,7 @@ static void displayProfilePhases(void) {
} }
static bool setProfileTemp(const enum SettingsOptions option) { static bool setProfileTemp(const enum SettingsOptions option) {
// If in C, 10 deg, if in F 20 deg // If in C, 5 deg, if in F 10 deg
uint16_t temp = getSettingValue(option); uint16_t temp = getSettingValue(option);
if (getSettingValue(SettingsOptions::TemperatureInF)) { if (getSettingValue(SettingsOptions::TemperatureInF)) {
temp += 10; temp += 10;
@@ -625,36 +625,36 @@ static void displayHallEffect(void) { OLED::printNumber(getSettingValue(Settings
static bool showHallEffect(void) { return getHallSensorFitted(); } static bool showHallEffect(void) { return getHallSensorFitted(); }
#endif #endif
static void setTempF(const enum SettingsOptions option) {
uint16_t Temp = getSettingValue(option);
if (getSettingValue(SettingsOptions::TemperatureInF)) {
// Change temp to the F equiv
// C to F == F= ( (C*9) +160)/5
Temp = ((Temp * 9) + 160) / 5;
} else {
// Change temp to the C equiv
// F->C == C = ((F-32)*5)/9
Temp = ((Temp - 32) * 5) / 9;
}
// Rescale to be multiples of 10
Temp = BoostTemp / 10;
Temp *= 10;
setSettingValue(option, Temp);
}
static bool setTempF(void) { static bool setTempF(void) {
bool res = nextSettingValue(SettingsOptions::TemperatureInF); bool res = nextSettingValue(SettingsOptions::TemperatureInF);
uint16_t BoostTemp = getSettingValue(SettingsOptions::BoostTemp); setTempF(SettingsOptions::BoostTemp);
uint16_t SolderingTemp = getSettingValue(SettingsOptions::SolderingTemp); setTempF(SettingsOptions::SolderingTemp);
uint16_t SleepTemp = getSettingValue(SettingsOptions::SleepTemp); #ifndef NO_SLEEP_MODE
setTempF(SettingsOptions::SleepTemp);
if (getSettingValue(SettingsOptions::TemperatureInF)) { #endif
// Change sleep, boost and soldering temps to the F equiv setTempF(SettingsOptions::ProfilePreheatTemp);
// C to F == F= ( (C*9) +160)/5 setTempF(SettingsOptions::ProfilePhase1Temp);
BoostTemp = ((BoostTemp * 9) + 160) / 5; setTempF(SettingsOptions::ProfilePhase2Temp);
SolderingTemp = ((SolderingTemp * 9) + 160) / 5; setTempF(SettingsOptions::ProfilePhase3Temp);
SleepTemp = ((SleepTemp * 9) + 160) / 5; setTempF(SettingsOptions::ProfilePhase4Temp);
} else { setTempF(SettingsOptions::ProfilePhase5Temp);
// Change sleep, boost and soldering temps to the C equiv
// F->C == C = ((F-32)*5)/9
BoostTemp = ((BoostTemp - 32) * 5) / 9;
SolderingTemp = ((SolderingTemp - 32) * 5) / 9;
SleepTemp = ((SleepTemp - 32) * 5) / 9;
}
// Rescale both to be multiples of 10
BoostTemp = BoostTemp / 10;
BoostTemp *= 10;
SolderingTemp = SolderingTemp / 10;
SolderingTemp *= 10;
SleepTemp = SleepTemp / 10;
SleepTemp *= 10;
setSettingValue(SettingsOptions::BoostTemp, BoostTemp);
setSettingValue(SettingsOptions::SolderingTemp, SolderingTemp);
setSettingValue(SettingsOptions::SleepTemp, SleepTemp);
return res; return res;
} }