aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCS_MAVLink: correct compilation with rally disabled

Browse Source
This commit is contained in:
Peter Barker 2022-09-21 23:13:20 +10:00 committed by Peter Barker
parent 339dd33240
commit 2da23a218a
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -2209,10 +2209,12 @@ void GCS::update_send()
if (mission != nullptr) {
_missionitemprotocol_waypoints = new MissionItemProtocol_Waypoints(*mission);
}
#if HAL_RALLY_ENABLED
AP_Rally *rally = AP::rally();
if (rally != nullptr) {
_missionitemprotocol_rally = new MissionItemProtocol_Rally(*rally);
}
#endif
#if AP_FENCE_ENABLED
AC_Fence *fence = AP::fence();
if (fence != nullptr) {
@ -2223,9 +2225,11 @@ void GCS::update_send()
if (_missionitemprotocol_waypoints != nullptr) {
_missionitemprotocol_waypoints->update();
}
#if HAL_RALLY_ENABLED
if (_missionitemprotocol_rally != nullptr) {
_missionitemprotocol_rally->update();
}
#endif
#if AP_FENCE_ENABLED
if (_missionitemprotocol_fence != nullptr) {
_missionitemprotocol_fence->update();

3
libraries/GCS_MAVLink/MissionItemProtocol_Rally.cpp
View File

@ -22,6 +22,7 @@
#include <AP_Rally/AP_Rally.h>
#include <GCS_MAVLink/GCS.h>
#if HAL_RALLY_ENABLED
MAV_MISSION_RESULT MissionItemProtocol_Rally::append_item(const mavlink_mission_item_int_t &cmd)
{
@ -137,3 +138,5 @@ void MissionItemProtocol_Rally::truncate(const mavlink_mission_count_t &packet)
{
rally.truncate(packet.count);
}
#endif // HAL_RALLY_ENABLED

6
libraries/GCS_MAVLink/MissionItemProtocol_Rally.h
View File

@ -1,9 +1,11 @@
#pragma once
#include "MissionItemProtocol.h"
#include <AP_Rally/AP_Rally.h>
#if HAL_RALLY_ENABLED
#include "MissionItemProtocol.h"
class MissionItemProtocol_Rally : public MissionItemProtocol {
public:
MissionItemProtocol_Rally(class AP_Rally &_rally) :
@ -44,4 +46,4 @@ private:
};
#endif
#endif // HAL_RALLY_ENABLED