From 1d2892ee2fa727bacd22d5f200a88eaa011f2428 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Thu, 23 Dec 2021 10:43:51 +0100
Subject: [PATCH] Remove some more empty attributes

---
 .../firmwares/edgetx/yaml_generalsettings.cpp | 27 ++++++++++++++++---
 .../src/firmwares/edgetx/yaml_modeldata.cpp   |  4 ++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp
index 99335d272..fe1e96aea 100644
--- a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+++ b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp
@@ -151,10 +151,29 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
     }
   }
 
-  node["sticksConfig"] = YamlStickConfig(rhs.stickName);
-  node["switchConfig"] = YamlSwitchConfig(rhs.switchName, rhs.switchConfig);
-  node["potsConfig"] = YamlPotConfig(rhs.potName, rhs.potConfig);
-  node["slidersConfig"] = YamlSliderConfig(rhs.sliderName, rhs.sliderConfig);
+  Node sticksConfig;
+  sticksConfig = YamlStickConfig(rhs.stickName);
+  if (sticksConfig && sticksConfig.IsMap()) {
+    node["sticksConfig"] = sticksConfig;
+  }
+
+  Node switchConfig;
+  switchConfig = YamlSwitchConfig(rhs.switchName, rhs.switchConfig);
+  if (switchConfig && switchConfig.IsMap()) {
+    node["switchConfig"] = switchConfig;
+  }
+
+  Node potsConfig;
+  potsConfig = YamlPotConfig(rhs.potName, rhs.potConfig);
+  if (potsConfig && potsConfig.IsMap()) {
+    node["potsConfig"] = potsConfig;
+  }
+
+  Node slidersConfig;
+  slidersConfig = YamlSliderConfig(rhs.sliderName, rhs.sliderConfig);
+  if (slidersConfig && slidersConfig.IsMap()) {
+    node["slidersConfig"] = slidersConfig;
+  }
 
   // Color lcd theme settings are not used in EdgeTx
   // RadioTheme::ThemeData themeData;
diff --git a/companion/src/firmwares/edgetx/yaml_modeldata.cpp b/companion/src/firmwares/edgetx/yaml_modeldata.cpp
index 6bcf0d191..723f9c2e4 100644
--- a/companion/src/firmwares/edgetx/yaml_modeldata.cpp
+++ b/companion/src/firmwares/edgetx/yaml_modeldata.cpp
@@ -719,7 +719,9 @@ Node convert<ModelData>::encode(const ModelData& rhs)
   }
 
   for (auto input : inputs) {
-    node["inputNames"][std::to_string(input)]["val"] = rhs.inputNames[input];
+    if (rhs.inputNames[input][0]) {
+      node["inputNames"][std::to_string(input)]["val"] = rhs.inputNames[input];
+    }
   }
 
   for (int i = 0; i < CPN_MAX_CURVES; i++) {