Skip to content

Commit 95b70dc

Browse files
committed
updating env params use
1 parent 1e1d921 commit 95b70dc

5 files changed

Lines changed: 13 additions & 114 deletions

File tree

navigation/eskf/config/eskf_params.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
publish_twist: true
2323
publish_rate_ms: 5
2424
add_gravity_to_imu: false
25+
# biases in the IMU
2526
initial_gyro_bias: [0.0, 0.0, 0.0]
2627
initial_accel_bias: [0.0, 0.0, 0.0]
2728
publish_biases: false
29+
# environmental parameters
30+
atmospheric_pressure: 101000.0 # [Pa]
31+
water_density: 1026.0 # [kg/m3]
32+
gravity: 9.82841

navigation/eskf/config/eskf_params_real_world.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@
2121
publish_pose: true
2222
publish_twist: true
2323
publish_rate_ms: 5
24+
# biases in the IMU
2425
add_gravity_to_imu: true
2526
initial_gyro_bias: [0.0, 0.0, 0.0]
2627
initial_accel_bias: [3.53e-2, 0.0, -0.0533]
2728
publish_biases: true
29+
# environmental parameters
30+
atmospheric_pressure: 101000.0 # [Pa]
31+
water_density: 1026.0 # [kg/m3]
32+
gravity: 9.82841
2833

2934
# USED SENSORS
3035
# IMU: Kongsberg mini MRU

navigation/eskf/launch/eskf.launch.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
resolve_drone_and_namespace,
1212
)
1313

14-
# eskf_params = path.join(
15-
# get_package_share_directory("eskf"), "config", "eskf_params_real_world.yaml"
16-
# )
17-
1814

1915
def launch_setup(context, *args, **kwargs):
2016
drone, namespace = resolve_drone_and_namespace(context)
@@ -37,12 +33,6 @@ def launch_setup(context, *args, **kwargs):
3733
get_package_share_directory("eskf"), "config", param_file_name
3834
)
3935

40-
drone_env_params = os.path.join(
41-
get_package_share_directory("auv_setup"),
42-
"config",
43-
"environments",
44-
"trondheim_saltwater.yaml",
45-
)
4636
eskf_node = Node(
4737
package="eskf",
4838
executable="eskf_node",
@@ -51,7 +41,6 @@ def launch_setup(context, *args, **kwargs):
5141
parameters=[
5242
eskf_params,
5343
drone_params,
54-
drone_env_params,
5544
{"frame_prefix": namespace},
5645
],
5746
output="screen",

navigation/eskf/src/eskf_ros.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,12 +439,11 @@ void ESKFNode::lookup_static_transforms() {
439439
void ESKFNode::complete_initialization() {
440440
set_subscribers_and_publisher();
441441
// gravity, water density and atmospheric pressure.
442-
this->gravity =
443-
-this->declare_parameter<double>("gravity.acceleration", 9.81);
442+
this->gravity = -this->declare_parameter<double>("gravity", 9.81);
444443
this->water_density =
445-
this->declare_parameter<double>("water.density", 1000.0);
444+
this->declare_parameter<double>("water_density", 1000.0);
446445
this->atmospheric_pressure =
447-
this->declare_parameter<double>("atmosphere.pressure", 100000.0);
446+
this->declare_parameter<double>("atmospheric_pressure", 100000.0);
448447
set_parameters();
449448

450449
time_step_ = std::chrono::milliseconds(

navigation/odom_transformer/launch/nucleus_odom_transformer.launch.py

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)