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

ArduPlane: adjust for renaming of RC_Channel and GCS_MAVLink headers

Browse Source
This commit is contained in:
Peter Barker 2024-12-23 13:26:53 +11:00 committed by Peter Barker
parent f00e14900d
commit edc812d7f5
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/GCS_MAVLink_Plane.cpp
View File

@ -1,4 +1,4 @@
#include "GCS_Mavlink.h"
#include "GCS_MAVLink_Plane.h"
#include "Plane.h"
#include <AP_RPM/AP_RPM_config.h>

2
ArduPlane/GCS_Plane.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <GCS_MAVLink/GCS.h>
#include "GCS_Mavlink.h"
#include "GCS_MAVLink_Plane.h"
class GCS_Plane : public GCS
{

14
ArduPlane/Parameters.cpp
View File

@ -877,42 +877,42 @@ const AP_Param::Info Plane::var_info[] = {
GOBJECT(rcmap, "RCMAP_", RCMapper),
// @Group: SR0_
// @Path: GCS_Mavlink.cpp
// @Path: GCS_MAVLink_Plane.cpp
GOBJECTN(_gcs.chan_parameters[0], gcs0, "SR0_", GCS_MAVLINK_Parameters),
#if MAVLINK_COMM_NUM_BUFFERS >= 2
// @Group: SR1_
// @Path: GCS_Mavlink.cpp
// @Path: GCS_MAVLink_Plane.cpp
GOBJECTN(_gcs.chan_parameters[1], gcs1, "SR1_", GCS_MAVLINK_Parameters),
#endif
#if MAVLINK_COMM_NUM_BUFFERS >= 3
// @Group: SR2_
// @Path: GCS_Mavlink.cpp
// @Path: GCS_MAVLink_Plane.cpp
GOBJECTN(_gcs.chan_parameters[2], gcs2, "SR2_", GCS_MAVLINK_Parameters),
#endif
#if MAVLINK_COMM_NUM_BUFFERS >= 4
// @Group: SR3_
// @Path: GCS_Mavlink.cpp
// @Path: GCS_MAVLink_Plane.cpp
GOBJECTN(_gcs.chan_parameters[3], gcs3, "SR3_", GCS_MAVLINK_Parameters),
#endif
#if MAVLINK_COMM_NUM_BUFFERS >= 5
// @Group: SR4_
// @Path: GCS_Mavlink.cpp
// @Path: GCS_MAVLink_Plane.cpp
GOBJECTN(_gcs.chan_parameters[4], gcs4, "SR4_", GCS_MAVLINK_Parameters),
#endif
#if MAVLINK_COMM_NUM_BUFFERS >= 6
// @Group: SR5_
// @Path: GCS_Mavlink.cpp
// @Path: GCS_MAVLink_Plane.cpp
GOBJECTN(_gcs.chan_parameters[5], gcs5, "SR5_", GCS_MAVLINK_Parameters),
#endif
#if MAVLINK_COMM_NUM_BUFFERS >= 7
// @Group: SR6_
// @Path: GCS_Mavlink.cpp
// @Path: GCS_MAVLink_Plane.cpp
GOBJECTN(_gcs.chan_parameters[6], gcs6, "SR6_", GCS_MAVLINK_Parameters),
#endif

4
ArduPlane/Plane.h
View File

@ -92,7 +92,7 @@
# include <AC_PrecLand/AC_PrecLand.h>
#endif
#include "GCS_Mavlink.h"
#include "GCS_MAVLink_Plane.h"
#include "GCS_Plane.h"
#include "quadplane.h"
#include <AP_Tuning/AP_Tuning_config.h>
@ -115,7 +115,7 @@
#include <AP_Scripting/AP_Scripting.h>
#endif
#include "RC_Channel.h" // RC Channel Library
#include "RC_Channel_Plane.h" // RC Channel Library
#include "Parameters.h"
#if HAL_ADSB_ENABLED
#include "avoidance_adsb.h"

2
ArduPlane/RC_Channel_Plane.cpp
View File

@ -1,6 +1,6 @@
#include "Plane.h"
#include "RC_Channel.h"
#include "RC_Channel_Plane.h"
#include "qautotune.h"
// defining these two macros and including the RC_Channels_VarInfo