diff --git a/libuavcan_drivers/linux/apps/uavcan_nodetool.cpp b/libuavcan_drivers/linux/apps/uavcan_nodetool.cpp index 7bd06584f5..c75b17baa4 100644 --- a/libuavcan_drivers/linux/apps/uavcan_nodetool.cpp +++ b/libuavcan_drivers/linux/apps/uavcan_nodetool.cpp @@ -73,64 +73,6 @@ public: } }; - -std::string paramValueToString(const uavcan::protocol::param::Value& value) -{ - if (auto x = value.as()) - { - return *x ? "true" : "false"; - } - if (auto x = value.as()) - { - return std::to_string(*x); - } - if (auto x = value.as()) - { - return std::to_string(*x); - } - if (auto x = value.as()) - { - return std::string(x->c_str()) + " "; - } - return ""; -} - -std::string paramValueToString(const uavcan::protocol::param::NumericValue& value) -{ - if (auto x = value.as()) - { - return std::to_string(*x); - } - if (auto x = value.as()) - { - return std::to_string(*x); - } - return ""; -} - -void printGetSetResponseHeader() -{ - std::cout - << "Name Value Default Min Max\n" - << "--------------------------------------------------------------------------------------------------" - << std::endl; -} - -void printGetSetResponse(const uavcan::protocol::param::GetSet::Response& resp) -{ - const auto original_flags = std::cout.flags(); - - std::cout << std::setw(41) << std::left << resp.name.c_str(); - std::cout << std::setw(15) << paramValueToString(resp.value); - std::cout << std::setw(15) << paramValueToString(resp.default_value); - std::cout << std::setw(15) << paramValueToString(resp.min_value); - std::cout << std::setw(15) << paramValueToString(resp.max_value); - std::cout << std::endl; - - std::cout.width(0); // Clears the effect of std::setw() - std::cout.flags(original_flags); -} - uavcan_linux::NodePtr initNode(const std::vector& ifaces, uavcan::NodeID nid, const std::string& name) { auto node = uavcan_linux::makeNode(ifaces); @@ -172,7 +114,6 @@ const std::map& args) { auto client = node->makeBlockingServiceClient(); - printGetSetResponseHeader(); uavcan::protocol::param::GetSet::Request request; if (args.empty()) { @@ -183,7 +124,10 @@ const std::map() = std::stof(args.at(1)); - printGetSetResponse(call(*client, node_id, request)); + std::cout << call(*client, node_id, request) << std::endl; } } }