From 763964193e904ae6b9f0ef68bd45e7b9a1a93607 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Wed, 1 Dec 2021 14:37:05 +0100
Subject: [PATCH] Small fixes

---
 .../src/firmwares/edgetx/edgetxinterface.cpp     |  4 ++--
 .../src/firmwares/edgetx/yaml_modeldata.cpp      | 16 ++++++++--------
 .../src/firmwares/edgetx/yaml_rawswitch.cpp      |  2 +-
 .../src/firmwares/edgetx/yaml_switchconfig.h     |  2 +-
 companion/src/storage/categorized.cpp            |  5 +++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/companion/src/firmwares/edgetx/edgetxinterface.cpp b/companion/src/firmwares/edgetx/edgetxinterface.cpp
index e75428b2b..da1f12891 100644
--- a/companion/src/firmwares/edgetx/edgetxinterface.cpp
+++ b/companion/src/firmwares/edgetx/edgetxinterface.cpp
@@ -38,7 +38,7 @@ static void writeYamlToByteArray(const YAML::Node& node, QByteArray& data)
     data_ostream << node;
     data = QByteArray::fromStdString(data_ostream.str());
 
-    qDebug() << "Saving radio.yml:";
+    qDebug() << "Saving YAML:";
     qDebug() << data_ostream.str().c_str();
 }
 
@@ -139,5 +139,5 @@ bool writeRadioSettingsToYaml(const GeneralSettings& settings, QByteArray& data)
   node = settings;
 
   writeYamlToByteArray(node, data);
-  return false;
+  return true;
 }
diff --git a/companion/src/firmwares/edgetx/yaml_modeldata.cpp b/companion/src/firmwares/edgetx/yaml_modeldata.cpp
index e31989958..c762ee5fa 100644
--- a/companion/src/firmwares/edgetx/yaml_modeldata.cpp
+++ b/companion/src/firmwares/edgetx/yaml_modeldata.cpp
@@ -50,7 +50,7 @@ Node convert<TimerData>::encode(const TimerData& rhs)
   node["swtch"] = rhs.swtch;
   node["mode"] = timerModeLut << rhs.mode;
   node["name"] = rhs.name;
-  node["minuteBeep"] = rhs.minuteBeep;
+  node["minuteBeep"] = (int)rhs.minuteBeep;
   node["countdownBeep"] = rhs.countdownBeep;
   node["start"] = rhs.val;
   node["persistent"] = rhs.persistent;
@@ -86,15 +86,15 @@ Node convert<ModelData>::encode(const ModelData& rhs)
     node["timers"][std::to_string(i)] = timer;
   }
 
-  node["noGlobalFunctions"] = rhs.noGlobalFunctions;
-  node["thrTrim"] = rhs.thrTrim;
+  node["noGlobalFunctions"] = (int)rhs.noGlobalFunctions;
+  node["thrTrim"] = (int)rhs.thrTrim;
   node["trimInc"] = rhs.trimInc;
   node["displayTrims"] = rhs.trimsDisplay;
-  node["disableThrottleWarning"] = rhs.disableThrottleWarning;
+  node["disableThrottleWarning"] = (int)rhs.disableThrottleWarning;
   // node[] = rhs.beepANACenter;
-  node["extendedLimits"] = rhs.extendedLimits;
-  node["extendedTrims"] = rhs.extendedTrims;
-  node["throttleReversed"] = rhs.throttleReversed;
+  node["extendedLimits"] = (int)rhs.extendedLimits;
+  node["extendedTrims"] = (int)rhs.extendedTrims;
+  node["throttleReversed"] = (int)rhs.throttleReversed;
 
   // flightModeData[]
   // mixData[]
@@ -113,7 +113,7 @@ Node convert<ModelData>::encode(const ModelData& rhs)
   // potsWarnEnabled[]
   // potsWarnPosition[]
 
-  node["displayChecklist"] = rhs.displayChecklist;
+  node["displayChecklist"] = (int)rhs.displayChecklist;
 
   // gvarData[]
   // mavlink ???
diff --git a/companion/src/firmwares/edgetx/yaml_rawswitch.cpp b/companion/src/firmwares/edgetx/yaml_rawswitch.cpp
index 9bad86be9..af1a9f0ea 100644
--- a/companion/src/firmwares/edgetx/yaml_rawswitch.cpp
+++ b/companion/src/firmwares/edgetx/yaml_rawswitch.cpp
@@ -139,7 +139,7 @@ bool convert<RawSwitch>::decode(const Node& node, RawSwitch& rhs)
     // TODO: check if we have a match?
     //       or does RawSwitch default to NONE anyway?
     //
-    node >> switchTypeLut >> rhs.type;
+    node >> rhs.type;
     rhs.index = 0;
   }
 
diff --git a/companion/src/firmwares/edgetx/yaml_switchconfig.h b/companion/src/firmwares/edgetx/yaml_switchconfig.h
index 5cc2cc7d9..0a846d15b 100644
--- a/companion/src/firmwares/edgetx/yaml_switchconfig.h
+++ b/companion/src/firmwares/edgetx/yaml_switchconfig.h
@@ -55,7 +55,7 @@ struct YamlKnobConfig : public YamlNameConfig<N, name_lut> {
                  const unsigned int in_configs[N]) :
       YamlNameConfig<N, name_lut>(in_names)
   {
-    memset(config, 0, sizeof(config));
+    memcpy(config, in_configs, sizeof(config));
   }
 
   void copy(char out_names[N][HARDWARE_NAME_LEN + 1],
diff --git a/companion/src/storage/categorized.cpp b/companion/src/storage/categorized.cpp
index a32442587..262ed4ac5 100644
--- a/companion/src/storage/categorized.cpp
+++ b/companion/src/storage/categorized.cpp
@@ -311,9 +311,10 @@ bool CategorizedStorageFormat::writeYaml(const RadioData & radioData)
   // TODO: sort 'modelFiles' by category index
   QByteArray modelslistBuffer;
   if (!writeModelsListToYaml(radioData.categories, modelFiles, modelslistBuffer)
-      || writeFile(modelslistBuffer, "MODELS/models.yml")) {
+      || !writeFile(modelslistBuffer, "MODELS/models.yml")) {
     return false;
   }
 
-  return true;
+  // force error to avoid overwriting the archive...
+  return false;
 }