Thomas Timm Andersen 5ccd97a276 Merge branch 'master' into ros-control ...

Conflicts:
	src/ur_communication.cpp

2015-09-24 16:17:18 +02:00

..

robot_state_RT.cpp

Added reconnect feature on RT port

2015-09-24 15:36:54 +02:00

robot_state.cpp

Removed commented code and non-RT socket write

2015-09-17 13:59:42 +02:00

ur_communication.cpp

Merge branch 'master' into ros-control

2015-09-24 16:17:18 +02:00

ur_driver.cpp

Added reconnect to secondary port

2015-09-24 16:10:33 +02:00

ur_hardware_interface.cpp

Added control switching

2015-09-24 13:50:53 +02:00

ur_realtime_communication.cpp

Added reconnect to RT port

2015-09-24 15:47:47 +02:00

ur_ros_wrapper.cpp

Added reconnect feature on RT port

2015-09-24 15:36:54 +02:00