From 38fc393f53b72569a5201350d2850151be483469 Mon Sep 17 00:00:00 2001 From: Felix Mauch Date: Tue, 9 Apr 2019 18:19:58 +0200 Subject: [PATCH] Fixed parsing of version message --- .../ur_rtde_driver/primary/robot_message/version_message.h | 2 ++ src/primary/robot_message/version_message.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/ur_rtde_driver/primary/robot_message/version_message.h b/include/ur_rtde_driver/primary/robot_message/version_message.h index 9f7a128..19a789a 100644 --- a/include/ur_rtde_driver/primary/robot_message/version_message.h +++ b/include/ur_rtde_driver/primary/robot_message/version_message.h @@ -37,6 +37,7 @@ namespace primary_interface class VersionMessage : public RobotMessage { public: + VersionMessage() = delete; VersionMessage(uint64_t timestamp, uint8_t source) : RobotMessage(timestamp, source) { } @@ -46,6 +47,7 @@ public: virtual std::string toString() const; + int8_t project_name_length_; std::string project_name_; uint8_t major_version_; uint8_t minor_version_; diff --git a/src/primary/robot_message/version_message.cpp b/src/primary/robot_message/version_message.cpp index 1ac94c1..b2bba22 100644 --- a/src/primary/robot_message/version_message.cpp +++ b/src/primary/robot_message/version_message.cpp @@ -37,8 +37,8 @@ namespace primary_interface { bool VersionMessage::parseWith(comm::BinParser& bp) { - RobotMessage::parseWith(bp); - bp.parse(project_name_); + bp.parse(project_name_length_); + bp.parse(project_name_, project_name_length_); bp.parse(major_version_); bp.parse(minor_version_); bp.parse(svn_version_); @@ -52,7 +52,7 @@ std::string VersionMessage::toString() const { std::stringstream ss; ss << "project name: " << project_name_ << std::endl; - ss << "version: " << major_version_ << "." << minor_version_ << "." << svn_version_ << std::endl; + ss << "version: " << unsigned(major_version_) << "." << unsigned(minor_version_) << "." << svn_version_ << std::endl; ss << "build date: " << build_date_; return ss.str();