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.

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

Feat/ekf #228

Draft
wants to merge 42 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
25a2863
add ekf_navsat.yaml
shayaf84 Oct 25, 2024
5d508f3
added launch file
mazam32 Oct 25, 2024
566e898
add navsat_trans yaml & launch file
Ampers8nd Oct 25, 2024
24a307e
Merge branch 'feat/ekf' of https://github.com/RoboJackets/urc-softwar…
Ampers8nd Oct 25, 2024
27b6600
Updated ekf yaml file and ekf launch file
shayaf84 Oct 25, 2024
f43f261
add ned_to_enu cpp file
Ampers8nd Oct 25, 2024
83026ec
Merge branch 'feat/ekf' of https://github.com/RoboJackets/urc-softwar…
Ampers8nd Oct 25, 2024
d6a715f
add ned_to_enu file
Ampers8nd Oct 25, 2024
d359612
Remove map-to-odom coordinate frame transforms because they shouldn't…
TheNopenator Oct 27, 2024
edfb089
Implementing navsat and ekf in sim
shayaf84 Oct 27, 2024
9b9c010
Merge branch 'feat/ekf' of https://github.com/RoboJackets/urc-softwar…
shayaf84 Oct 27, 2024
70ea03e
Change frame header from gps to base_link
TheNopenator Oct 30, 2024
d1933f4
remove install log
mrinalTheCoder Oct 30, 2024
c47d2b9
remove unecessary files
mrinalTheCoder Oct 30, 2024
dca0b19
updated launch file to include ekf/navsat
shayaf84 Nov 1, 2024
c736aeb
Merge branch 'feat/ekf' of https://github.com/RoboJackets/urc-softwar…
shayaf84 Nov 1, 2024
fb8916a
ekf launching
mrinalTheCoder Nov 1, 2024
f3d2a83
Updated ekf and navsat
shayaf84 Nov 1, 2024
4d5f41f
Implemented dual ekf in ekf.yaml
shayaf84 Nov 3, 2024
f76fc82
Made launch files for ekf_map, ekf_odom, navsat
shayaf84 Nov 3, 2024
cff1957
:wq
shayaf84 Nov 3, 2024
9776885
Remapping topics (it still doesn't work...)
shayaf84 Nov 3, 2024
3e245c2
All publishers and subscriptions work between dual ekf and navsat
shayaf84 Nov 3, 2024
e80c97f
Removed unecessary example files
shayaf84 Nov 3, 2024
4772e1b
adjust covariance - note, it still doesn't work
Ampers8nd Nov 6, 2024
5378601
Attempting to fix imu -> navsat link
shayaf84 Nov 10, 2024
32bc6d2
change navsat to run after ekf_odom
Ampers8nd Nov 13, 2024
d256f76
More work on ekf debugging
shayaf84 Nov 15, 2024
7a9339d
working dual ekf
mrinalTheCoder Nov 15, 2024
14fc936
testing covariance matrics
shayaf84 Nov 17, 2024
60679e7
Merge branch 'master' into feat/ekf
davidcalderon03 Nov 24, 2024
d3d3ee7
Gravitational acceleration will now not be ignored
mazam32 Nov 24, 2024
1018543
Merge branch 'feat/ekf' of https://github.com/RoboJackets/urc-rover i…
mazam32 Nov 24, 2024
2263fbc
Gravity doesnt work
mazam32 Nov 24, 2024
8eabe24
Attempting to fine-tune ekf
shayaf84 Nov 24, 2024
c02614d
remove drift from sim imu
mrinalTheCoder Nov 25, 2024
3c2f1a9
fixes in ekf config
mrinalTheCoder Dec 8, 2024
15f6554
fixes in ekf config
mrinalTheCoder Dec 8, 2024
5baeea5
2D mode
mrinalTheCoder Dec 8, 2024
7786a21
fixes in ekf config
mrinalTheCoder Dec 8, 2024
29ed484
fix odom input for navsat transform
mrinalTheCoder Dec 8, 2024
d30a2f5
local ekf working (odom -> base_link transform
mrinalTheCoder Dec 12, 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 .DS_Store
Binary file not shown.
Empty file modified urc_arm/model/meshes/collision/leftgripper_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/collision/rightgripper_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/base_link.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/base_link_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/bicep.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/bicep_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/claw.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/claw_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/elbow.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/elbow_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/forearm.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/forearm_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/leftgripper.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/leftgripper_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/rightgripper.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/rightgripper_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/shoulder.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/shoulder_collision.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/wrist.STL
100755 → 100644
Empty file.
Empty file modified urc_arm/model/meshes/old/wrist_collision.STL
100755 → 100644
Empty file.
Binary file added urc_bringup/.DS_Store
Binary file not shown.
32 changes: 13 additions & 19 deletions urc_bringup/launch/bringup_simulation.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
RegisterEventHandler,
)
from launch.substitutions import LaunchConfiguration, PathJoinSubstitution
from launch.event_handlers import OnProcessExit, OnProcessStart
from launch.event_handlers import OnProcessStart, OnProcessExit
from launch.launch_description_sources import PythonLaunchDescriptionSource
from launch_ros.actions import Node
from launch_ros.substitutions import FindPackageShare
Expand All @@ -20,6 +20,7 @@ def generate_launch_description():
pkg_urc_bringup = get_package_share_directory("urc_bringup")
pkg_path_planning = get_package_share_directory("path_planning")
pkg_trajectory_following = get_package_share_directory("trajectory_following")
pkg_urc_localization = get_package_share_directory("urc_localization")
pkg_urc_test = get_package_share_directory("urc_test")

controller_config_file_dir = os.path.join(
Expand Down Expand Up @@ -153,6 +154,16 @@ def generate_launch_description():
)
)

