Merge branch 'master' into TweakTS80

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,21 +116,19 @@ def getTipModelEnumTS100():
     constants.append("User")
     return constants
 
-def getDebugMenuHeaders(): 
+def getDebugMenu(): 
     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: ")
+    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
 
 
@@ -180,6 +179,7 @@ def getLetterCounts(defs, lang):
     textList.extend(getDebugMenuHeaders())
     textList.extend(getTipModelEnumTS100())
     textList.extend(getTipModelEnumTS80())  
+    textList.extend(getDebugMenu())
         
     # collapse all strings down into the composite letters and store totals for these
 
@@ -361,15 +361,13 @@ def writeLanguage(languageCode, defs, f):
 
     f.write(to_unicode("};\n\n"))
     
-    # -- Debugging Menu
-
-    
-
+    # Debug Menu
     f.write(to_unicode("const char* DebugMenu[] = {\n"))
-    for c in getDebugMenuHeaders():
+    
+    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
@@ -457,7 +455,7 @@ def read_opts():
     if len(sys.argv) > 2:
         outFile = sys.argv[2]
     else:
-        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/src/")
+        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Src")
         outFile = os.path.join(outDir, TRANSLATION_CPP)
 
     if len(sys.argv) > 3: