From 05f38b096c5ea2eeb06b3ca96f966404e4b1b65e Mon Sep 17 00:00:00 2001 From: Christian Rahl Date: Sat, 22 Jan 2022 19:33:24 -0500 Subject: [PATCH 1/7] Add new debug menu item to view raw hall effect sensor output. --- Translations/make_translation.py | 1 + source/Core/Threads/GUIThread.cpp | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Translations/make_translation.py b/Translations/make_translation.py index 085a3ec9..217f1da2 100755 --- a/Translations/make_translation.py +++ b/Translations/make_translation.py @@ -127,6 +127,7 @@ def get_debug_menu() -> List[str]: "ACC ", "PWR ", "Max ", + "Hall ", ] diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 5c99f085..7507c0e1 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -782,6 +782,15 @@ void showDebugMenu(void) { // Max deg C limit OLED::printNumber(TipThermoModel::getTipMaxInC(), 3, FontStyle::SMALL); break; + case 13: + // Print raw hall effect value if availabe, none if hall effect disabled. + if (getHallSensorFitted()) { + OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); + } + else { + OLED::print(translatedString(Tr->OffString), FontStyle::SMALL); + } + break; default: break; } @@ -792,7 +801,7 @@ void showDebugMenu(void) { return; else if (b == BUTTON_F_SHORT) { screen++; - screen = screen % 13; + screen = screen % 14; } GUIDelay(); } From 7bb5b6adb7c5abc9f0045927fc7a82557f777b10 Mon Sep 17 00:00:00 2001 From: Christian Rahl Date: Sat, 22 Jan 2022 22:30:15 -0500 Subject: [PATCH 2/7] Added Ifdef to check against if the hall sensor is available to read. If not, read back OFF. --- source/Core/Threads/GUIThread.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 7507c0e1..2749cd4b 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -784,12 +784,11 @@ void showDebugMenu(void) { break; case 13: // Print raw hall effect value if availabe, none if hall effect disabled. - if (getHallSensorFitted()) { + #ifdef HALL_SENSOR OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); - } - else { + #else OLED::print(translatedString(Tr->OffString), FontStyle::SMALL); - } + #endif break; default: break; From bf7909123cf00d6672b6318ff6f56c283b83e1ce Mon Sep 17 00:00:00 2001 From: Christian Rahl Date: Sat, 22 Jan 2022 22:45:00 -0500 Subject: [PATCH 3/7] CLANG HATES ME --- source/Core/Threads/GUIThread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 2749cd4b..ef29bb70 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -784,11 +784,11 @@ void showDebugMenu(void) { break; case 13: // Print raw hall effect value if availabe, none if hall effect disabled. - #ifdef HALL_SENSOR +#ifdef HALL_SENSOR OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); - #else +#else OLED::print(translatedString(Tr->OffString), FontStyle::SMALL); - #endif +#endif break; default: break; From d91253a95bc32d2c70d462f3cd0704328e58eaf8 Mon Sep 17 00:00:00 2001 From: Christian Rahl Date: Sat, 22 Jan 2022 22:51:19 -0500 Subject: [PATCH 4/7] Clang 2.0 --- source/Core/Threads/GUIThread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index ef29bb70..e6a82d9c 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -785,9 +785,9 @@ void showDebugMenu(void) { case 13: // Print raw hall effect value if availabe, none if hall effect disabled. #ifdef HALL_SENSOR - OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); + OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); #else - OLED::print(translatedString(Tr->OffString), FontStyle::SMALL); + OLED::print(translatedString(Tr->OffString), FontStyle::SMALL); #endif break; default: From 9eaa66f063e2d8896b9ce29d31d1ff3206cd7032 Mon Sep 17 00:00:00 2001 From: Christian Rahl Date: Sat, 22 Jan 2022 22:53:32 -0500 Subject: [PATCH 5/7] Tomato tomatoo, tabss or spacess --- source/Core/Threads/GUIThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index e6a82d9c..971b4112 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -783,7 +783,7 @@ void showDebugMenu(void) { OLED::printNumber(TipThermoModel::getTipMaxInC(), 3, FontStyle::SMALL); break; case 13: - // Print raw hall effect value if availabe, none if hall effect disabled. + // Print raw hall effect value if availabe, none if hall effect disabled. #ifdef HALL_SENSOR OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); #else From 6a9c648b62f4bf7888362540a92591baade24616 Mon Sep 17 00:00:00 2001 From: Christian Rahl Date: Sat, 22 Jan 2022 22:58:46 -0500 Subject: [PATCH 6/7] < the place where 2 spaces should have been. --- source/Core/Threads/GUIThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 971b4112..1f2ff516 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -783,7 +783,7 @@ void showDebugMenu(void) { OLED::printNumber(TipThermoModel::getTipMaxInC(), 3, FontStyle::SMALL); break; case 13: - // Print raw hall effect value if availabe, none if hall effect disabled. + // Print raw hall effect value if availabe, none if hall effect disabled. #ifdef HALL_SENSOR OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); #else From a19b33c85e18febd7b2b8726524ea2d846837697 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sat, 5 Feb 2022 09:05:15 +1100 Subject: [PATCH 7/7] Take absolute value of hall sensor for debug menu --- source/Core/Threads/GUIThread.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 1f2ff516..b07e93bd 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -785,11 +785,16 @@ void showDebugMenu(void) { case 13: // Print raw hall effect value if availabe, none if hall effect disabled. #ifdef HALL_SENSOR - OLED::printNumber(getRawHallEffect(), 6, FontStyle::SMALL); + { + int16_t hallEffectStrength = getRawHallEffect(); + if (hallEffectStrength < 0) + hallEffectStrength = -hallEffectStrength; + OLED::printNumber(hallEffectStrength, 6, FontStyle::SMALL); + } #else OLED::print(translatedString(Tr->OffString), FontStyle::SMALL); #endif - break; + break; default: break; }