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

Merge branch 'master' into rework

Browse Source
This commit is contained in:
Ben V. Brown
2022-02-05 12:43:53 +11:00
committed by GitHub
parent 49c80d2d3f 1bdf9654d1
commit 1122d18526
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,6 +587,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
printVoltage();
OLED::print(SymbolVolts, FontStyle::SMALL);
} else {
OLED::setCursor(0, 0);
// We switch the layout direction depending on the orientation of the oled
if (OLED::getRotation()) {
// battery
@@ -753,19 +754,17 @@ void showDebugMenu(void) {
// Max deg C limit
OLED::printNumber(TipThermoModel::getTipMaxInC(), 3, FontStyle::SMALL);
break;
#ifdef HALL_SENSOR
case 13:
// Print raw hall effect value if availabe, none if hall effect disabled.
#ifdef HALL_SENSOR
{
int16_t hallEffectStrength = getRawHallEffect();
if (hallEffectStrength < 0)
hallEffectStrength = -hallEffectStrength;
OLED::printNumber(hallEffectStrength, 6, FontStyle::SMALL);
}
#else
OLED::print(translatedString(Tr->OffString), FontStyle::SMALL);
{
int16_t hallEffectStrength = getRawHallEffect();
if (hallEffectStrength < 0)
hallEffectStrength = -hallEffectStrength;
OLED::printNumber(hallEffectStrength, 6, FontStyle::SMALL);
}
break;
#endif
break;
default:
break;
}
@@ -776,7 +775,11 @@ void showDebugMenu(void) {
return;
else if (b == BUTTON_F_SHORT) {
screen++;
#ifdef HALL_SENSOR
screen = screen % 14;
#else
screen = screen % 13;
#endif
}
GUIDelay();
}