AP_DroneID: remove duplicate definition of AP_OPENDRONEID_ENABLED

... my guess is conflict resolution caused this
ArduPilot · Oct 13, 2023 · ccc33c0 · ccc33c0
1 parent 2cb1f9b
commit ccc33c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp b/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp
@@ -27,10 +27,11 @@
  * and DroneCAN
  */
 
-#include "AP_OpenDroneID.h"
+#include "AP_OpenDroneID_config.h"
 
 #if AP_OPENDRONEID_ENABLED
 
+#include "AP_OpenDroneID.h"
 #include <AP_HAL/AP_HAL.h>
 #include <GCS_MAVLink/GCS.h>
 #include <AP_GPS/AP_GPS.h>

diff --git a/libraries/AP_OpenDroneID/AP_OpenDroneID.h b/libraries/AP_OpenDroneID/AP_OpenDroneID.h
@@ -27,14 +27,8 @@
 
 #pragma once
 
-#include <AP_HAL/AP_HAL_Boards.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
 
 #include <AP_Math/AP_Math.h>