Add SF/LS custom names + new "SAFE" LS

CMakeLists.txt

@@ -5,7 +5,7 @@ project(EdgeTX)
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "10")
 set(VERSION_REVISION "0")
-set(CODENAME "dev")
+set(CODENAME "FlyingDutchman")
 
 if(MINGW OR WIN32)
   set(CMAKE_OBJECT_PATH_MAX 200)

companion/src/firmwares/customfunctiondata.h

@@ -27,6 +27,8 @@
 #include <QtCore>
 #include <QComboBox>
 
+#define CF_CUSTNAME_LEN       10
+
 class Firmware;
 class ModelData;
 class GeneralSettings;
@@ -105,6 +107,7 @@ class CustomFunctionData {
     unsigned int enabled; // TODO perhaps not any more the right name
     unsigned int adjustMode;
     int repeatParam;
+    char custName[CF_CUSTNAME_LEN + 1];
 
     void convert(RadioDataConversionState & cstate);
 

companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp

@@ -241,6 +241,8 @@ Node convert<CustomFunctionData>::encode(const CustomFunctionData& rhs)
     node["def"] = def;
   }
 
+  node["custName"] = rhs.custName;
+
   return node;
 }
 
@@ -249,6 +251,8 @@ bool convert<CustomFunctionData>::decode(const Node& node,
 {
   node["swtch"] >> rhs.swtch;
 
+  node["custName"] >> rhs.custName;
+
   int func = 0;
   node["func"] >> customFnLut >> func;
   rhs.func = (AssignFunc)func;

companion/src/firmwares/edgetx/yaml_logicalswitchdata.cpp

@@ -41,6 +41,7 @@ static const YamlLookupTable funcLut = {
     {LS_FN_DAPOS, "FUNC_ADIFFEGREATER"},
     {LS_FN_TIMER, "FUNC_TIMER"},
     {LS_FN_STICKY, "FUNC_STICKY"},
+    {LS_FN_SAFE, "FUNC_SAFE"},
 };
 
 static int timerValue2lsw(uint32_t t)
@@ -79,6 +80,12 @@ Node convert<LogicalSwitchData>::encode(const LogicalSwitchData& rhs)
     def += YamlRawSwitchEncode(RawSwitch(rhs.val2));
   } break;
 
+  case LS_FAMILY_SAFE: {
+    def += YamlRawSwitchEncode(RawSwitch(rhs.val1));
+    def += ",";
+    def += YamlRawSwitchEncode(RawSwitch(rhs.val2));
+  } break;
+
   case LS_FAMILY_EDGE: {
     def += YamlRawSwitchEncode(RawSwitch(rhs.val1));
     def += ",";
@@ -116,14 +123,15 @@ Node convert<LogicalSwitchData>::encode(const LogicalSwitchData& rhs)
   node["delay"] = rhs.delay;
   node["duration"] = rhs.duration;
   node["andsw"] = YamlRawSwitchEncode(RawSwitch(rhs.andsw));
-
+  node["custName"] = rhs.custName;
   return node;
 }
 
 bool convert<LogicalSwitchData>::decode(const Node& node,
                                         LogicalSwitchData& rhs)
 {
   node["func"] >> funcLut >> rhs.func;
+  node["custName"] >> rhs.custName;
 
   std::string def_str;
   node["def"] >> def_str;
@@ -139,6 +147,14 @@ bool convert<LogicalSwitchData>::decode(const Node& node,
     rhs.val2 = YamlRawSwitchDecode(sw_str).toValue();
   } break;
 
+case LS_FAMILY_SAFE: {
+    std::string sw_str;
+    getline(def, sw_str, ',');
+    rhs.val1 = YamlRawSwitchDecode(sw_str).toValue();
+    getline(def, sw_str);
+    rhs.val2 = YamlRawSwitchDecode(sw_str).toValue();
+  } break;
+
   case LS_FAMILY_EDGE: {
     std::string sw_str;
     getline(def, sw_str, ',');

companion/src/firmwares/logicalswitchdata.cpp

@@ -27,7 +27,7 @@
 
 bool LogicalSwitchData::isEmpty() const
 {
-  return (func == 0);
+  return (func == LS_FN_OFF);
 }
 
 CSFunctionFamily LogicalSwitchData::getFunctionFamily() const
@@ -38,6 +38,8 @@ CSFunctionFamily LogicalSwitchData::getFunctionFamily() const
     return LS_FAMILY_TIMER;
   else if (func == LS_FN_STICKY)
     return LS_FAMILY_STICKY;
+  else if (func == LS_FN_SAFE)
+    return LS_FAMILY_SAFE;
   else if (func < LS_FN_AND || func > LS_FN_ELESS)
     return LS_FAMILY_VOFS;
   else if (func < LS_FN_EQUAL)
@@ -102,6 +104,8 @@ QString LogicalSwitchData::funcToString() const
       return tr("Timer");
     case LS_FN_STICKY:
       return tr("Sticky");
+    case LS_FN_SAFE:
+      return tr("Safe");
     case LS_FN_EDGE:
       return tr("Edge");
     default:
@@ -111,7 +115,7 @@ QString LogicalSwitchData::funcToString() const
 
 QString LogicalSwitchData::nameToString(int index) const
 {
-  return RadioData::getElementName(tr("L"), index + 1, NULL, true);
+  return RadioData::getElementName(tr("L"), index + 1, custName, true);
 }
 
 void LogicalSwitchData::convert(RadioDataConversionState & cstate)
@@ -124,6 +128,10 @@ void LogicalSwitchData::convert(RadioDataConversionState & cstate)
       val1 = RawSource(val1).convert(cstate.withComponentField("V1")).toValue();
       break;
     case LS_FAMILY_STICKY:
+    case LS_FAMILY_SAFE:
+      val1 = RawSwitch(val1).convert(cstate.withComponentField("V1")).toValue();
+      val2 = RawSwitch(val2).convert(cstate.withComponentField("V2")).toValue();
+      break;
     case LS_FAMILY_VBOOL:
       val1 = RawSwitch(val1).convert(cstate.withComponentField("V1")).toValue();
       val2 = RawSwitch(val2).convert(cstate.withComponentField("V2")).toValue();

companion/src/firmwares/logicalswitchdata.h

@@ -18,11 +18,12 @@
  * GNU General Public License for more details.
  */
 
-#ifndef LOGICALSWITCHDATA_H
-#define LOGICALSWITCHDATA_H
+#pragma once
 
 #include <QtCore>
 
+#define LS_CUSTNAME_LEN       10
+
 class RadioDataConversionState;
 
 enum CSFunction {
@@ -47,8 +48,10 @@ enum CSFunction {
   LS_FN_TIMER,
   LS_FN_STICKY,
   LS_FN_EDGE,
+  LS_FN_SAFE,
   // later ... LS_FN_RANGE,
-    LS_FN_MAX
+  LS_FN_MAX,
+
 };
 
 enum CSFunctionFamily {
@@ -58,6 +61,7 @@ enum CSFunctionFamily {
   LS_FAMILY_TIMER,
   LS_FAMILY_STICKY,
   LS_FAMILY_EDGE,
+  LS_FAMILY_SAFE,
 };
 
 class LogicalSwitchData {
@@ -76,6 +80,7 @@ class LogicalSwitchData {
     unsigned int delay;
     unsigned int duration;
     int andsw;
+    char custName[LS_CUSTNAME_LEN + 1];
 
     void clear() { memset(this, 0, sizeof(LogicalSwitchData)); }
     bool isEmpty() const;
@@ -85,5 +90,3 @@ class LogicalSwitchData {
     QString nameToString(int index) const;
     void convert(RadioDataConversionState & cstate);
 };
-
-#endif // LOGICALSWITCHDATA_H

companion/src/firmwares/modeldata.cpp

@@ -720,6 +720,12 @@ int ModelData::updateReference()
           }
           break;
         case LS_FAMILY_STICKY:
+        case LS_FAMILY_SAFE:
+          if (lsd->val1 != 0)
+            updateSwitchIntRef(lsd->val1);
+          if (lsd->val2 != 0)
+            updateSwitchIntRef(lsd->val2);
+          break;
         case LS_FAMILY_VBOOL:
           oldval1 = lsd->val1;
           oldval2 = lsd->val2;

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -1355,6 +1355,7 @@ class LogicalSwitchesFunctionsTable: public ConversionTable {
       addConversion(LS_FN_DAPOS, val++);
       addConversion(LS_FN_TIMER, val++);
       addConversion(LS_FN_STICKY, val++);
+      addConversion(LS_FN_SAFE, val++);
     }
 };
 
@@ -1410,7 +1411,7 @@ class LogicalSwitchField: public TransformedField {
         v2 = csw.val2;
         v3 = csw.val3;
       }
-      else if ((csw.func >= LS_FN_AND && csw.func <= LS_FN_XOR) || csw.func == LS_FN_STICKY) {
+      else if ((csw.func >= LS_FN_AND && csw.func <= LS_FN_XOR) || csw.func == LS_FN_STICKY || csw.func == LS_FN_SAFE) {
         switchesConversionTable->exportValue(csw.val1, v1);
         switchesConversionTable->exportValue(csw.val2, v2);
       }
@@ -1435,7 +1436,7 @@ class LogicalSwitchField: public TransformedField {
         csw.val2 = v2;
         csw.val3 = v3;
       }
-      else if ((csw.func >= LS_FN_AND && csw.func <= LS_FN_XOR) || csw.func == LS_FN_STICKY) {
+      else if ((csw.func >= LS_FN_AND && csw.func <= LS_FN_XOR) || csw.func == LS_FN_STICKY || csw.func == LS_FN_SAFE) {
         switchesConversionTable->importValue(v1, csw.val1);
         switchesConversionTable->importValue(v2, csw.val2);
       }

companion/src/firmwares/rawsource.cpp

@@ -204,7 +204,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con
       return result;
 
     case SOURCE_TYPE_CUSTOM_SWITCH:
-      return RawSwitch(SWITCH_TYPE_VIRTUAL, index + 1).toString();
+      return RawSwitch(SWITCH_TYPE_VIRTUAL, index + 1).toString(board, generalSettings, model);
 
     case SOURCE_TYPE_CYC:
       return tr("CYC%1").arg(index + 1);

companion/src/firmwares/rawswitch.cpp

@@ -86,9 +86,9 @@ 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 - 1].nameToString(index - 1);
         else
-          return LogicalSwitchData().nameToString(index-1);
+          return LogicalSwitchData().nameToString(index - 1);
 
       case SWITCH_TYPE_FUNCTIONSWITCH:
         if (!Boards::getCapability(board, Board::FunctionSwitches))

companion/src/helpers.h

@@ -250,6 +250,13 @@ extern Stopwatch gStopwatch;
 class SemanticVersion
 {
   public:
+<<<<<<< HEAD
+    explicit SemanticVersion(QString vers);
+    ~SemanticVersion() = default;;
+
+    bool isValid(const QString vers);
+    QString toString() const;
+=======
     explicit SemanticVersion(const QString vers);
     explicit SemanticVersion() {}
     ~SemanticVersion() {}
@@ -262,6 +269,7 @@ class SemanticVersion
     bool fromInt(const unsigned int val);
 
     SemanticVersion& operator=(const SemanticVersion& rhs);
+>>>>>>> e898e851460f0b76873d4442cdc8144474863f5e
 
     bool operator==(const SemanticVersion& rhs) {
       return compare(rhs) == 0;
@@ -288,6 +296,21 @@ class SemanticVersion
     }
 
   private:
+<<<<<<< HEAD
+    enum PreRelease {
+      PR_ALPHA = 0,
+      PR_BETA = 1,
+      PR_RC = 2,
+      PR_NONE = 3
+    };
+
+    struct Version {
+      int major                     = 0;
+      int minor                     = 1;
+      int patch                     = 0;
+      PreRelease preReleaseType     = PR_NONE;
+      int preReleaseNumber          = 0;
+=======
     enum PreReleaseTypes {
       PR_ALPHA = 0,
       PR_BETA,
@@ -303,13 +326,17 @@ class SemanticVersion
       int patch            = 0;
       int preReleaseType   = PR_NONE;
       int preReleaseNumber = 0;
+>>>>>>> e898e851460f0b76873d4442cdc8144474863f5e
     };
 
     Version version;
 
     int compare(const SemanticVersion& other);
+<<<<<<< HEAD
+=======
     inline QString preReleaseTypeToString() const { return PreReleaseTypesStringList.value(version.preReleaseType, ""); }
     inline int preReleaseTypeToInt(QString preRelType) const { return PreReleaseTypesStringList.indexOf(preRelType); }
+>>>>>>> e898e851460f0b76873d4442cdc8144474863f5e
 
 };
 

companion/src/modeledit/customfunctions.h

@@ -46,6 +46,7 @@ class CustomFunctionsPanel : public GenericPanel
 
   private slots:
     void customFunctionEdited();
+    void onNameEdited();
     void functionEdited();
     void onCustomContextMenuRequested(QPoint pos);
     void refreshCustomFunction(int index, bool modified=false);
@@ -93,6 +94,7 @@ class CustomFunctionsPanel : public GenericPanel
     QSet<QString> tracksSet;
     QSet<QString> scriptsSet;
     int mediaPlayerCurrent;
+    QLineEdit * name[CPN_MAX_SPECIAL_FUNCTIONS];
     QComboBox * fswtchSwtch[CPN_MAX_SPECIAL_FUNCTIONS];
     QComboBox * fswtchFunc[CPN_MAX_SPECIAL_FUNCTIONS];
     QCheckBox * fswtchParamGV[CPN_MAX_SPECIAL_FUNCTIONS];