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

Merge branch 'master' into ros-control

Browse Source 
Conflicts:
	src/ur_communication.cpp
This commit is contained in:
Thomas Timm Andersen
2015-09-24 16:17:18 +02:00
parent 6e9f646b02 7c6080e89e
commit 5ccd97a276
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ur_communication.cpp
View File

@@ -80,11 +80,11 @@ bool UrCommunication::start() {
if (connect(pri_sockfd_, (struct sockaddr *) &pri_serv_addr_, if (connect(pri_sockfd_, (struct sockaddr *) &pri_serv_addr_,
sizeof(pri_serv_addr_)) < 0) { sizeof(pri_serv_addr_)) < 0) {
#ifdef ROS_BUILD #ifdef ROS_BUILD
ROS_FATAL("Error connecting"); ROS_FATAL("Error connecting to get firmware version");
ros::shutdown(); ros::shutdown();
return false; return false;
#else #else
printf("Error connecting\n"); printf("Error connecting to get firmware version\n");
return false; return false;
#endif #endif
} }