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

vtol_att_control: shorter elapsed time calculation

Browse Source
This commit is contained in:
Balduin
2025-03-26 15:52:58 +01:00
committed by Silvan Fuhrer
parent 898d631b24
commit 19d3e6285b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vtol_att_control/vtol_att_control_main.cpp
+10 -3
View File
@@ -427,9 +427,16 @@ VtolAttitudeControl::Run()
_vehicle_thrust_setpoint0_pub.publish(_thrust_setpoint_0); _vehicle_thrust_setpoint0_pub.publish(_thrust_setpoint_0);
_vehicle_thrust_setpoint1_pub.publish(_thrust_setpoint_1); _vehicle_thrust_setpoint1_pub.publish(_thrust_setpoint_1);
// Advertise/Publish vtol vehicle status // Advertise/publish vtol vehicle status -- immediately if changed, otherwise at 1 Hz
_vtol_vehicle_status.timestamp = hrt_absolute_time(); const bool vtol_vehicle_status_changed =
_vtol_vehicle_status_pub.publish(_vtol_vehicle_status); (_vtol_vehicle_status.vehicle_vtol_state != _prev_published_vtol_vehicle_status.vehicle_vtol_state) ||
(_vtol_vehicle_status.fixed_wing_system_failure != _prev_published_vtol_vehicle_status.fixed_wing_system_failure);
if (vtol_vehicle_status_changed || hrt_elapsed_time(&_prev_published_vtol_vehicle_status.timestamp) >= 1_s) {
_vtol_vehicle_status.timestamp = hrt_absolute_time();
_vtol_vehicle_status_pub.publish(_vtol_vehicle_status);
_prev_published_vtol_vehicle_status = _vtol_vehicle_status;
}
// Publish flaps/spoiler setpoint with configured deflection in Hover if in Auto. // Publish flaps/spoiler setpoint with configured deflection in Hover if in Auto.
// In Manual always published in FW rate controller, and in Auto FW in FW Position Controller. // In Manual always published in FW rate controller, and in Auto FW in FW Position Controller.
src/modules/vtol_att_control/vtol_att_control_main.h
+1
View File
@@ -205,6 +205,7 @@ private:
vehicle_local_position_setpoint_s _local_pos_sp{}; vehicle_local_position_setpoint_s _local_pos_sp{};
vehicle_status_s _vehicle_status{}; vehicle_status_s _vehicle_status{};
vtol_vehicle_status_s _vtol_vehicle_status{}; vtol_vehicle_status_s _vtol_vehicle_status{};
vtol_vehicle_status_s _prev_published_vtol_vehicle_status{};
float _home_position_z{NAN}; float _home_position_z{NAN};
float _air_density{atmosphere::kAirDensitySeaLevelStandardAtmos}; // [kg/m^3] float _air_density{atmosphere::kAirDensitySeaLevelStandardAtmos}; // [kg/m^3]