Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rqt_controller_manager] Add hardware components #1455

Merged
merged 18 commits into from
Jun 25, 2024
Merged

[rqt_controller_manager] Add hardware components #1455

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c2337b2
Initial ui change
christophfroehlich Mar 23, 2024
827516e
Fix rqt_cm for non-humble
christophfroehlich Mar 23, 2024
13f2139
Add cm as dependency
christophfroehlich Mar 18, 2024
82a2002
Use os.environ.get('ROS_DISTRO') instead
christophfroehlich Mar 23, 2024
b4e0685
Fix format
christophfroehlich Mar 23, 2024
f647d03
Working version for listing components
christophfroehlich Mar 23, 2024
835c439
Add tooltip
christophfroehlich Mar 23, 2024
778f337
Add the context menu options
christophfroehlich Mar 23, 2024
450e80d
Do not block if service is not responding
christophfroehlich Mar 23, 2024
6ac38d7
Implement shutdown transition and rename context menu
christophfroehlich Mar 23, 2024
1638e14
Rename ui file and set window title
christophfroehlich Mar 23, 2024
c203181
Remove timeout again
christophfroehlich Mar 23, 2024
990caf7
Add different timer for hw_components
christophfroehlich Mar 23, 2024
8fd2474
Add it to docs as well
christophfroehlich Mar 23, 2024
1c9019e
Apply suggestions for documentation
christophfroehlich Mar 25, 2024
deae520
Reuse code instead of duplicating
christophfroehlich Mar 25, 2024
457138e
Clean labeling of transitions
christophfroehlich Mar 25, 2024
2ce3f7e
Merge branch 'master' into rqt_cm_add_hw
christophfroehlich Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added controller_manager/doc/images/rqt_controller_manager.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions controller_manager/doc/userdoc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,24 @@ There are two scripts to interact with controller manager from launch files:
-c CONTROLLER_MANAGER, --controller-manager CONTROLLER_MANAGER
Name of the controller manager ROS node

rqt_controller_manager
----------------------
There exists a GUI tool to interact with the controller manager.
christophfroehlich marked this conversation as resolved.
Show resolved Hide resolved

.. image:: images/rqt_controller_manager.png

It can be launched independently
christophfroehlich marked this conversation as resolved.
Show resolved Hide resolved

.. code-block:: console

ros2 run rqt_controller_manager rqt_controller_manager

or as rqt plugin.

christophfroehlich marked this conversation as resolved.
Show resolved Hide resolved
* Double-click on a controller or hardware component shows additional info.
* Right-click on a controller or hardware component shows a context menu with options for lifecycle management.

christophfroehlich marked this conversation as resolved.
Show resolved Hide resolved

Using the Controller Manager in a Process
-----------------------------------------

Expand Down
6 changes: 4 additions & 2 deletions rqt_controller_manager/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<url type="bugtracker">https://github.com/ros-controls/ros2_control/issues</url>
<url type="repository">https://github.com/ros-controls/ros2_control</url>

<author email="[email protected]">Adolfo Rodríguez Tsouroukdissian</author>
<author email="[email protected]">Bence Magyar</author>
<author email="[email protected]">Christoph Froehlich</author>
<author email="[email protected]">Enrique Fernandez</author>
<author email="[email protected]">Mathias Lüdtke</author>
<author email="[email protected]">Kelsey Hawkins</author>
<author email="[email protected]">Adolfo Rodríguez Tsouroukdissian</author>
<author email="[email protected]">Mathias Lüdtke</author>

<exec_depend>controller_manager</exec_depend>
<exec_depend>controller_manager_msgs</exec_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend>rqt_gui</exec_depend>
Expand Down
36 changes: 35 additions & 1 deletion rqt_controller_manager/resource/controller_manager.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<widget class="QComboBox" name="cm_combo"/>
</item>
<item>
<widget class="QTableView" name="table_view">
<widget class="QTableView" name="ctrl_table_view">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -70,6 +70,40 @@
</attribute>
</widget>
</item>
<item>
<widget class="QTableView" name="hw_table_view">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="showGrid">
<bool>false</bool>
</property>
<property name="sortingEnabled">
<bool>false</bool>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
3 changes: 0 additions & 3 deletions ...oller_manager/resource/controller_info.ui → ...controller_manager/resource/popup_info.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Controller Information</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
Expand Down
Loading
Loading