Style cleanup
This commit is contained in:
@@ -76,8 +76,9 @@ OperatingMode showDebugMenu(const ButtonState buttons, guiContext *cxt) {
|
|||||||
case 16: // Raw Hall Effect Value
|
case 16: // Raw Hall Effect Value
|
||||||
{
|
{
|
||||||
int16_t hallEffectStrength = getRawHallEffect();
|
int16_t hallEffectStrength = getRawHallEffect();
|
||||||
if (hallEffectStrength < 0)
|
if (hallEffectStrength < 0) {
|
||||||
hallEffectStrength = -hallEffectStrength;
|
hallEffectStrength = -hallEffectStrength;
|
||||||
|
}
|
||||||
OLED::printNumber(hallEffectStrength, 6, FontStyle::SMALL);
|
OLED::printNumber(hallEffectStrength, 6, FontStyle::SMALL);
|
||||||
} break;
|
} break;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -10,8 +10,9 @@ OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *c
|
|||||||
// If in the first two seconds we disable this to let accelerometer warm up
|
// If in the first two seconds we disable this to let accelerometer warm up
|
||||||
|
|
||||||
#ifdef POW_DC
|
#ifdef POW_DC
|
||||||
if (checkForUnderVoltage())
|
if (checkForUnderVoltage()) {
|
||||||
return OperatingMode::HomeScreen; // return non-zero on error
|
return OperatingMode::HomeScreen; // return non-zero on error
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||||
currentTempTargetDegC = TipThermoModel::convertFtoC(min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp)));
|
currentTempTargetDegC = TipThermoModel::convertFtoC(min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp)));
|
||||||
@@ -28,9 +29,9 @@ OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *c
|
|||||||
OLED::setCursor(0, 8);
|
OLED::setCursor(0, 8);
|
||||||
OLED::print(translatedString(Tr->SleepingTipAdvancedString), FontStyle::SMALL);
|
OLED::print(translatedString(Tr->SleepingTipAdvancedString), FontStyle::SMALL);
|
||||||
OLED::printNumber(tipTemp, 3, FontStyle::SMALL);
|
OLED::printNumber(tipTemp, 3, FontStyle::SMALL);
|
||||||
if (getSettingValue(SettingsOptions::TemperatureInF))
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||||
OLED::print(SmallSymbolDegF, FontStyle::SMALL);
|
OLED::print(SmallSymbolDegF, FontStyle::SMALL);
|
||||||
else {
|
} else {
|
||||||
OLED::print(SmallSymbolDegC, FontStyle::SMALL);
|
OLED::print(SmallSymbolDegC, FontStyle::SMALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -105,15 +105,15 @@ OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
|
|||||||
|
|
||||||
// Update the setpoints for the temperature
|
// Update the setpoints for the temperature
|
||||||
if (cxt->scratch_state.state2) {
|
if (cxt->scratch_state.state2) {
|
||||||
if (getSettingValue(SettingsOptions::TemperatureInF))
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||||
currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::BoostTemp));
|
currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::BoostTemp));
|
||||||
else {
|
} else {
|
||||||
currentTempTargetDegC = (getSettingValue(SettingsOptions::BoostTemp));
|
currentTempTargetDegC = (getSettingValue(SettingsOptions::BoostTemp));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (getSettingValue(SettingsOptions::TemperatureInF))
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||||
currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SolderingTemp));
|
currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SolderingTemp));
|
||||||
else {
|
} else {
|
||||||
currentTempTargetDegC = (getSettingValue(SettingsOptions::SolderingTemp));
|
currentTempTargetDegC = (getSettingValue(SettingsOptions::SolderingTemp));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,10 +136,11 @@ OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cx
|
|||||||
OLED::print(SmallSymbolSlash, FontStyle::SMALL);
|
OLED::print(SmallSymbolSlash, FontStyle::SMALL);
|
||||||
OLED::printNumber(profileCurrentTargetTemp, 3, FontStyle::SMALL);
|
OLED::printNumber(profileCurrentTargetTemp, 3, FontStyle::SMALL);
|
||||||
|
|
||||||
if (getSettingValue(SettingsOptions::TemperatureInF))
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||||
OLED::print(SmallSymbolDegF, FontStyle::SMALL);
|
OLED::print(SmallSymbolDegF, FontStyle::SMALL);
|
||||||
else
|
} else {
|
||||||
OLED::print(SmallSymbolDegC, FontStyle::SMALL);
|
OLED::print(SmallSymbolDegC, FontStyle::SMALL);
|
||||||
|
}
|
||||||
|
|
||||||
// print phase
|
// print phase
|
||||||
if (cxt->scratch_state.state1 > 0 && cxt->scratch_state.state1 <= getSettingValue(SettingsOptions::ProfilePhases)) {
|
if (cxt->scratch_state.state1 > 0 && cxt->scratch_state.state1 <= getSettingValue(SettingsOptions::ProfilePhases)) {
|
||||||
|
|||||||
@@ -65,15 +65,17 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cx
|
|||||||
newTemp = (newTemp / delta) * delta;
|
newTemp = (newTemp / delta) * delta;
|
||||||
|
|
||||||
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||||
if (newTemp > MAX_TEMP_F)
|
if (newTemp > MAX_TEMP_F) {
|
||||||
newTemp = MAX_TEMP_F;
|
newTemp = MAX_TEMP_F;
|
||||||
if (newTemp < MIN_TEMP_F)
|
} else if (newTemp < MIN_TEMP_F) {
|
||||||
newTemp = MIN_TEMP_F;
|
newTemp = MIN_TEMP_F;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (newTemp > MAX_TEMP_C)
|
if (newTemp > MAX_TEMP_C) {
|
||||||
newTemp = MAX_TEMP_C;
|
newTemp = MAX_TEMP_C;
|
||||||
if (newTemp < MIN_TEMP_C)
|
} else if (newTemp < MIN_TEMP_C) {
|
||||||
newTemp = MIN_TEMP_C;
|
newTemp = MIN_TEMP_C;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
setSettingValue(SettingsOptions::SolderingTemp, (uint16_t)newTemp);
|
setSettingValue(SettingsOptions::SolderingTemp, (uint16_t)newTemp);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,9 +75,9 @@ OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
|
|||||||
(*screen) = 0;
|
(*screen) = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (buttons == BUTTON_B_SHORT)
|
if (buttons == BUTTON_B_SHORT) {
|
||||||
return OperatingMode::InitialisationDone;
|
return OperatingMode::InitialisationDone;
|
||||||
else if (buttons == BUTTON_F_SHORT) {
|
} else if (buttons == BUTTON_F_SHORT) {
|
||||||
(*screen) += 1;
|
(*screen) += 1;
|
||||||
}
|
}
|
||||||
return OperatingMode::UsbPDDebug;
|
return OperatingMode::UsbPDDebug;
|
||||||
|
|||||||
Reference in New Issue
Block a user