ekf_launch = IncludeLaunchDescription(
PythonLaunchDescriptionSource(
os.path.join(
pkg_urc_localization,
"launch",
"ekf.launch.py"
)
)
)

elevation_mapping_node = Node(
package="urc_perception",
executable="urc_perception_ElevationMapping",
Expand All @@ -168,22 +179,6 @@ def generate_launch_description():
],
)

map_to_odom_transform_node = Node(
package="tf2_ros",
executable="static_transform_publisher",
arguments=["10", "10", "0", "0", "0", "0", "map", "odom"],
)

map_to_odom_launch = IncludeLaunchDescription(
PythonLaunchDescriptionSource(
os.path.join(
pkg_urc_test,
"launch",
"odom_to_map_pose.launch.py",
)
)
)

return LaunchDescription(
[
RegisterEventHandler(
Expand All @@ -193,7 +188,6 @@ def generate_launch_description():
load_joint_state_broadcaster,
load_drivetrain_controller,
teleop_launch,
map_to_odom_launch,
],
)
),
Expand All @@ -217,6 +211,6 @@ def generate_launch_description():
gazebo,
load_robot_state_publisher,
spawn_robot,
map_to_odom_transform_node,
ekf_launch
]
)
Empty file modified urc_hw_description/.setup_assistant
100755 → 100644
Empty file.
Empty file modified urc_hw_description/config/initial_positions.yaml
100755 → 100644
Empty file.
Empty file modified urc_hw_description/config/joint_limits.yaml
100755 → 100644
Empty file.
Empty file modified urc_hw_description/config/kinematics.yaml
100755 → 100644
Empty file.
Empty file modified urc_hw_description/config/moveit.rviz
100755 → 100644
Empty file.
Empty file modified urc_hw_description/config/moveit_controllers.yaml
100755 → 100644
Empty file.
Empty file modified urc_hw_description/config/pilz_cartesian_limits.yaml
100755 → 100644
Empty file.
Empty file modified urc_hw_description/config/ros2_controllers.yaml
100755 → 100644
Empty file.
28 changes: 14 additions & 14 deletions urc_hw_description/urdf/walli_sensors.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,24 @@
<noise type="gaussian">
<mean>0.0</mean>
<stddev>2e-4</stddev>
<bias_mean>0.0000075</bias_mean>
<bias_stddev>0.0000008</bias_stddev>
<bias_mean>0.0</bias_mean>
<bias_stddev>0.0</bias_stddev>
</noise>
</x>
<y>
<noise type="gaussian">
<mean>0.0</mean>
<stddev>2e-4</stddev>
<bias_mean>0.0000075</bias_mean>
<bias_stddev>0.0000008</bias_stddev>
<bias_mean>0.0</bias_mean>
<bias_stddev>0.0</bias_stddev>
</noise>
</y>
<z>
<noise type="gaussian">
<mean>0.0</mean>
<stddev>2e-4</stddev>
<bias_mean>0.0000075</bias_mean>
<bias_stddev>0.0000008</bias_stddev>
<bias_mean>0.0</bias_mean>
<bias_stddev>0.0</bias_stddev>
</noise>
</z>
</angular_velocity>
Expand All @@ -64,24 +64,24 @@
<noise type="gaussian">
<mean>0.0</mean>
<stddev>1.7e-2</stddev>
<bias_mean>0.1</bias_mean>
<bias_stddev>0.001</bias_stddev>
<bias_mean>0.0</bias_mean>
<bias_stddev>0.0</bias_stddev>
</noise>
</x>
<y>
<noise type="gaussian">
<mean>0.0</mean>
<stddev>1.7e-2</stddev>
<bias_mean>0.1</bias_mean>
<bias_stddev>0.001</bias_stddev>
<bias_mean>0.0</bias_mean>
<bias_stddev>0.0</bias_stddev>
</noise>
</y>
<z>
<noise type="gaussian">
<mean>0.0</mean>
<stddev>1.7e-2</stddev>
<bias_mean>0.1</bias_mean>
<bias_stddev>0.001</bias_stddev>
<bias_mean>0.0</bias_mean>
<bias_stddev>0.0</bias_stddev>
</noise>
</z>
</linear_acceleration>
Expand Down Expand Up @@ -116,7 +116,7 @@
<namespace>/gps</namespace>
<remapping>~/out:=data</remapping>
</ros>
<frame_name>gps</frame_name>
<frame_name>map</frame_name>
</plugin>
<always_on>true</always_on>
<updateRate>30</updateRate>
Expand Down Expand Up @@ -347,4 +347,4 @@
<gaussian_noise>0.00</gaussian_noise>
</plugin>
</gazebo>
</robot>
</robot>
Binary file added urc_localization/.DS_Store
Binary file not shown.
107 changes: 0 additions & 107 deletions urc_localization/config/dual_ekf_navsat_example.yaml

This file was deleted.

Loading
Loading