ECL: Clean velPos logging, deprecate ekf2_innovations msg

This commit is contained in:
kamilritz
2019-11-11 10:27:57 +01:00
committed by Julian Kent
parent 22e4e85eeb
commit b73c80428e
24 changed files with 298 additions and 138 deletions

View File

@@ -55,13 +55,13 @@ set(msg_files
debug_vect.msg
differential_pressure.msg
distance_sensor.msg
ekf2_innovations.msg # TODO: remove as soon as https://github.com/PX4/Firmware/pull/13127 is rebased over this
ekf2_timestamps.msg
ekf_gps_drift.msg
ekf_gps_position.msg
esc_report.msg
esc_status.msg
estimator_status.msg
estimator_innovations.msg
follow_target.msg
geofence_result.msg
gps_dump.msg
@@ -159,8 +159,7 @@ set(msg_files
)
set(deprecated_msgs
# TODO: uncomment as soon as https://github.com/PX4/Firmware/pull/13127 is rebased over this
# ekf2_innovations.msg # 2019-11-22, Updated estimator interface and logging; replaced by 'estimator_innovations'.
ekf2_innovations.msg # 2019-11-22, Updated estimator interface and logging; replaced by 'estimator_innovations'.
)
foreach(msg IN LISTS deprecated_msgs)

View File

@@ -1,19 +0,0 @@
uint64 timestamp # time since system start (microseconds)
float32[6] vel_pos_innov # velocity and position innovations
float32[3] mag_innov # earth magnetic field innovations
float32 heading_innov # heading innovation
float32 airspeed_innov # airspeed innovation
float32 beta_innov # synthetic sideslip innovation
float32[2] flow_innov # flow innovation
float32 hagl_innov # innovation from the terrain estimator for the height above ground level measurement (m)
float32[6] vel_pos_innov_var # velocity and position innovation variances
float32[3] mag_innov_var # earth magnetic field innovation variance
float32 heading_innov_var # heading innovation variance
float32 airspeed_innov_var # Airspeed innovation variance
float32 beta_innov_var # synthetic sideslip innovation variance
float32[2] flow_innov_var # flow innovation variance
float32 hagl_innov_var # innovation variance from the terrain estimator for the height above ground level measurement (m^2)
float32[3] output_tracking_error # return a vector containing the output predictor angular, velocity and position tracking error magnitudes (rad), (m/s), (m)
float32[2] drag_innov # drag specific force innovation (m/s/s)
float32[2] drag_innov_var # drag specific force innovation variance (m/s/s)**2
float32[2] aux_vel_innov # auxiliary NE velocity innovations from landing target measurement (m/s)

View File

@@ -0,0 +1,43 @@
uint64 timestamp # time since system start (microseconds)
# GPS
float32[2] gps_hvel # horizontal GPS velocity innovation (m/sec) and innovation variance ((m/sec)**2)
float32 gps_vvel # vertical GPS velocity innovation (m/sec) and innovation variance ((m/sec)**2)
float32[2] gps_hpos # horizontal GPS position innovation (m) and innovation variance (m**2)
float32 gps_vpos # vertical GPS position innovation (m) and innovation variance (m**2)
# External Vision
float32[2] ev_hvel # horizontal external vision velocity innovation (m/sec) and innovation variance ((m/sec)**2)
float32 ev_vvel # vertical external vision velocity innovation (m/sec) and innovation variance ((m/sec)**2)
float32[2] ev_hpos # horizontal external vision position innovation (m) and innovation variance (m**2)
float32 ev_vpos # vertical external vision position innovation (m) and innovation variance (m**2)
# Fake Position and Velocity
float32[2] fake_hvel # fake horizontal velocity innovation (m/s) and innovation variance ((m/s)**2)
float32 fake_vvel # fake vertical velocity innovation (m/s) and innovation variance ((m/s)**2)
float32[2] fake_hpos # fake horizontal position innovation (m) and innovation variance (m**2)
float32 fake_vpos # fake vertical position innovation (m) and innovation variance (m**2)
# Height sensors
float32 rng_vpos # range sensor height innovation (m) and innovation variance (m**2)
float32 baro_vpos # barometer height innovation (m) and innovation variance (m**2)
# Auxiliary velocity
float32[2] aux_hvel # horizontal auxiliar velocity innovation from landing target measurement (m/sec) and innovation variance ((m/sec)**2)
float32 aux_vvel # vertical auxiliar velocity innovation from landing target measurement (m/sec) and innovation variance ((m/sec)**2)
# Optical flow
float32[2] flow # flow innvoation (rad/sec) and innovation variance ((rad/sec)**2)
# Various
float32 heading # heading innovation (rad) and innovation variance (rad**2)
float32[3] mag_field # earth magnetic field innovation (Gauss) and innovation variance (Gauss**2)
float32[2] drag # drag specific force innovation (m/sec**2) and innovation variance ((m/sec)**2)
float32 airspeed # airspeed innovation (m/sec) and innovation variance ((m/sec)**2)
float32 beta # synthetic sideslip innovation (rad) and innovation variance (rad**2)
float32 hagl # height of ground innovation (m) and innovation variance (m**2)
# The innovation test ratios are scalar values. In case the field is a vector,
# the test ratio will be put in the first component of the vector.
# TOPICS estimator_innovations estimator_innovation_variances estimator_innovation_test_ratios

View File

@@ -9,6 +9,8 @@ float32[3] vibe # IMU vibration metrics in the following array locations
float32[24] covariances # Diagonal Elements of Covariance Matrix
float32[3] output_tracking_error # return a vector containing the output predictor angular, velocity and position tracking error magnitudes (rad), (m/s), (m)
uint16 gps_check_fail_flags # Bitmask to indicate status of GPS checks - see definition below
# bits are true when corresponding test has failed
uint8 GPS_CHECK_FAIL_GPS_FIX = 0 # 0 : insufficient fix type (no 3D solution)

View File

@@ -45,8 +45,7 @@ rtps:
- msg: distance_sensor
id: 17
send: true
# TODO: replace with 'estimator_innovations' as https://github.com/PX4/Firmware/pull/13127 is rebased over this
- msg: ekf2_innovations
- msg: estimator_innovations
id: 18
- msg: ekf2_timestamps
id: 19
@@ -336,4 +335,10 @@ rtps:
- msg: vehicle_visual_odometry_aligned
id: 169
alias: vehicle_odometry
- msg: estimator_innovation_variances
id: 170
alias: estimator_innovations
- msg: estimator_innovation_test_ratios
id: 171
alias: estimator_innovations
########## multi topics: end ##########