companion: display LS friendly name in Comboxes

EdgeTX · Dec 7, 2022 · a54b5e4 · a54b5e4
1 parent 3e8b1ab
commit a54b5e4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/companion/src/firmwares/logicalswitchdata.cpp b/companion/src/firmwares/logicalswitchdata.cpp
@@ -117,6 +117,10 @@ QString LogicalSwitchData::nameToString(int index) const
 {
   return RadioData::getElementName(tr("L"), index + 1, NULL, true);
 }
+QString LogicalSwitchData::custNameToString() const
+{
+  return custName;
+}
 
 void LogicalSwitchData::convert(RadioDataConversionState & cstate)
 {

diff --git a/companion/src/firmwares/logicalswitchdata.h b/companion/src/firmwares/logicalswitchdata.h
@@ -87,6 +87,7 @@ class LogicalSwitchData {
     unsigned int getRangeFlags() const;
     QString funcToString() const;
     QString nameToString(int index) const;
+    QString custNameToString() const;
     void convert(RadioDataConversionState & cstate);
 };
 

diff --git a/companion/src/firmwares/rawswitch.cpp b/companion/src/firmwares/rawswitch.cpp
@@ -86,7 +86,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen
 
       case SWITCH_TYPE_VIRTUAL:
         if (modelData)
-          return modelData->logicalSw[index].nameToString(index-1);
+          return modelData->logicalSw[index].nameToString(index-1) + ": " + modelData->logicalSw[index].custNameToString() ;
         else
           return LogicalSwitchData().nameToString(index-1);
 

diff --git a/companion/src/modeledit/customfunctions.h b/companion/src/modeledit/customfunctions.h
@@ -93,7 +93,7 @@ class CustomFunctionsPanel : public GenericPanel
     QSet<QString> tracksSet;
     QSet<QString> scriptsSet;
     int mediaPlayerCurrent;
-    QLineEdit *name[CPN_MAX_SPECIAL_FUNCTIONS];
+    QLineEdit * name[CPN_MAX_SPECIAL_FUNCTIONS];
     QComboBox * fswtchSwtch[CPN_MAX_SPECIAL_FUNCTIONS];
     QComboBox * fswtchFunc[CPN_MAX_SPECIAL_FUNCTIONS];
     QCheckBox * fswtchParamGV[CPN_MAX_SPECIAL_FUNCTIONS];