Skip to content

Commit a87527b

Browse files
Change to work with imu_filter_madgwick instead of mahony
1 parent ad3696c commit a87527b

File tree

4 files changed

+10
-35
lines changed

4 files changed

+10
-35
lines changed
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
ukf_local:
22
ros__parameters:
33
frequency: 50.0
4-
sensor_timeout: 0.1
5-
two_d_mode: true
4+
two_d_mode: false
5+
6+
print_diagnostics: true
7+
debug: true
8+
debug_out_file: /home/arman/debug/debug_out_file.txt
69

7-
map_frame: map
810
odom_frame: odom
911
base_link_frame: base_link
1012
world_frame: odom
@@ -15,10 +17,9 @@ ukf_local:
1517
imu0: /imu/data
1618
imu0_config: [
1719
false, false, false, # position
18-
true, true, true, # orientation (Mahony)
20+
true, true, false, # orientation (Mahony)
1921
false, false, false, # velocity
2022
true, true, true, # angular velocity
21-
true, true, true # linear acceleration
23+
false, false, false # linear acceleration
2224
]
23-
2425
imu0_remove_gravitational_acceleration: false

src/localization_dev/launch/localization.launch.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@ def generate_launch_description():
99
'config',
1010
'ukf_local.yaml'
1111
])
12-
ukf_global_yaml = PathJoinSubstitution([
13-
FindPackageShare('localization_dev'),
14-
'config',
15-
'ukf_global.yaml'
16-
])
17-
navsat_yaml = PathJoinSubstitution([
18-
FindPackageShare('localization_dev'),
19-
'config',
20-
'navsat.yaml'
21-
])
2212
return LaunchDescription([
2313

2414
Node(
@@ -29,20 +19,4 @@ def generate_launch_description():
2919
parameters=[ukf_local_yaml],
3020
remappings=[('odometry/filtered', 'odometry/filtered')]
3121
),
32-
33-
Node(
34-
package='robot_localization',
35-
executable='navsat_transform_node',
36-
name='navsat_transform',
37-
output='screen',
38-
parameters=[navsat_yaml]
39-
),
40-
41-
Node(
42-
package='robot_localization',
43-
executable='ukf_node',
44-
name='ukf_global',
45-
output='screen',
46-
parameters=[ukf_global_yaml]
47-
),
4822
])

src/rover_description/launch/display_chassis.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def generate_launch_description():
5656
)
5757

5858
urdf_file_path = (
59-
get_package_share_directory("rover_description") + "/urdf/chassis_urdf_24_rviz.urdf"
59+
get_package_share_directory("rover_description") + "/urdf/Chassis_jan25.SLDASM.urdf"
6060
)
6161

6262
rviz_node = Node(

Chassis_jan25.SLDASM.urdf renamed to src/rover_description/urdf/Chassis_jan25.SLDASM.urdf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
xyz="0 0 0" />
543543
</joint>
544544
<link
545-
name="IMU">
545+
name="imu_link">
546546
<inertial>
547547
<origin
548548
xyz="0.00950000000000004 0.0125 0.00950000000000004"
@@ -590,7 +590,7 @@
590590
<parent
591591
link="base_link" />
592592
<child
593-
link="IMU" />
593+
link="imu_link" />
594594
<axis
595595
xyz="0 0 0" />
596596
</joint>

0 commit comments

Comments
 (0)