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

move calibration check to earlier time

Otherwise it blocks reading RTDE data.
This commit is contained in:
Felix Mauch
2019-07-18 11:12:44 +02:00
parent 8166bf3d67
commit e63de16225

View File

@@ -60,6 +60,9 @@ ur_driver::UrDriver::UrDriver(const std::string& robot_ip, const std::string& sc
LOG_DEBUG("Initializing RTDE client"); LOG_DEBUG("Initializing RTDE client");
rtde_client_.reset(new rtde_interface::RTDEClient(robot_ip_, notifier_, recipe_file)); rtde_client_.reset(new rtde_interface::RTDEClient(robot_ip_, notifier_, recipe_file));
LOG_INFO("Checking if calibration data matches connected robot.");
checkCalibration(calibration_checksum);
if (!rtde_client_->init()) if (!rtde_client_->init())
{ {
throw UrException("Initialization of RTDE client went wrong."); throw UrException("Initialization of RTDE client went wrong.");
@@ -70,8 +73,6 @@ ur_driver::UrDriver::UrDriver(const std::string& robot_ip, const std::string& sc
std::string local_ip = rtde_client_->getIP(); std::string local_ip = rtde_client_->getIP();
LOG_INFO("Checking if calibration data matches connected robot.");
checkCalibration(calibration_checksum);
uint32_t reverse_port = 50001; // TODO: Make this a parameter uint32_t reverse_port = 50001; // TODO: Make this a parameter
uint32_t script_sender_port = 50002; // TODO: Make this a parameter uint32_t script_sender_port = 50002; // TODO: Make this a parameter