From d636487663824767d2403482fe6d1fbf89ac121a Mon Sep 17 00:00:00 2001 From: elecpower Date: Sat, 4 Dec 2021 09:30:56 +1100 Subject: [PATCH] Fix more compiler warnings --- companion/src/firmwares/edgetx/yaml_modeldata.cpp | 4 ++-- companion/src/firmwares/edgetx/yaml_ops.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/firmwares/edgetx/yaml_modeldata.cpp b/companion/src/firmwares/edgetx/yaml_modeldata.cpp index 02d2cfb7d..83ebbdab2 100644 --- a/companion/src/firmwares/edgetx/yaml_modeldata.cpp +++ b/companion/src/firmwares/edgetx/yaml_modeldata.cpp @@ -75,7 +75,7 @@ struct YamlThrTrace { Boards board(getCurrentBoard()); int pots = board.getCapability(Board::Pots); int sliders = board.getCapability(Board::Sliders); - if (cpn_value < pots + sliders) { + if (cpn_value < (unsigned int)(pots + sliders)) { src = RawSource(SOURCE_TYPE_STICK, 4/* sticks */ + cpn_value); } else { @@ -198,7 +198,7 @@ struct convert { return true; } }; - + template <> struct convert { static Node encode(const FlightModeData& rhs) diff --git a/companion/src/firmwares/edgetx/yaml_ops.h b/companion/src/firmwares/edgetx/yaml_ops.h index 9e9f67967..17e04173e 100644 --- a/companion/src/firmwares/edgetx/yaml_ops.h +++ b/companion/src/firmwares/edgetx/yaml_ops.h @@ -99,7 +99,7 @@ void operator>>(const YAML::Node& node, T (&value)[N]) for (const auto& elmt : node) { try { int idx = std::stoi(elmt.first.Scalar()); - if (idx < 0 || idx >= N) return; + if (idx < 0 || idx >= (int)N) return; elmt.second >> value[idx]; } catch (...) { @@ -134,7 +134,7 @@ struct convert_array return node; } }; - + template struct convert_enum {