Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_MSP: move from HAL_NO_GCS to HAL_GCS_ENABLED

This commit is contained in:
Peter Barker 2021-08-18 21:42:17 +10:00 committed by Peter Barker
parent fec9d4850d
commit 4aa6c212d2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_MSP/AP_MSP_Telem_Backend.cpp
View File

@ -316,7 +316,7 @@ void AP_MSP_Telem_Backend::update_flight_mode_str(char *flight_mode_str, uint8_t
MANU [S] MANU [S]
MANU [SS] MANU [SS]
*/ */
#ifndef HAL_NO_GCS #if HAL_GCS_ENABLED
const char* simple_mode_str = gcs().simple_input_active() ? " [S]" : (gcs().supersimple_input_active() ? " [SS]" : ""); const char* simple_mode_str = gcs().simple_input_active() ? " [S]" : (gcs().supersimple_input_active() ? " [SS]" : "");
snprintf(flight_mode_str, size, "%s%s", notify->get_flight_mode_str(), simple_mode_str); snprintf(flight_mode_str, size, "%s%s", notify->get_flight_mode_str(), simple_mode_str);
#else #else

2
libraries/AP_OSD/AP_OSD.h
View File

@ -24,7 +24,7 @@
#include <AP_Param/AP_Param.h> #include <AP_Param/AP_Param.h>
#include <GCS_MAVLink/GCS.h> #include <GCS_MAVLink/GCS.h>
#include <AP_OLC/AP_OLC.h> #include <AP_OLC/AP_OLC.h>
#include <AP_MSP/msp.h>
#ifndef OSD_ENABLED #ifndef OSD_ENABLED
#define OSD_ENABLED !HAL_MINIMIZE_FEATURES #define OSD_ENABLED !HAL_MINIMIZE_FEATURES