Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 4, 2025

Since PolyScopeX robots don't have a dashboard server, we'll have to make sure to

a) not start the dashboard client when interacting with a PolyScopeX robot
b) replace the robot_state_helper's functions to the dashboard server with primary_client API calls.

This requires UniversalRobots/Universal_Robots_Client_Library#296 to work.


This is an automatic backport of pull request #1318 done by Mergify.

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Apr 4, 2025
@mergify
Copy link
Author

mergify bot commented Apr 4, 2025

Cherry-pick of 5162bf4 has failed:

On branch mergify/bp/humble/pr-1318
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 5162bf4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ur_robot_driver/CMakeLists.txt
	modified:   ur_robot_driver/include/ur_robot_driver/dashboard_client_ros.hpp
	modified:   ur_robot_driver/include/ur_robot_driver/robot_state_helper.hpp
	modified:   ur_robot_driver/launch/ur_control.launch.py
	modified:   ur_robot_driver/src/dashboard_client_node.cpp
	modified:   ur_robot_driver/src/dashboard_client_ros.cpp
	modified:   ur_robot_driver/src/robot_state_helper_node.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/src/robot_state_helper.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

* Shutdown dashboard client when connected to PolyScopeX robot

Before trying to establish a connection to the dashboard server, check
the version of the connected robot. If it is a PolyScopeX robot,
shutdown the dashboard client.

* Make robot_state_helper use primary_client whenever possible
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1318 branch from 4a67a92 to f551190 Compare April 7, 2025 06:16
@urfeex urfeex removed the conflicts label Apr 7, 2025
@urfeex urfeex merged commit 81c380b into humble Apr 7, 2025
6 of 7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1318 branch April 7, 2025 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

humble Relevant for humble and higher ROS versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant