diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-10-27 22:03:07 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-10-27 22:03:07 +0400 |
| commit | d309d0203ca97e2eff59af85444cd18f03190a9d (patch) | |
| tree | 1fc73d1fb60bf151f811f3397285e65ab60a1b89 /src/modules/position_estimator_inav/position_estimator_inav_params.h | |
| parent | 7d4981d4b4389d28fa05d661ed52be41564b953b (diff) | |
| parent | 59c04adada5a6b55d599cb11680ceafc7bf75614 (diff) | |
| download | px4-firmware-d309d0203ca97e2eff59af85444cd18f03190a9d.tar.gz px4-firmware-d309d0203ca97e2eff59af85444cd18f03190a9d.tar.bz2 px4-firmware-d309d0203ca97e2eff59af85444cd18f03190a9d.zip | |
Merge branch 'master' into inav_alt_gps. Use GPS for altitude estimation.
Diffstat (limited to 'src/modules/position_estimator_inav/position_estimator_inav_params.h')
| -rw-r--r-- | src/modules/position_estimator_inav/position_estimator_inav_params.h | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_params.h b/src/modules/position_estimator_inav/position_estimator_inav_params.h index e394edfa4..f583f4b7d 100644 --- a/src/modules/position_estimator_inav/position_estimator_inav_params.h +++ b/src/modules/position_estimator_inav/position_estimator_inav_params.h @@ -41,13 +41,15 @@ #include <systemlib/param/param.h> struct position_estimator_inav_params { - float w_alt_baro; - float w_alt_acc; - float w_alt_sonar; - float w_pos_gps_p; - float w_pos_gps_v; - float w_pos_acc; - float w_pos_flow; + float w_z_baro; + float w_z_gps_p; + float w_z_gps_v; + float w_z_acc; + float w_z_sonar; + float w_xy_gps_p; + float w_xy_gps_v; + float w_xy_acc; + float w_xy_flow; float w_gps_flow; float w_acc_bias; float flow_k; @@ -60,13 +62,15 @@ struct position_estimator_inav_params { }; struct position_estimator_inav_param_handles { - param_t w_alt_baro; - param_t w_alt_acc; - param_t w_alt_sonar; - param_t w_pos_gps_p; - param_t w_pos_gps_v; - param_t w_pos_acc; - param_t w_pos_flow; + param_t w_z_baro; + param_t w_z_gps_p; + param_t w_z_gps_v; + param_t w_z_acc; + param_t w_z_sonar; + param_t w_xy_gps_p; + param_t w_xy_gps_v; + param_t w_xy_acc; + param_t w_xy_flow; param_t w_gps_flow; param_t w_acc_bias; param_t flow_k; |