Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Project/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"project_name": "ROSCon2023Demo",
"version": "2.0.0",
"version": "2.0.1",
"project_id": "{C930C5B9-4B70-40B7-88F4-A7E927D6A677}",
"license": "Apache-2.0",
"license_url": "https://opensource.org/licenses/Apache-2.0",
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ To learn more on exporting game launcher see [O3DE documentation](https://www.do
To build the game launcher and bundle assets:
```bash
cd ${WORKDIR}/o3de
./scripts/o3de.sh export-project -es ExportScripts/export_source_built_project.py --project-path ${WORKDIR}/ROSCon2023Demo/Project --seedlist ${WORKDIR}/ROSCon2023Demo/Project/AssetBundling/SeedLists/demo.seed --fail-on-asset-errors -noserver -out ./build/release --build-tools --no-unified-launcher
./scripts/o3de.sh export-project -es ExportScripts/export_source_built_project.py --project-path ${WORKDIR}/ROSCon2023Demo/Project --seedlist ${WORKDIR}/ROSCon2023Demo/Project/AssetBundling/SeedLists/demo.seed --fail-on-asset-errors -noserver -out ${WORKDIR}/ROSCon2023Demo/Project/build/release --build-tools --no-unified-launcher
```
The build package is available here:
```
Expand Down Expand Up @@ -344,6 +344,10 @@ Please also refer to the common [Troubleshooting Guide](https://docs.o3de.org/do

## Release notes

### ROSCon2023Demo 2.0.1 for O3DE 2409.x
Changes compared to 2.0.0:
- updated UR ROS2 Driver (external) submodule

### ROSCon2023Demo 2.0.0 for O3DE 2409.x
Changes compared to 1.0.1:
- updated demo the newest available version of O3DE and ROS 2 Gem
Expand All @@ -356,7 +360,7 @@ Changes compared to 1.0.1:
### ROSCon2023Demo 1.0.1 for O3DE 2310.x
Changes compared to 1.0.0:
- enforced versions of dependencies (HumanWorker, OTTORobots, URRobots)
- updated UR (external) submodule
- updated UR ROS2 Driver (external) submodule
- updated README

### ROSCon2023Demo 1.0.0 for O3DE 2310.x
Expand Down
2 changes: 1 addition & 1 deletion ros2_ws/src/Universal_Robots_ROS2_Driver
Submodule Universal_Robots_ROS2_Driver updated 77 files
+67 −0 .github/helpers/check_urls.sh
+19 −0 .github/workflows/check_links.yml
+20 −0 .github/workflows/iron-binary-main.yml
+12 −12 .pre-commit-config.yaml
+37 −41 README.md
+1 −5 Universal_Robots_ROS2_Driver-not-released.humble.repos
+10 −2 Universal_Robots_ROS2_Driver.humble.repos
+0 −27 ci_status.md
+14 −0 ur/CHANGELOG.rst
+6 −3 ur/package.xml
+18 −1 ur_bringup/CHANGELOG.rst
+77 −38 ur_bringup/config/ur_controllers.yaml
+5 −4 ur_bringup/package.xml
+5 −91 ur_bringup/scripts/start_ursim.sh
+15 −0 ur_calibration/CHANGELOG.rst
+2 −1 ur_calibration/include/ur_calibration/calibration.hpp
+4 −3 ur_calibration/package.xml
+26 −1 ur_controllers/CHANGELOG.rst
+70 −1 ur_controllers/CMakeLists.txt
+20 −0 ur_controllers/controller_plugins.xml
+380 −0 ur_controllers/doc/index.rst
+147 −0 ur_controllers/include/ur_controllers/force_mode_controller.hpp
+130 −0 ur_controllers/include/ur_controllers/freedrive_mode_controller.hpp
+6 −0 ur_controllers/include/ur_controllers/gpio_controller.hpp
+184 −0 ur_controllers/include/ur_controllers/passthrough_trajectory_controller.hpp
+6 −1 ur_controllers/include/ur_controllers/scaled_joint_trajectory_controller.hpp
+105 −0 ur_controllers/include/ur_controllers/ur_configuration_controller.hpp
+17 −4 ur_controllers/package.xml
+380 −0 ur_controllers/src/force_mode_controller.cpp
+12 −0 ur_controllers/src/force_mode_controller_parameters.yaml
+337 −0 ur_controllers/src/freedrive_mode_controller.cpp
+17 −0 ur_controllers/src/freedrive_mode_controller_parameters.yaml
+46 −1 ur_controllers/src/gpio_controller.cpp
+624 −0 ur_controllers/src/passthrough_trajectory_controller.cpp
+31 −0 ur_controllers/src/passthrough_trajectory_controller_parameters.yaml
+25 −6 ur_controllers/src/scaled_joint_trajectory_controller.cpp
+128 −0 ur_controllers/src/ur_configuration_controller.cpp
+6 −0 ur_controllers/src/ur_configuration_controller_parameters.yaml
+7 −0 ur_controllers/test/force_mode_controller_params.yaml
+5 −0 ur_controllers/test/freedrive_mode_controller_params.yaml
+61 −0 ur_controllers/test/test_load_force_mode_controller.cpp
+61 −0 ur_controllers/test/test_load_freedrive_mode_controller.cpp
+14 −0 ur_dashboard_msgs/CHANGELOG.rst
+4 −3 ur_dashboard_msgs/package.xml
+20 −0 ur_moveit_config/CHANGELOG.rst
+12 −10 ur_moveit_config/launch/ur_moveit.launch.py
+7 −4 ur_moveit_config/package.xml
+32 −1 ur_robot_driver/CHANGELOG.rst
+14 −0 ur_robot_driver/CMakeLists.txt
+1 −1 ur_robot_driver/README.md
+51 −0 ur_robot_driver/config/ur_controllers.yaml
+0 −282 ur_robot_driver/doc/installation/real_time.md
+334 −0 ur_robot_driver/doc/installation/real_time.rst
+1 −1 ur_robot_driver/doc/make.bat
+20 −0 ur_robot_driver/doc/usage.rst
+127 −0 ur_robot_driver/doc/usage/controllers.rst
+180 −0 ur_robot_driver/examples/examples.py
+142 −0 ur_robot_driver/examples/force_mode.py
+82 −6 ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
+2 −0 ur_robot_driver/launch/ur10.launch.py
+2 −0 ur_robot_driver/launch/ur10e.launch.py
+2 −0 ur_robot_driver/launch/ur16e.launch.py
+2 −0 ur_robot_driver/launch/ur20.launch.py
+2 −0 ur_robot_driver/launch/ur3.launch.py
+2 −0 ur_robot_driver/launch/ur30.launch.py
+2 −0 ur_robot_driver/launch/ur3e.launch.py
+2 −0 ur_robot_driver/launch/ur5.launch.py
+2 −0 ur_robot_driver/launch/ur5e.launch.py
+30 −32 ur_robot_driver/launch/ur_control.launch.py
+7 −4 ur_robot_driver/package.xml
+219 −0 ur_robot_driver/scripts/example_move.py
+536 −50 ur_robot_driver/src/hardware_interface.cpp
+3 −3 ur_robot_driver/src/urcl_log_handler.cpp
+407 −0 ur_robot_driver/test/integration_test_controller_switch.py
+514 −0 ur_robot_driver/test/integration_test_force_mode.py
+137 −25 ur_robot_driver/test/robot_driver.py
+42 −4 ur_robot_driver/test/test_common.py