fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-03 00:50:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

FixedwingAttitudeControl: remove SuperBlock dependency

Browse Source
This commit is contained in:
Beat Küng
2018-03-20 11:19:54 +01:00
parent 0fdd53f4c2
commit 51ca01ce04
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_att_control/FixedwingAttitudeControl.cpp
+5 -6
View File
@@ -41,8 +41,7 @@
extern "C" __EXPORT int fw_att_control_main(int argc, char *argv[]);
FixedwingAttitudeControl::FixedwingAttitudeControl() :
SuperBlock(nullptr, "FW_ATT"),
_sub_airspeed(ORB_ID(airspeed), 0, 0, &getSubscriptions()),
_airspeed_sub(ORB_ID(airspeed)),
/* performance counters */
_loop_perf(perf_alloc(PC_ELAPSED, "fwa_dt")),
@@ -527,7 +526,7 @@ void FixedwingAttitudeControl::run()
matrix::Eulerf euler_angles(R);
updateSubscriptions();
_airspeed_sub.update();
vehicle_setpoint_poll();
vehicle_control_mode_poll();
vehicle_manual_poll();
@@ -563,12 +562,12 @@ void FixedwingAttitudeControl::run()
float airspeed;
/* if airspeed is non-finite or not valid or if we are asked not to control it, we assume the normal average speed */
const bool airspeed_valid = PX4_ISFINITE(_sub_airspeed.get().indicated_airspeed_m_s)
&& (hrt_elapsed_time(&_sub_airspeed.get().timestamp) < 1e6);
const bool airspeed_valid = PX4_ISFINITE(_airspeed_sub.get().indicated_airspeed_m_s)
&& (hrt_elapsed_time(&_airspeed_sub.get().timestamp) < 1e6);
if (airspeed_valid) {
/* prevent numerical drama by requiring 0.5 m/s minimal speed */
airspeed = math::max(0.5f, _sub_airspeed.get().indicated_airspeed_m_s);
airspeed = math::max(0.5f, _airspeed_sub.get().indicated_airspeed_m_s);
} else {
airspeed = _parameters.airspeed_trim;