Airspeed Selector: resolve conflics for wind estimate topic publishin…

…g after rebase Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
PX4 · Aug 9, 2019 · cdf28ac · cdf28ac
1 parent a37a61e
commit cdf28ac
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/modules/ekf2/ekf2_main.cpp b/src/modules/ekf2/ekf2_main.cpp
@@ -283,7 +283,7 @@ class Ekf2 final : public ModuleBase<Ekf2>, public ModuleParams
 	uORB::Publication<sensor_bias_s>			_sensor_bias_pub{ORB_ID(sensor_bias)};
 	uORB::Publication<vehicle_attitude_s>			_att_pub{ORB_ID(vehicle_attitude)};
 	uORB::Publication<vehicle_odometry_s>			_vehicle_odometry_pub{ORB_ID(vehicle_odometry)};
-	uORB::Publication<wind_estimate_s>			_wind_pub{ORB_ID(wind_estimate), ORB_PRIO_DEFAULT};
+	uORB::Publication<wind_estimate_s>			_wind_pub{ORB_ID(wind_estimate)};
 	uORB::PublicationData<vehicle_global_position_s>	_vehicle_global_position_pub{ORB_ID(vehicle_global_position)};
 	uORB::PublicationData<vehicle_local_position_s>		_vehicle_local_position_pub{ORB_ID(vehicle_local_position)};