Merge pull request #1074 from Ralim/ralim/named-power-source

Ralim/named power source

Translations/make_translation.py

@@ -142,6 +142,14 @@ def get_accel_names_list() -> List[str]:
     ]
 
 
+def get_power_source_list() -> List[str]:
+    return [
+        "DC",
+        "QC",
+        "PD",
+    ]
+
+
 def get_letter_counts(
     defs: dict, lang: dict, build_version: str
 ) -> Tuple[List[str], Dict[str, int]]:
@@ -202,6 +210,7 @@ def get_letter_counts(
         text_list.append(x[1])
     text_list.extend(get_debug_menu())
     text_list.extend(get_accel_names_list())
+    text_list.extend(get_power_source_list())
 
     # collapse all strings down into the composite letters and store totals for these
 
@@ -971,6 +980,15 @@ def get_translation_common_text(
         )
     translation_common_text += "};\n\n"
 
+    # power source types
+    translation_common_text += "const char* PowerSourceNames[] = {\n"
+
+    for c in get_power_source_list():
+        translation_common_text += (
+            f'\t "{convert_string(symbol_conversion_table, c)}",//{c} \n'
+        )
+    translation_common_text += "};\n\n"
+
     return translation_common_text
 
 

source/Core/Inc/Translation.h

@@ -27,6 +27,7 @@ extern const char *SymbolVersionNumber;
 
 extern const char *DebugMenu[];
 extern const char *AccelTypeNames[];
+extern const char *PowerSourceNames[];
 
 enum class SettingsItemIndex : uint8_t {
   DCInCutoff,

source/Core/Threads/GUIThread.cpp

@@ -717,8 +717,10 @@ void showDebugMenu(void) {
       break;
     case 11:
       // Power negotiation status
+      {
+        int sourceNumber = 0;
         if (getIsPoweredByDCIN()) {
-        OLED::printNumber(0, 1, FontStyle::SMALL);
+          sourceNumber = 0;
         } else {
           // We are not powered via DC, so want to display the appropriate state for PD or QC
           bool poweredbyPD = false;
@@ -732,12 +734,13 @@ void showDebugMenu(void) {
           }
 #endif
           if (poweredbyPD) {
-          OLED::printNumber(2, 1, FontStyle::SMALL);
+            sourceNumber = 2;
           } else {
-
+            sourceNumber = 1;
-          OLED::printNumber(1, 1, FontStyle::SMALL);
           }
         }
+        OLED::print(PowerSourceNames[sourceNumber], FontStyle::SMALL);
+      }
       break;
     case 12:
       // Max deg C limit