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

Merge branch 'develop' of github.com:MarvinHarms/ethzasl_fw_px4 into develop

Browse Source
This commit is contained in:
Marvin Harms
2022-07-08 11:12:13 +02:00
parent b01e864271 f8a4928a43
commit 9b056cf990
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/sitl_gazebo
+1 -1
Submodule Tools/sitl_gazebo updated: 59a34c17ff...a3eef9d3a1
src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp
+1 -1
View File
@@ -604,7 +604,7 @@ FixedwingPositionINDIControl::Run()
float AoA_approx = (((2.f*Fz)/(_rho*_area*(fmaxf(_airspeed*_airspeed,_stall_speed*_stall_speed))+0.001f) - _C_L0)/_C_L1) /
(1 - ((2.f*Fx)/(_rho*_area*(fmaxf(_airspeed*_airspeed,_stall_speed*_stall_speed))+0.001f)/_C_L1));
AoA_approx = constrain(AoA_approx,-0.2f,0.2f);
Vector3f vel_air = R_ib*(Vector3f{_airspeed,0.f,tanf(AoA_approx)*_airspeed});
Vector3f vel_air = R_ib*(Vector3f{_airspeed,0.f,tanf(AoA_approx-_aoa_offset)*_airspeed});
Vector3f wind = _vel - vel_air;
wind(0) = _lp_filter_wind[0].apply(wind(0));
wind(1) = _lp_filter_wind[1].apply(wind(1));