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

missionResult: remove unnecessary constants and rename instance_count to mission_update_counter

Browse Source
This commit is contained in:
Konrad
2023-11-24 08:11:41 +01:00
committed by Beat Küng
parent 7afa011741
commit a92e7a8796
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/Commander.cpp
+3 -3
View File
@@ -1935,19 +1935,19 @@ void Commander::checkForMissionUpdate()
if (_mission_result_sub.updated()) {
const mission_result_s &mission_result = _mission_result_sub.get();
const auto prev_mission_instance_count = mission_result.instance_count;
const auto prev_mission_mission_update_counter = mission_result.mission_update_counter;
_mission_result_sub.update();
// if mission_result is valid for the current mission
const bool mission_result_ok = (mission_result.timestamp > _boot_timestamp)
&& (mission_result.instance_count > 0);
&& (mission_result.mission_update_counter > 0);
bool auto_mission_available = mission_result_ok && mission_result.valid;
if (mission_result_ok) {
/* Only evaluate mission state if home is set */
if (!_failsafe_flags.home_position_invalid &&
(prev_mission_instance_count != mission_result.instance_count)) {
(prev_mission_mission_update_counter != mission_result.mission_update_counter)) {
if (!auto_mission_available) {
/* the mission is invalid */
src/modules/commander/HealthAndArmingChecks/checks/missionCheck.cpp
+1 -1
View File
@@ -56,6 +56,6 @@ void MissionChecks::checkAndReport(const Context &context, Report &reporter)
}
// This is a mode requirement, no need to report
reporter.failsafeFlags().auto_mission_missing = mission_result.instance_count <= 0;
reporter.failsafeFlags().auto_mission_missing = mission_result.mission_update_counter <= 0;
}
}
src/modules/navigator/mission_base.cpp
+2 -2
View File
@@ -690,14 +690,14 @@ MissionBase::checkMissionRestart()
void
MissionBase::check_mission_valid()
{
if (_navigator->get_mission_result()->instance_count != _mission.mission_update_counter) {
if (_navigator->get_mission_result()->mission_update_counter != _mission.mission_update_counter) {
MissionFeasibilityChecker missionFeasibilityChecker(_navigator, _dataman_client);
bool is_mission_valid =
missionFeasibilityChecker.checkMissionFeasible(_mission);
_navigator->get_mission_result()->valid = is_mission_valid;
_navigator->get_mission_result()->instance_count = _mission.mission_update_counter;
_navigator->get_mission_result()->mission_update_counter = _mission.mission_update_counter;
_navigator->get_mission_result()->seq_total = _mission.count;
_navigator->get_mission_result()->seq_reached = -1;
_navigator->get_mission_result()->failure = false;
src/modules/navigator/navigator.h
+1 -1
View File
@@ -249,7 +249,7 @@ public:
orb_advert_t *get_mavlink_log_pub() { return &_mavlink_log_pub; }
int mission_instance_count() const { return _mission_result.instance_count; }
int mission_instance_count() const { return _mission_result.mission_update_counter; }
void set_mission_failure_heading_timeout();