From 7a8260b1918b54ae54ac0f72c56a6a852d994006 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Sat, 11 Jul 2015 07:35:04 +0300 Subject: [PATCH] ParamServer update --- .../include/uavcan/protocol/param_server.hpp | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/libuavcan/include/uavcan/protocol/param_server.hpp b/libuavcan/include/uavcan/protocol/param_server.hpp index e5afb04943..a702b5cecd 100644 --- a/libuavcan/include/uavcan/protocol/param_server.hpp +++ b/libuavcan/include/uavcan/protocol/param_server.hpp @@ -69,22 +69,6 @@ public: * @return Negative if failed. */ virtual int eraseAllParams() = 0; - - /** - * Convenience methods that can be used to check if a param value is empty. - */ - static bool isValueEmpty(const Value& val) - { - return val.value_bool.empty() && - val.value_int.empty() && - val.value_float.empty() && - val.value_string.empty(); - } - static bool isValueEmpty(const NumericValue& val) - { - return val.value_int.empty() && - val.value_float.empty(); - } }; /** @@ -126,14 +110,14 @@ class UAVCAN_EXPORT ParamServer } // Assign if needed, read back - if (!IParamManager::isValueEmpty(in.value)) + if (!in.value.is()) { manager_->assignParamValue(out.name, in.value); } manager_->readParamValue(out.name, out.value); // Check if the value is OK, otherwise reset the name to indicate that we have no idea what is it all about - if (!IParamManager::isValueEmpty(out.value)) + if (!out.value.is()) { manager_->readParamDefaultMaxMin(out.name, out.default_value, out.max_value, out.min_value); }