From eb90b4a68dc8fdd7addd6347aaaee8b3f5d50307 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Fri, 7 Jan 2022 01:32:00 +0100
Subject: [PATCH] YAML Trainer data: iterate through nodes rather than assuming
 their presence (#1350)

Resolves #1349
---
 .../src/firmwares/edgetx/yaml_trainerdata.cpp     | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/companion/src/firmwares/edgetx/yaml_trainerdata.cpp b/companion/src/firmwares/edgetx/yaml_trainerdata.cpp
index b1952827d..a630a7495 100644
--- a/companion/src/firmwares/edgetx/yaml_trainerdata.cpp
+++ b/companion/src/firmwares/edgetx/yaml_trainerdata.cpp
@@ -61,19 +61,8 @@ Node convert<TrainerData>::encode(const TrainerData& rhs)
 
 bool convert<TrainerData>::decode(const Node& node, TrainerData& rhs)
 {
-  if (node["calib"]) {
-    const Node& calib = node["calib"];
-    for (int i = 0; i < 4; i++) {
-      calib[std::to_string(i)]["val"] >> rhs.calib[i];
-    }
-  }
-
-  if (node["mix"]) {
-    const Node& mix = node["mix"];
-    for (int i = 0; i < 4; i++) {
-      mix[std::to_string(i)] >> rhs.mix[i];
-    }
-  }
+  node["calib"] >> rhs.calib;
+  node["mix"] >> rhs.mix;
   return true;
 }