From 3f69dbd5a3644f6cf020810e6f10c433f70c341b Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <ralim@ralimtek.com>
Date: Wed, 3 Jul 2019 15:32:02 +1000
Subject: [PATCH] Rework debug menu

---
 Translation Editor/fontTables.py       |  0
 Translation Editor/make_translation.py | 27 ++++++++++++++++++++++++++
 workspace/TS100/inc/Translation.h      |  1 +
 workspace/TS100/inc/history.hpp        |  2 +-
 workspace/TS100/src/main.cpp           | 15 ++------------
 5 files changed, 31 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 Translation Editor/fontTables.py
 mode change 100644 => 100755 Translation Editor/make_translation.py

diff --git a/Translation Editor/fontTables.py b/Translation Editor/fontTables.py
old mode 100644
new mode 100755
diff --git a/Translation Editor/make_translation.py b/Translation Editor/make_translation.py
old mode 100644
new mode 100755
index 7ec28c92..07d90c4d
--- a/Translation Editor/make_translation.py	
+++ b/Translation Editor/make_translation.py	
@@ -115,6 +115,23 @@ def getTipModelEnumTS100():
     constants.append("User")
     return constants
 
+def getDebugMenuHeaders(): 
+    constants = []
+    constants.append("DateHere")
+    constants.append("Heap: ")
+    constants.append("HWMG: ")
+    constants.append("HWMP: ")
+    constants.append("HWMM: ")
+    constants.append("Time: ")
+    constants.append("Move: ")
+    constants.append("RTip: ")
+    constants.append("CTip: ")
+    constants.append("Vin: ")
+    constants.append("THan: ")
+    constants.append("Model: ")
+    constants.append("Tres: ")
+    return constants
+
 
 def getLetterCounts(defs, lang):
     textList = []
@@ -160,6 +177,7 @@ def getLetterCounts(defs, lang):
     constants = getConstants()  
     for x in constants:
         textList.append(x[1])
+    textList.extend(getDebugMenuHeaders())
     textList.extend(getTipModelEnumTS100())
     textList.extend(getTipModelEnumTS80())  
         
@@ -343,6 +361,15 @@ def writeLanguage(languageCode, defs, f):
 
     f.write(to_unicode("};\n\n"))
     
+    # -- Debugging Menu
+
+    
+
+    f.write(to_unicode("const char* DebugMenu[] = {\n"))
+    for c in getDebugMenuHeaders():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable, c) + "\","+ "//{} \n".format(c)))
+    f.write(to_unicode("};\n\n"))
+    
     # ----- Menu Options
 
     # Menu type
diff --git a/workspace/TS100/inc/Translation.h b/workspace/TS100/inc/Translation.h
index ec1f6b83..c6d015b9 100644
--- a/workspace/TS100/inc/Translation.h
+++ b/workspace/TS100/inc/Translation.h
@@ -67,4 +67,5 @@ extern const char* SymbolDC;
 extern const char* SymbolCellCount;
 extern const char* SymbolVersionNumber;
 
+extern const char* DebugMenu[];
 #endif /* TRANSLATION_H_ */
diff --git a/workspace/TS100/inc/history.hpp b/workspace/TS100/inc/history.hpp
index 856f6536..01f2a93d 100644
--- a/workspace/TS100/inc/history.hpp
+++ b/workspace/TS100/inc/history.hpp
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 // max size = 127
-template <class T=uint16_t, uint8_t SIZE=15>
+template <class T, uint8_t SIZE>
 struct history {
     static const uint8_t size = SIZE;
 	T buf[size];
diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp
index 076965b7..db45a89b 100644
--- a/workspace/TS100/src/main.cpp
+++ b/workspace/TS100/src/main.cpp
@@ -674,17 +674,6 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 	}
 }
 
-static const char *HEADERS[] = {
-__DATE__, "Heap: ", "HWMG: ", "HWMP: ", "HWMM: ", "Time: ", "Move: ", "RTip: ",
-		"CTip: ", "Vin :", "THan: ", "Model: ",
-#ifdef MODEL_TS80
-		"QCV: ", "Tr ",
-#else
-		"Tm ", "Ralim-",
-
-#endif
-	};
-
 void showVersion(void) {
 	uint8_t screen = 0;
 	ButtonState b;
@@ -698,7 +687,7 @@ void showVersion(void) {
 		OLED::print(SymbolVersionNumber);  // Print version number
 #endif
 		OLED::setCursor(0, 8);  // second line
-		OLED::print(HEADERS[screen]);
+		OLED::print(DebugMenu[screen]);
 		switch (screen) {
 		case 1:
 			OLED::printNumber(xPortGetFreeHeapSize(), 5);
@@ -744,7 +733,7 @@ void showVersion(void) {
 #ifdef MODEL_TS80
 			OLED::printNumber(calculateTipR(), 5);
 #else
-			OLED::print("Tek.com");
+			OLED::printNumber(8500,5));
 #endif
 			break;
 		default: