Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-18 06:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: remove include of AP_Param.h in GCS_MAVLink.h

Browse Source 
This will help break include loops.
This commit is contained in:
Peter Barker 2019-07-17 14:50:12 +10:00 committed by Peter Barker
parent 392a174e2e
commit 210c2070a1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/GCS_MAVLink/GCS.h
View File

@ -516,6 +516,9 @@ protected:
virtual MAV_VTOL_STATE vtol_state() const { return MAV_VTOL_STATE_UNDEFINED; } virtual MAV_VTOL_STATE vtol_state() const { return MAV_VTOL_STATE_UNDEFINED; }
virtual MAV_LANDED_STATE landed_state() const { return MAV_LANDED_STATE_UNDEFINED; } virtual MAV_LANDED_STATE landed_state() const { return MAV_LANDED_STATE_UNDEFINED; }
// return a MAVLink parameter type given a AP_Param type
static MAV_PARAM_TYPE mav_param_type(enum ap_var_type t);
AP_Param * _queued_parameter; ///< next parameter to AP_Param * _queued_parameter; ///< next parameter to
// be sent in queue // be sent in queue
mavlink_channel_t chan; mavlink_channel_t chan;

2
libraries/GCS_MAVLink/GCS_MAVLink.cpp
View File

@ -76,7 +76,7 @@ void GCS_MAVLINK::set_channel_private(mavlink_channel_t _chan)
} }
// return a MAVLink parameter type given a AP_Param type // return a MAVLink parameter type given a AP_Param type
MAV_PARAM_TYPE mav_param_type(enum ap_var_type t) MAV_PARAM_TYPE GCS_MAVLINK::mav_param_type(enum ap_var_type t)
{ {
if (t == AP_PARAM_INT8) { if (t == AP_PARAM_INT8) {
return MAV_PARAM_TYPE_INT8; return MAV_PARAM_TYPE_INT8;

5
libraries/GCS_MAVLink/GCS_MAVLink.h
View File

@ -2,7 +2,7 @@
/// @brief One size fits all header for MAVLink integration. /// @brief One size fits all header for MAVLink integration.
#pragma once #pragma once
#include <AP_Param/AP_Param.h> #include <AP_HAL/AP_HAL_Boards.h>
// we have separate helpers disabled to make it possible // we have separate helpers disabled to make it possible
// to select MAVLink 1.0 in the arduino GUI build // to select MAVLink 1.0 in the arduino GUI build
@ -76,9 +76,6 @@ uint16_t comm_get_txspace(mavlink_channel_t chan);
#define MAVLINK_USE_CONVENIENCE_FUNCTIONS #define MAVLINK_USE_CONVENIENCE_FUNCTIONS
#include "include/mavlink/v2.0/ardupilotmega/mavlink.h" #include "include/mavlink/v2.0/ardupilotmega/mavlink.h"
// return a MAVLink parameter type given a AP_Param type
MAV_PARAM_TYPE mav_param_type(enum ap_var_type t);
// lock and unlock a channel, for multi-threaded mavlink send // lock and unlock a channel, for multi-threaded mavlink send
void comm_send_lock(mavlink_channel_t chan); void comm_send_lock(mavlink_channel_t chan);
void comm_send_unlock(mavlink_channel_t chan); void comm_send_unlock(mavlink_channel_t chan);

2
libraries/GCS_MAVLink/GCS_Param.cpp
View File

@ -308,7 +308,7 @@ void GCS::send_parameter_value(const char *param_name, ap_var_type param_type, f
const uint8_t to_copy = MIN(ARRAY_SIZE(packet.param_id), strlen(param_name)); const uint8_t to_copy = MIN(ARRAY_SIZE(packet.param_id), strlen(param_name));
memcpy(packet.param_id, param_name, to_copy); memcpy(packet.param_id, param_name, to_copy);
packet.param_value = param_value; packet.param_value = param_value;
packet.param_type = mav_param_type(param_type); packet.param_type = GCS_MAVLINK::mav_param_type(param_type);
packet.param_count = AP_Param::count_parameters(); packet.param_count = AP_Param::count_parameters();
packet.param_index = -1; packet.param_index = -1;