From 7ea6d4afbd90f23e52e941dc1818c2b49f409c39 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Tue, 29 Dec 2020 12:40:30 +1100
Subject: [PATCH] Fix bug in tip -> F logic

---
 workspace/TS100/Core/Drivers/TipThermoModel.cpp | 14 ++++++--------
 workspace/TS100/Core/Inc/Translation.h          |  5 +----
 workspace/TS100/Core/Threads/GUIThread.cpp      |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/workspace/TS100/Core/Drivers/TipThermoModel.cpp b/workspace/TS100/Core/Drivers/TipThermoModel.cpp
index 5d8633f2..473cd60a 100755
--- a/workspace/TS100/Core/Drivers/TipThermoModel.cpp
+++ b/workspace/TS100/Core/Drivers/TipThermoModel.cpp
@@ -160,14 +160,14 @@ uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) {
 
 uint32_t TipThermoModel::convertCtoF(uint32_t degC) {
 	//(Y °C × 9/5) + 32 =Y°F
-
-	return (320 + ((degC * 90) / 5))/10;
+	return (32 + ((degC * 9) / 5));
 }
 
 uint32_t TipThermoModel::convertFtoC(uint32_t degF) {
 	//(Y°F − 32) × 5/9 = Y°C
-	if (degF < 32)
-	return 0;
+	if (degF < 32) {
+		return 0;
+	}
 	return ((degF - 32) * 5) / 9;
 }
 #endif
@@ -185,10 +185,8 @@ uint32_t TipThermoModel::getTipInC(bool sampleNow) {
 }
 #ifdef ENABLED_FAHRENHEIT_SUPPORT
 uint32_t TipThermoModel::getTipInF(bool sampleNow) {
-	uint32_t currentTipTempInF = TipThermoModel::convertTipRawADCToDegF(
-			getTipRawTemp(sampleNow));
-	currentTipTempInF += convertCtoF(getHandleTemperature() / 10); //Add handle offset
-	currentTipTempInF += x10WattHistory.average() / 45; // 25 * 9 / 5, see getTipInC
+	uint32_t currentTipTempInF = getTipInC(sampleNow);
+	currentTipTempInF = convertCtoF(currentTipTempInF);
 	return currentTipTempInF;
 }
 #endif
diff --git a/workspace/TS100/Core/Inc/Translation.h b/workspace/TS100/Core/Inc/Translation.h
index e090f06d..1ee90e2a 100755
--- a/workspace/TS100/Core/Inc/Translation.h
+++ b/workspace/TS100/Core/Inc/Translation.h
@@ -11,10 +11,7 @@
 #include "stdint.h"
 extern const uint8_t USER_FONT_12[];
 extern const uint8_t USER_FONT_6x8[];
-/*
- * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE
- * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
- */
+
 extern const char *SettingsShortNames[29][2];
 extern const char *SettingsDescriptions[29];
 extern const char *SettingsMenuEntries[4];
diff --git a/workspace/TS100/Core/Threads/GUIThread.cpp b/workspace/TS100/Core/Threads/GUIThread.cpp
index 5af727c8..6a468c79 100755
--- a/workspace/TS100/Core/Threads/GUIThread.cpp
+++ b/workspace/TS100/Core/Threads/GUIThread.cpp
@@ -66,7 +66,7 @@ void gui_drawTipTemp(bool symbol) {
 		Temp = TipThermoModel::getTipInC();
 	}
 
-	OLED::printNumber(Temp, 3); // Draw the tip temp out finally
+	OLED::printNumber(Temp, 3); // Draw the tip temp out
 	if (symbol) {
 		if (OLED::getFont() == 0) {
 			// Big font, can draw nice symbols