mirror of
https://gitlab.com/obbart/universal_robots_ros_driver.git
synced 2026-04-10 10:00:48 +02:00
Merge branch 'master' into ros-control
Conflicts: src/ur_communication.cpp
This commit is contained in:
@@ -80,11 +80,11 @@ bool UrCommunication::start() {
|
||||
if (connect(pri_sockfd_, (struct sockaddr *) &pri_serv_addr_,
|
||||
sizeof(pri_serv_addr_)) < 0) {
|
||||
#ifdef ROS_BUILD
|
||||
ROS_FATAL("Error connecting");
|
||||
ROS_FATAL("Error connecting to get firmware version");
|
||||
ros::shutdown();
|
||||
return false;
|
||||
#else
|
||||
printf("Error connecting\n");
|
||||
printf("Error connecting to get firmware version\n");
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user