-
Notifications
You must be signed in to change notification settings - Fork 50
fixed closed loop odom initialization #83
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.
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
Open
dlarkin3
wants to merge
57
commits into
ROBOTIS-GIT:jazzy
Choose a base branch
from
westpoint-robotics:jazzy
base: jazzy
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
57 commits
Select commit
Hold shift + click to select a range
5c8614d
fixed closed loop odom initialization
dlarkin3 28d6d53
solved runtime error in controller node
dlarkin3 ffed7f2
solved runtime error in controller node
dlarkin3 f813c30
code cleanup and align with robitis repo selectively
dlarkin3 cbdabf2
removed remapping for controller. it is deprecated
dlarkin3 ae55698
fixed position controller deprecated again
dlarkin3 d545512
move it is working only with move_group2, not move_group_launch
dlarkin3 68ac1a4
failed attempt to get servo launch to work
dlarkin3 4dbbc37
fixed compile warning about deprecated and urdf file
dlarkin3 890005e
updated dependencies
dlarkin3 5f8f6c3
fixed gripper command in yaml
dlarkin3 8ad24cb
fixed the need for gripper to have acceleration limits
dlarkin3 5795f7c
fixed the lower limit for the gripper to 0.02
dlarkin3 2429792
fixed gripper action to older version that works
dlarkin3 ab44a3a
removed bad dependencies
dlarkin3 9e9b939
adding teleop with joy to bringup
dlarkin3 c472aec
added ompl_planning yaml
184bdbc
added the ability to joystick nodes with hardware bringup
dlarkin3 2ffe31e
added option to start usbcam in hardware bringup
dlarkin3 7b5d35b
first attempt to re-enable simulation world
dlarkin3 7ef497e
second attempt to re-enable simulation world
dlarkin3 1b40e00
third attempt to re-enable simulation world, cmd_vel now works
dlarkin3 a4c9f39
removed bad config file for ompl planning.
dlarkin3 eb49adc
added dependency on moveit py
dlarkin3 119caf4
merging relevant changes from arm_dev branch
dlarkin3 6738247
added ability to start rviz with moevit group2
dlarkin3 e81540b
fixed starting moveit group2 with or without rviz
dlarkin3 f57f3e0
fixed the home position turtlebot3_manipulation.srdf to match the res…
dlarkin3 5e96815
updates in configs, moved back to parallelGripperCommand
dlarkin3 da20c37
FIXED parallelGripperCommand missing in yaml
dlarkin3 8a0622c
adjusted gripper limits to observed limits
dlarkin3 26fe70d
added twist mux for cmd_vel worked in both sim and irl
dlarkin3 70292ad
added twist mux for cmd_vel worked in both sim and irl
dlarkin3 39b23d5
some changes for nav2 to work
dlarkin3 eb29015
some changes for nav2 to work
dlarkin3 3379460
enabled camera info to be published in ROS when running simulation
dlarkin3 520e25b
modified the sun to remove shadows and moved some objects to another …
dlarkin3 c6faee1
now gz sim starts with local time as sim time
dlarkin3 dcff850
fxd sim diff drive control
dlarkin3 de6f5d5
attempt to correct use_time capitalization
dlarkin3 c0445a8
some modifications before class on sim nav2
dlarkin3 c0f07cc
fixed sim
dlarkin3 6186334
cleanup merge mess
dlarkin3 36fb13d
corrected to add cam info from gz sim
dlarkin3 418730f
Resolved merge conflict by keeping local version of wp_nav2_params_si…
dlarkin3 bb3b014
mods for irl robot mapping
dlarkin3 ecf9050
added min laser range to amcl and slam_toolbox
dlarkin3 9be77ce
added simulated maze ay262
dlarkin3 8428692
added simulation of maze
dlarkin3 bce31c9
enabled sim_time to be set for moveit group2
dlarkin3 95f8917
enabled sim_time to be set for moveit group2
dlarkin3 2c68cfc
corrected the arm start position to home in simulation
dlarkin3 e2da3cb
some changes to rviz for path planning
dlarkin3 93eaac1
added new map
dlarkin3 f9fbc7f
some updates for part3 simulation
dlarkin3 5754246
added sim obstacle avoidance critic
dlarkin3 47ba9ee
adjusted local costmap for sim
dlarkin3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # The name of the workflow | ||
| name: Lint | ||
|
|
||
| # Specifies the events that trigger the workflow | ||
| on: | ||
| pull_request: | ||
|
|
||
| # Defines a set of jobs to be run as part of the workflow | ||
| jobs: | ||
| ament_lint: | ||
| runs-on: ubuntu-latest | ||
| container: | ||
| image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| linter: [cppcheck, cpplint, uncrustify, flake8, pep257, lint_cmake, xmllint, copyright] | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup ROS environment | ||
| uses: ros-tooling/setup-ros@v0.7 | ||
|
|
||
| - name: Run Linter | ||
| env: | ||
| AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS: 1 | ||
| uses: ros-tooling/action-ros-lint@master | ||
| with: | ||
| linter: ${{ matrix.linter }} | ||
| distribution: rolling | ||
| package-name: "*" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| # replace clock_bridge | ||
| - ros_topic_name: "/clock" | ||
| gz_topic_name: "/clock" | ||
| ros_type_name: "rosgraph_msgs/msg/Clock" | ||
| gz_type_name: "gz.msgs.Clock" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # no equivalent in TB3 - add | ||
| - ros_topic_name: "joint_states" | ||
| gz_topic_name: "joint_states" | ||
| ros_type_name: "sensor_msgs/msg/JointState" | ||
| gz_type_name: "gz.msgs.Model" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # replace odom_bridge - check gz topic name | ||
| # gz topic published by DiffDrive plugin | ||
| # - ros_topic_name: "odom" | ||
| # gz_topic_name: "/odom" | ||
| # ros_type_name: "nav_msgs/msg/Odometry" | ||
| # gz_type_name: "gz.msgs.Odometry" | ||
| # direction: GZ_TO_ROS | ||
|
|
||
| # replace odom_tf_bridge - check gz and ros topic names | ||
| # gz topic published by DiffDrive plugin | ||
| # prefix ros2 topic with gz | ||
| - ros_topic_name: "tf" | ||
| gz_topic_name: "/tf" | ||
| ros_type_name: "tf2_msgs/msg/TFMessage" | ||
| gz_type_name: "gz.msgs.Pose_V" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # replace imu_bridge - check gz topic name | ||
| - ros_topic_name: "imu" | ||
| gz_topic_name: "/imu" | ||
| ros_type_name: "sensor_msgs/msg/Imu" | ||
| gz_type_name: "gz.msgs.IMU" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # replace lidar_bridge | ||
| - ros_topic_name: "scan" | ||
| gz_topic_name: "/scan" | ||
| ros_type_name: "sensor_msgs/msg/LaserScan" | ||
| gz_type_name: "gz.msgs.LaserScan" | ||
| direction: GZ_TO_ROS | ||
| reliability: "best_effort" | ||
|
|
||
| # replace cmd_vel_bridge | ||
| - ros_topic_name: "/cmd_vel" | ||
| gz_topic_name: "/cmd_vel" | ||
| ros_type_name: "geometry_msgs/msg/TwistStamped" | ||
| gz_type_name: "gz.msgs.Twist" | ||
| direction: ROS_TO_GZ | ||
|
|
||
| # replace camera_info_bridge | ||
| - ros_topic_name: "/camera_info" | ||
| gz_topic_name: "/camera_info" | ||
| ros_type_name: "sensor_msgs/msg/CameraInfo" | ||
| gz_type_name: "gz.msgs.CameraInfo" | ||
| direction: GZ_TO_ROS |
63 changes: 63 additions & 0 deletions
63
turtlebot3_manipulation_bringup/config/tb3_bridge.yaml.orig
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| # replace clock_bridge | ||
| - ros_topic_name: "/clock" | ||
| gz_topic_name: "/clock" | ||
| ros_type_name: "rosgraph_msgs/msg/Clock" | ||
| gz_type_name: "gz.msgs.Clock" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # no equivalent in TB3 - add | ||
| - ros_topic_name: "joint_states" | ||
| gz_topic_name: "joint_states" | ||
| ros_type_name: "sensor_msgs/msg/JointState" | ||
| gz_type_name: "gz.msgs.Model" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # replace odom_bridge - check gz topic name | ||
| # gz topic published by DiffDrive plugin | ||
| # - ros_topic_name: "odom" | ||
| # gz_topic_name: "/odom" | ||
| # ros_type_name: "nav_msgs/msg/Odometry" | ||
| # gz_type_name: "gz.msgs.Odometry" | ||
| # direction: GZ_TO_ROS | ||
|
|
||
| # replace odom_tf_bridge - check gz and ros topic names | ||
| # gz topic published by DiffDrive plugin | ||
| # prefix ros2 topic with gz | ||
| - ros_topic_name: "tf" | ||
| gz_topic_name: "/tf" | ||
| ros_type_name: "tf2_msgs/msg/TFMessage" | ||
| gz_type_name: "gz.msgs.Pose_V" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # replace imu_bridge - check gz topic name | ||
| - ros_topic_name: "imu" | ||
| gz_topic_name: "/imu" | ||
| ros_type_name: "sensor_msgs/msg/Imu" | ||
| gz_type_name: "gz.msgs.IMU" | ||
| direction: GZ_TO_ROS | ||
|
|
||
| # replace lidar_bridge | ||
| - ros_topic_name: "scan" | ||
| gz_topic_name: "/scan" | ||
| ros_type_name: "sensor_msgs/msg/LaserScan" | ||
| gz_type_name: "gz.msgs.LaserScan" | ||
| direction: GZ_TO_ROS | ||
| reliability: "best_effort" | ||
|
|
||
| # replace cmd_vel_bridge | ||
| - ros_topic_name: "/cmd_vel" | ||
| gz_topic_name: "/cmd_vel" | ||
| ros_type_name: "geometry_msgs/msg/TwistStamped" | ||
| gz_type_name: "gz.msgs.Twist" | ||
| direction: ROS_TO_GZ | ||
|
|
||
| # replace camera_info_bridge | ||
| <<<<<<< HEAD | ||
| - ros_topic_name: "/camera_info" | ||
| ======= | ||
| - ros_topic_name: "camera_info" | ||
| >>>>>>> 53fabef (some updates) | ||
| gz_topic_name: "/camera_info" | ||
| ros_type_name: "sensor_msgs/msg/CameraInfo" | ||
| gz_type_name: "gz.msgs.CameraInfo" | ||
| direction: GZ_TO_ROS |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| twist_mux: | ||
| ros__parameters: | ||
| topics: | ||
| # navigation: | ||
| # topic: /cmd_vel_nav | ||
| # priority: 10 | ||
| # timeout: 0.5 | ||
| # navigation: | ||
| # topic: /cmd_vel_smoothed | ||
| # priority: 10 | ||
| # timeout: 0.5 | ||
| navigation: | ||
| topic: /cmd_vel_collision | ||
| priority: 10 | ||
| timeout: 0.5 | ||
| teleop: | ||
| topic: /cmd_vel_teleop | ||
| priority: 20 | ||
| timeout: 0.5 | ||
| use_stamped: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| teleop_twist_joy_node: | ||
| ros__parameters: | ||
| use_sim_time: false | ||
| axis_linear: # Left thumb stick vertical | ||
| x: 1 | ||
| scale_linear: | ||
| x: 0.7 | ||
| scale_linear_turbo: | ||
| x: 1.5 | ||
| qos_overrides: | ||
| /joy: | ||
| subscription: | ||
| reliability: best_effort | ||
| depth: 1 | ||
| durability: volatile | ||
| /cmd_vel_teleop: | ||
| publisher: | ||
| reliability: best_effort | ||
| depth: 1 | ||
| durability: volatile | ||
|
|
||
| axis_angular: # Left thumb stick horizontal | ||
| yaw: 0 | ||
| scale_angular: | ||
| yaw: 0.4 | ||
|
|
||
| enable_button: 4 # Left trigger button | ||
| enable_turbo_button: 5 # Right trigger button | ||
|
|
||
| # joy_node: | ||
| # ros__parameters: | ||
| # device_name: /dev/input/js0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Enabling
use_stamped_velis a good change for ensuring proper time synchronization. However, it's worth noting that this requires thecmd_velmessages to be stamped with a timestamp. Ensure that the upstream nodes publishingcmd_velare configured to do so.