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

AP_OSD: remove GCS.h from library header files

This commit is contained in:
Peter Barker 2022-11-08 15:23:10 +11:00 committed by Andrew Tridgell
parent 1b4f200cfd
commit aea39a1d18
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_OSD/AP_OSD.cpp
View File

@ -36,6 +36,7 @@
#include <AP_Notify/AP_Notify.h> #include <AP_Notify/AP_Notify.h>
#include <AP_Terrain/AP_Terrain.h> #include <AP_Terrain/AP_Terrain.h>
#include <AP_RSSI/AP_RSSI.h> #include <AP_RSSI/AP_RSSI.h>
#include <GCS_MAVLink/GCS.h>
// macro for easy use of var_info2 // macro for easy use of var_info2
#define AP_SUBGROUPINFO2(element, name, idx, thisclazz, elclazz) { AP_PARAM_GROUP, idx, name, AP_VAROFFSET(thisclazz, element), { group_info : elclazz::var_info2 }, AP_PARAM_FLAG_NESTED_OFFSET } #define AP_SUBGROUPINFO2(element, name, idx, thisclazz, elclazz) { AP_PARAM_GROUP, idx, name, AP_VAROFFSET(thisclazz, element), { group_info : elclazz::var_info2 }, AP_PARAM_FLAG_NESTED_OFFSET }

10
libraries/AP_OSD/AP_OSD.h
View File

@ -22,11 +22,13 @@
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
#include <AP_ESC_Telem/AP_ESC_Telem.h> #include <AP_ESC_Telem/AP_ESC_Telem.h>
#include <RC_Channel/RC_Channel.h> #include <RC_Channel/RC_Channel.h>
#include <GCS_MAVLink/GCS.h> #include <GCS_MAVLink/GCS_config.h>
#include <AP_OLC/AP_OLC.h> #include <AP_OLC/AP_OLC.h>
#include <AP_MSP/msp.h> #include <AP_MSP/msp.h>
#include <AP_Baro/AP_Baro.h> #include <AP_Baro/AP_Baro.h>
#if HAL_GCS_ENABLED
#include <GCS_MAVLink/GCS_MAVLink.h> #include <GCS_MAVLink/GCS_MAVLink.h>
#endif
#include <AC_Fence/AC_Fence_config.h> #include <AC_Fence/AC_Fence_config.h>
#ifndef OSD_ENABLED #ifndef OSD_ENABLED
@ -410,8 +412,8 @@ public:
void draw(void) override; void draw(void) override;
#endif #endif
#if HAL_GCS_ENABLED #if HAL_GCS_ENABLED
void handle_write_msg(const mavlink_osd_param_config_t& packet, const GCS_MAVLINK& link); void handle_write_msg(const mavlink_osd_param_config_t& packet, const class GCS_MAVLINK& link);
void handle_read_msg(const mavlink_osd_param_show_config_t& packet, const GCS_MAVLINK& link); void handle_read_msg(const mavlink_osd_param_show_config_t& packet, const class GCS_MAVLINK& link);
#endif #endif
// get a setting and associated metadata // get a setting and associated metadata
AP_OSD_ParamSetting* get_setting(uint8_t param_idx); AP_OSD_ParamSetting* get_setting(uint8_t param_idx);
@ -595,7 +597,7 @@ public:
#endif #endif
// handle OSD parameter configuration // handle OSD parameter configuration
#if HAL_GCS_ENABLED #if HAL_GCS_ENABLED
void handle_msg(const mavlink_message_t &msg, const GCS_MAVLINK& link); void handle_msg(const mavlink_message_t &msg, const class GCS_MAVLINK& link);
#endif #endif
// allow threads to lock against OSD update // allow threads to lock against OSD update

1
libraries/AP_OSD/AP_OSD_Backend.cpp
View File

@ -16,6 +16,7 @@
#include <AP_OSD/AP_OSD_Backend.h> #include <AP_OSD/AP_OSD_Backend.h>
#include <AP_HAL/Util.h> #include <AP_HAL/Util.h>
#include <GCS_MAVLink/GCS.h>
#include <ctype.h> #include <ctype.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

2
libraries/AP_OSD/AP_OSD_MSP_DisplayPort.cpp
View File

@ -22,6 +22,8 @@
#if HAL_WITH_MSP_DISPLAYPORT #if HAL_WITH_MSP_DISPLAYPORT
#include <GCS_MAVLink/GCS.h>
static const struct AP_Param::defaults_table_struct defaults_table[] = { static const struct AP_Param::defaults_table_struct defaults_table[] = {
/* /*
{ "PARAM_NAME", value_float } { "PARAM_NAME", value_float }

1
libraries/AP_OSD/AP_OSD_ParamScreen.cpp
View File

@ -30,6 +30,7 @@
#include <AP_Vehicle/AP_Vehicle_Type.h> #include <AP_Vehicle/AP_Vehicle_Type.h>
#include <AP_Arming/AP_Arming.h> #include <AP_Arming/AP_Arming.h>
#include <AP_Vehicle/AP_Vehicle_Type.h> #include <AP_Vehicle/AP_Vehicle_Type.h>
#include <GCS_MAVLink/GCS.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

1
libraries/AP_OSD/AP_OSD_ParamSetting.cpp
View File

@ -23,6 +23,7 @@
#include "AP_OSD.h" #include "AP_OSD.h"
#include <AP_Vehicle/AP_Vehicle_Type.h> #include <AP_Vehicle/AP_Vehicle_Type.h>
#include <GCS_MAVLink/GCS.h>
#include <SRV_Channel/SRV_Channel.h> #include <SRV_Channel/SRV_Channel.h>
#include <ctype.h> #include <ctype.h>