Obbart/universal_robots_ros_driver
1
0
Fork 0
mirror of https://gitlab.com/obbart/universal_robots_ros_driver.git synced 2026-04-12 19:10:47 +02:00
Code Releases Activity

Merge current development into release

Browse Source
This commit is contained in:
Felix Mauch
2019-09-19 15:32:41 +02:00
parent 6c740665df 39afd72e6e
commit 9225d92715
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ur_rtde_driver/src/rtde/rtde_client.cpp
View File

@@ -74,6 +74,8 @@ bool RTDEClient::init()
}
}
parser_.setProtocolVersion(protocol_version);
// determine maximum frequency from ur-control version
size = GetUrcontrolVersionRequest::generateSerializedRequest(buffer);
stream_.write(buffer, size, written);

18
ur_rtde_driver/src/rtde/text_message.cpp
View File

@@ -33,11 +33,19 @@ namespace rtde_interface
{
bool TextMessage::parseWith(comm::BinParser& bp)
{
bp.parse(message_length_);
bp.parse(message_, message_length_);
bp.parse(source_length_);
bp.parse(source_, source_length_);
bp.parse(warning_level_);
if (protocol_version_ == 2)
{
bp.parse(message_length_);
bp.parse(message_, message_length_);
bp.parse(source_length_);
bp.parse(source_, source_length_);
bp.parse(warning_level_);
}
else if (protocol_version_ == 1)
{
bp.parse(message_type_);
bp.parseRemainder(message_);
}
return true;
}