aboutsummaryrefslogtreecommitdiffhomepage
path: root/source
diff options
context:
space:
mode:
authorBen V. Brown <[email protected]>2022-02-05 12:32:33 +1100
committerGitHub <[email protected]>2022-02-05 12:32:33 +1100
commit89070e1f4085a7f2b0727a90bcd886af589b4fa6 (patch)
treeea4eacf5a9abdd4546e561537cc73760ec87a6d8 /source
parent4f38236a00871201fa375579c5a6d70aa641d52b (diff)
parent3a32e88d5c7d9824b14a5891a2cb9bad24a54881 (diff)
downloadIronOS-89070e1f4085a7f2b0727a90bcd886af589b4fa6.tar.gz
IronOS-89070e1f4085a7f2b0727a90bcd886af589b4fa6.zip
Merge branch 'master' into ts100-runaway
Diffstat (limited to 'source')
-rw-r--r--source/Core/Threads/GUIThread.cpp22
1 files changed, 12 insertions, 10 deletions
diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index b07e93bd..84b4c7bd 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -782,19 +782,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;
}
@@ -805,7 +803,11 @@ void showDebugMenu(void) {
return;
else if (b == BUTTON_F_SHORT) {
screen++;
+#ifdef HALL_SENSOR
screen = screen % 14;
+#else
+ screen = screen % 13;
+#endif
}
GUIDelay();
}