Skip to content

Commit

Permalink
Update preparing for Jazzy release
Browse files Browse the repository at this point in the history
  • Loading branch information
David Conner committed Jun 4, 2024
1 parent b1ff9b8 commit 3154b97
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/flexbe_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
test:
strategy:
matrix:
ros: [iron] # , rolling]
ros: [jazzy] # , rolling]
include:
- os: ubuntu-22.04
ros: iron
- os: ubuntu-24.04
ros: jazzy
python: python3
ci_branch: ros2-devel
# - os: ubuntu-24.04
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ You may also want to check out the quick start tutorial demonstrations at [FlexB

![FlexBE CI](https://github.com/FlexBE/flexbe_behavior_engine/workflows/FlexBE%20CI/badge.svg?branch=ros2-devel)

Humble ![ROS Build Farm](https://build.ros2.org/job/Hdev__flexbe_behavior_engine__ubuntu_jammy_amd64/badge/icon)

Iron ![ROS Build Farm](https://build.ros2.org/job/Idev__flexbe_behavior_engine__ubuntu_jammy_amd64/badge/icon)

Rolling ![ROS Build Farm](https://build.ros2.org/job/Rdev__flexbe_behavior_engine__ubuntu_jammy_amd64/badge/icon)
Expand All @@ -38,10 +36,10 @@ Furthermore, create your own repository for behavior development (contains examp

ros2 run flexbe_widget create_repo [your_project_name]

Finally, this version of the flexbe_behavior_engine requires version 4.0+ of the FlexBE user interface.
This version of the flexbe_behavior_engine requires version 4.0+ of the FlexBE user interface.

It is recommended to install the FlexBE user interface by following one of these steps:
* https://github.com/FlexBE/flexbe_app.git - classic FlexBE App
* https://github.com/FlexBE/flexbe_app.git - classic FlexBE App (iron or ros2-devel branches)
* https://github.com/FlexBE/flexbe_webui.git - new Python-based webserver version


Expand All @@ -51,13 +49,15 @@ Use the following launch file for running the onboard engine:

ros2 launch flexbe_onboard behavior_onboard.launch.py

Use the following launch file for running the operator control station (requires the FlexBE App):
Use the following launch file for running the operator control station (requires the FlexBE App or WebUI):

ros2 launch flexbe_webui flexbe_ocs.launch.py

ros2 launch flexbe_app flexbe_ocs.launch.py
> Note: replace `flexbe_webui` with `flexbe_app` to run the "classic" UI (after `ros2 run flexbe_app nwjs_install`).
Use the following launch file to run both of the above, e.g., for testing on a single computer:

ros2 launch flexbe_app flexbe_full.launch.py
ros2 launch flexbe_webui flexbe_full.launch.py

For running tests use:
`colcon test --ctest-args --packages-select <flexbe_package>`
Expand Down
1 change: 0 additions & 1 deletion flexbe_input/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<depend>rclpy</depend>
<depend>flexbe_core</depend>
<depend>flexbe_msgs</depend>
<exec_depend>python3-qtpy</exec_depend>

<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion flexbe_input/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# No tests yet ('share/' + PACKAGE_NAME + '/tests', glob('tests/*.test')),
],
install_requires=['setuptools',
'pyside6'],
'PySide6'],
zip_safe=True,
maintainer='phil',
maintainer_email='[email protected]',
Expand Down

0 comments on commit 3154b97

Please sign in to comment.