fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 11:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored unions

Browse Source
This commit is contained in:
Pavel Kirienko
2015-07-11 11:35:26 +03:00
parent 903d88b8d1
commit e6aeb036e8
4 changed files with 49 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/apps/uavcan_nodetool.cpp
+7 -7
View File
@@ -76,19 +76,19 @@ public:
std::string paramValueToString(const uavcan::protocol::param::Value& value)
{
if (auto x = value.as<bool>())
if (auto x = value.as<uavcan::protocol::param::Value::Tag::boolean_value>())
{
return *x ? "true" : "false";
}
if (auto x = value.as<std::int64_t>())
if (auto x = value.as<uavcan::protocol::param::Value::Tag::integer_value>())
{
return std::to_string(*x);
}
if (auto x = value.as<float>())
if (auto x = value.as<uavcan::protocol::param::Value::Tag::real_value>())
{
return std::to_string(*x);
}
if (auto x = value.as<uavcan::protocol::param::Value::FieldTypes::string_value>())
if (auto x = value.as<uavcan::protocol::param::Value::Tag::string_value>())
{
return std::string(x->c_str()) + " ";
}
@@ -97,11 +97,11 @@ std::string paramValueToString(const uavcan::protocol::param::Value& value)
std::string paramValueToString(const uavcan::protocol::param::NumericValue& value)
{
if (auto x = value.as<std::int64_t>())
if (auto x = value.as<uavcan::protocol::param::NumericValue::Tag::integer_value>())
{
return std::to_string(*x);
}
if (auto x = value.as<float>())
if (auto x = value.as<uavcan::protocol::param::NumericValue::Tag::real_value>())
{
return std::to_string(*x);
}
@@ -191,7 +191,7 @@ const std::map<std::string,
{
request.name = args.at(0).c_str();
// TODO: add support for string parameters
request.value = std::stof(args.at(1));
request.value.to<uavcan::protocol::param::Value::Tag::real_value>() = std::stof(args.at(1));
printGetSetResponse(call(*client, node_id, request));
}
}