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

AP_OpenDroneID: remove duplicate definition of AP_OPENDRONEID_ENABLED

Browse Source 
... my guess is conflict resolution caused this
This commit is contained in:
Peter Barker 2023-10-13 12:54:17 +11:00 committed by Peter Barker
parent fcd4152b30
commit 8b67775673
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_OpenDroneID/AP_OpenDroneID.cpp
View File

@ -27,10 +27,11 @@
* and DroneCAN * and DroneCAN
*/ */
#include "AP_OpenDroneID.h" #include "AP_OpenDroneID_config.h"
#if AP_OPENDRONEID_ENABLED #if AP_OPENDRONEID_ENABLED
#include "AP_OpenDroneID.h"
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <GCS_MAVLink/GCS.h> #include <GCS_MAVLink/GCS.h>
#include <AP_GPS/AP_GPS.h> #include <AP_GPS/AP_GPS.h>

6
libraries/AP_OpenDroneID/AP_OpenDroneID.h
View File

@ -27,14 +27,8 @@
#pragma once #pragma once
#include <AP_HAL/AP_HAL_Boards.h>
#include "AP_OpenDroneID_config.h" #include "AP_OpenDroneID_config.h"
#ifndef AP_OPENDRONEID_ENABLED
// default to off. Enabled in hwdef.dat
#define AP_OPENDRONEID_ENABLED 0
#endif
#if AP_OPENDRONEID_ENABLED #if AP_OPENDRONEID_ENABLED
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>