mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-26 02:53:34 +08:00
select single system-wide wind estimate message (current best)
- publish wind estimate only from EKF, and wind speeds from airspeed selector to new separate topic (airspeed_wind) - rename message wind_estimate to wind - publish wind from currently used ekf instance (ekf2selector) Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
This commit is contained in:
@@ -86,10 +86,10 @@ AirspeedValidator::update_wind_estimator(const uint64_t time_now_usec, float air
|
||||
}
|
||||
|
||||
// this function returns the current states of the wind estimator to be published in the airspeed module
|
||||
wind_estimate_s
|
||||
airspeed_wind_s
|
||||
AirspeedValidator::get_wind_estimator_states(uint64_t timestamp)
|
||||
{
|
||||
wind_estimate_s wind_est = {};
|
||||
airspeed_wind_s wind_est = {};
|
||||
|
||||
wind_est.timestamp = timestamp;
|
||||
float wind[2];
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
#include <airspeed/airspeed.h>
|
||||
#include <ecl/airdata/WindEstimator.hpp>
|
||||
#include <uORB/topics/wind_estimate.h>
|
||||
#include <uORB/topics/airspeed_wind.h>
|
||||
|
||||
|
||||
using matrix::Dcmf;
|
||||
@@ -86,7 +86,7 @@ public:
|
||||
bool get_airspeed_valid() { return _airspeed_valid; }
|
||||
float get_CAS_scale() {return _CAS_scale;}
|
||||
|
||||
wind_estimate_s get_wind_estimator_states(uint64_t timestamp);
|
||||
airspeed_wind_s get_wind_estimator_states(uint64_t timestamp);
|
||||
|
||||
// setters wind estimator parameters
|
||||
void set_wind_estimator_wind_p_noise(float wind_sigma) { _wind_estimator.set_wind_p_noise(wind_sigma); }
|
||||
|
||||
Reference in New Issue
Block a user