Fix Debug menu translation

Translation Editor/make_translation.py

@@ -4,6 +4,7 @@ from __future__ import print_function
 import json
 import os
 import io
+from datetime import datetime
 import sys
 import fontTables
 TRANSLATION_CPP = "Translation.cpp"
@@ -115,6 +116,21 @@ def getTipModelEnumTS100():
     constants.append("User")
     return constants
 
+def getDebugMenu(): 
+    constants = []
+    constants.append(datetime.today().strftime('%d-%m-%y'))
+    constants.append("HW G ")
+    constants.append("HW M ")
+    constants.append("HW P ")
+    constants.append("Time ")
+    constants.append("Move ")
+    constants.append("RTip ")
+    constants.append("CTip ")
+    constants.append("CHan ")
+    constants.append("Vin  ")
+    constants.append("PCB  ") # PCB Version AKA IMU version
+    return constants
+
 
 def getLetterCounts(defs, lang):
     textList = []
@@ -162,6 +178,7 @@ def getLetterCounts(defs, lang):
         textList.append(x[1])
     textList.extend(getTipModelEnumTS100())
     textList.extend(getTipModelEnumTS80())  
+    textList.extend(getDebugMenu())
         
     # collapse all strings down into the composite letters and store totals for these
 
@@ -343,6 +360,13 @@ def writeLanguage(languageCode, defs, f):
 
     f.write(to_unicode("};\n\n"))
     
+    # Debug Menu
+    f.write(to_unicode("const char* DebugMenu[] = {\n"))
+    
+    for c in getDebugMenu():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable, c) + "\","+ "//{} \n".format(c)))
+    f.write(to_unicode("};\n\n"))
+
     # ----- Menu Options
 
     # Menu type

workspace/TS100/Core/Inc/Translation.h

@@ -53,6 +53,7 @@ extern const char* SettingAutoChar;
 extern const char* SettingFastChar;
 extern const char* SettingSlowChar;
 extern const char*  TipModelStrings[];
+extern const char* DebugMenu[];
 extern const char* SymbolPlus;
 extern const char* SymbolMinus;
 extern const char* SymbolSpace;

workspace/TS100/Core/Src/GUIThread.cpp

@@ -264,7 +264,7 @@ static void gui_solderingTempAdjust() {
 			break;
 		case BUTTON_B_LONG:
 			if (xTaskGetTickCount() - autoRepeatTimer
-					+ autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
+					+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
 				systemSettings.SolderingTemp -= 10;  // sub 10
 				autoRepeatTimer = xTaskGetTickCount();
 				autoRepeatAcceleration += PRESS_ACCEL_STEP;
@@ -272,7 +272,7 @@ static void gui_solderingTempAdjust() {
 			break;
 		case BUTTON_F_LONG:
 			if (xTaskGetTickCount() - autoRepeatTimer
-					+ autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
+					+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
 				systemSettings.SolderingTemp += 10;
 				autoRepeatTimer = xTaskGetTickCount();
 				autoRepeatAcceleration += PRESS_ACCEL_STEP;
@@ -607,75 +607,58 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 	}
 }
 
-static const char *HEADERS[] = {
+void showDebugMenu(void) {
-__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;
 	for (;;) {
 		OLED::clearScreen();    // Ensure the buffer starts clean
 		OLED::setCursor(0, 0);  // Position the cursor at the 0,0 (top left)
 		OLED::setFont(1);       // small font
-#ifdef MODEL_TS100
-				OLED::print(SymbolVersionNumber);  // Print version number
-#else
 		OLED::print(SymbolVersionNumber);  // Print version number
-#endif
 		OLED::setCursor(0, 8);  // second line
-		OLED::print(HEADERS[screen]);
+		OLED::print(DebugMenu[screen]);
 		switch (screen) {
-		case 2:
+		case 0:  //Just prints date
+			break;
+		case 1:
+			//High water mark for GUI
 			OLED::printNumber(uxTaskGetStackHighWaterMark(GUITaskHandle), 5);
 			break;
+		case 2:
+			//High water mark for the Movement task
+			OLED::printNumber(uxTaskGetStackHighWaterMark(MOVTaskHandle), 5);
+			break;
 		case 3:
+			//High water mark for the PID task
 			OLED::printNumber(uxTaskGetStackHighWaterMark(PIDTaskHandle), 5);
 			break;
 		case 4:
-			OLED::printNumber(uxTaskGetStackHighWaterMark(MOVTaskHandle), 5);
+			//system up time stamp
-			break;
-		case 5:
 			OLED::printNumber(xTaskGetTickCount() / 100, 5);
 			break;
-		case 6:
+		case 5:
+			//Movement time stamp
 			OLED::printNumber(lastMovementTime / 100, 5);
 			break;
-		case 7:
+		case 6:
+			//Raw Tip
 			OLED::printNumber(getTipRawTemp(0), 6);
 			break;
-		case 8:
+		case 7:
+			//Temp in C
 			OLED::printNumber(tipMeasurementToC(getTipRawTemp(0)), 5);
 			break;
+		case 8:
+			//Handle Temp
+			OLED::printNumber(getHandleTemperature(), 3);
+			break;
 		case 9:
+			//Voltage input
 			printVoltage();
 			break;
 		case 10:
-			OLED::printNumber(getHandleTemperature(), 3);
+			// Print PCB ID number
-			break;
+			OLED::printNumber(PCBVersion, 1);
-		case 11:
-			OLED::printNumber(PCBVersion, 1);  // Print PCB ID number
-			break;
-		case 12:
-#ifdef MODEL_TS80
-			OLED::printNumber(idealQCVoltage, 3);
-#else
-			OLED::printNumber(systemSettings.tipType, 3);
-#endif
-			break;
-		case 13:
-#ifdef MODEL_TS80
-			OLED::printNumber(calculateTipR(), 5);
-#else
-			OLED::print("Tek.com");
-#endif
 			break;
 		default:
 			break;
@@ -687,7 +670,7 @@ void showVersion(void) {
 			return;
 		else if (b == BUTTON_F_SHORT) {
 			screen++;
-			screen = screen % 14;
+			screen = screen % 11;
 		}
 		GUIDelay();
 	}
@@ -753,7 +736,7 @@ void startGUITask(void const *argument __unused) {
 
 		case BUTTON_B_LONG:
 			// Show the version information
-			showVersion();
+			showDebugMenu();
 			break;
 		case BUTTON_F_LONG:
 			gui_solderingTempAdjust();