Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
89381ab
Add repos file for admittance controller
destogl Oct 21, 2021
8778140
Adding initial configuration for admittance_controller demo.
destogl Oct 21, 2021
059cd09
Using fake system is working
destogl Oct 25, 2021
2bb1cff
Update manual with running real UR driver.
destogl Oct 26, 2021
dffa6c6
Update UR driver hash.
destogl Oct 26, 2021
658ff0c
Extend showing admittance controller with filters and parameters update.
destogl Oct 28, 2021
39f8410
Extend controller list with FTS-broadcaster from ros2_controllers.
destogl Nov 16, 2021
12e0ed3
Merge branch 'master' of https://github.com/ros-controls/ros2_control…
pac48 Aug 22, 2022
f361f10
update parameters, README, and repos
pac48 Aug 22, 2022
2c602a2
fix demo launch file
pac48 Aug 22, 2022
dc3df6c
update admittance parameters for demo
pac48 Aug 22, 2022
2ec3e57
update README
pac48 Aug 22, 2022
c9f200c
pre-commit
pac48 Aug 23, 2022
be8a923
moveit working with admittance
pac48 Aug 24, 2022
dbace52
Update using_admittance_controller.md
pac48 Aug 24, 2022
83eb5fd
Update using_admittance_controller.md
pac48 Aug 24, 2022
72df14e
Update using_admittance_controller.md
pac48 Aug 24, 2022
f87c035
Update using_admittance_controller.md
pac48 Aug 24, 2022
628d08f
Update using_admittance_controller.md
pac48 Aug 24, 2022
59f9e34
pre-commit and cleanup
pac48 Aug 24, 2022
9700526
Activate/start renaming
Sep 23, 2022
b4828aa
A new pkg for the admittance demo
Sep 23, 2022
fcb0025
Update dependencies
sjahr Oct 7, 2022
7165caa
Switch to official control_msgs repos
sjahr Oct 7, 2022
7b7fc93
Universal_Robots_ROS2_Driver adaption to new API got merged
sjahr Oct 7, 2022
c880eb3
Merge pull request #1 from sjahr/add-admittance-controller
Oct 7, 2022
a29118e
Update depenecies for rosdep install, remove building MoveIt and remo…
destogl Jan 12, 2023
66c12e1
Update repos link
destogl Jan 13, 2023
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ Now you should also see the *RRbot* represented correctly in `RViz`.

3. Now start the controller:
```
ros2 control switch_controllers --start forward_position_controller
ros2 control switch_controllers --activate forward_position_controller
```
Check if controllers are activated:
```
Expand Down Expand Up @@ -631,7 +631,7 @@ Now you should also see the *RRbot* represented correctly in `RViz`.

2. Now start the controller (and stop other running contorller):
```
ros2 control switch_controllers --stop forward_position_controller --start position_trajectory_controller
ros2 control switch_controllers --deactivate forward_position_controller --activate position_trajectory_controller
```
Check if controllers are activated:
```
Expand Down
11 changes: 11 additions & 0 deletions admittance_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
cmake_minimum_required(VERSION 3.5)
project(admittance_demo)

find_package(ament_cmake REQUIRED)

install(
DIRECTORY config
DESTINATION share/${PROJECT_NAME}
)

ament_package()
10 changes: 10 additions & 0 deletions admittance_demo/admittance_controller.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
repositories:
ros2_control_demos:
type: git
url: https://github.com/pac48/ros2_control_demos.git
version: add-admittance-controller

teleop_twist_keyboard: # Branch: wrench
type: git
url: https://github.com/nbbrooks/teleop_twist_keyboard.git
version: 63de1c17c4c5d0724018f3b5fd8139c472cd15ab # Add Float64MultiArray publisher
Loading