Display analog names properly

Resolves #91

radio/src/gui/colorlcd/sourcechoice.cpp

@@ -28,7 +28,8 @@
 #include "draw_functions.h"
 #include "opentx.h"
 
-class SourceChoiceMenuToolbar : public MenuToolbar<SourceChoice> {
+class SourceChoiceMenuToolbar : public MenuToolbar<SourceChoice>
+{
   public:
     SourceChoiceMenuToolbar(SourceChoice * choice, Menu * menu):
       MenuToolbar<SourceChoice>(choice, menu)
@@ -84,13 +85,9 @@ void SourceChoice::fillMenu(Menu * menu, const std::function<bool(int16_t)> & fi
   menu->removeLines();
 
   for (int i = vmin; i <= vmax; ++i) {
-    if (filter && !filter(i))
-      continue;
-    if (isValueAvailable && !isValueAvailable(i))
-      continue;
-    menu->addLine(getSourceString(i), [=]() {
-      setValue(i);
-    });
+    if (filter && !filter(i)) continue;
+    if (isValueAvailable && !isValueAvailable(i)) continue;
+    menu->addLine(getSourceString(i), [=]() { setValue(i); });
     if (value == i) {
       current = count;
     }

radio/src/strhelpers.cpp

@@ -436,12 +436,24 @@ char * getSourceString(char * dest, mixsrc_t idx)
   }
 #endif
   else if (idx <= MIXSRC_LAST_POT) {
-    idx -= MIXSRC_Rud;
-    if (g_eeGeneral.anaNames[idx][0]) {
-      zchar2str(dest, g_eeGeneral.anaNames[idx], LEN_ANA_NAME);
-      dest[LEN_ANA_NAME] = '\0';
+
+    if (g_eeGeneral.anaNames[idx - MIXSRC_Rud][0]) {
+
+      //TODO: add correct symbol
+      if(idx <= MIXSRC_LAST_STICK) {
+        dest[0] = CHAR_STICK;
+      } else if (idx < MIXSRC_FIRST_SLIDER) {
+        dest[0] = CHAR_POT;
+      } else {
+        dest[0] = CHAR_SLIDER;
+      }
+
+      idx -= MIXSRC_Rud;
+      memcpy(dest+1, g_eeGeneral.anaNames[idx], LEN_ANA_NAME);
+      dest[LEN_ANA_NAME+1] = '\0';
     }
     else {
+      idx -= MIXSRC_Rud;
       getStringAtIndex(dest, STR_VSRCRAW, idx + 1);
     }
   }