From e15f9d3f3988666782fe26e6f5d68eabcc730420 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 14 Feb 2024 10:56:56 +1100 Subject: [PATCH] AP_BattMonitor: tidy defines in scripting backend --- libraries/AP_BattMonitor/AP_BattMonitor_Scripting.cpp | 5 +++-- libraries/AP_BattMonitor/AP_BattMonitor_Scripting.h | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.cpp index 337c9d9b7a..e7b846258d 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.cpp @@ -1,7 +1,9 @@ -#include "AP_BattMonitor_Scripting.h" +#include "AP_BattMonitor_config.h" #if AP_BATTERY_SCRIPTING_ENABLED +#include "AP_BattMonitor_Scripting.h" + #define AP_BATT_MONITOR_SCRIPTING_TIMEOUT_US 5000000 bool AP_BattMonitor_Scripting::capacity_remaining_pct(uint8_t &percentage) const @@ -81,4 +83,3 @@ bool AP_BattMonitor_Scripting::handle_scripting(const BattMonitorScript_State &b } #endif // AP_BATTERY_SCRIPTING_ENABLED - diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.h b/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.h index f68f11b9dc..382437d0aa 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.h +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Scripting.h @@ -1,9 +1,11 @@ #pragma once -#include "AP_BattMonitor_Backend.h" +#include "AP_BattMonitor_config.h" #if AP_BATTERY_SCRIPTING_ENABLED +#include "AP_BattMonitor_Backend.h" + class AP_BattMonitor_Scripting : public AP_BattMonitor_Backend { public: @@ -28,5 +30,4 @@ protected: HAL_Semaphore sem; }; -#endif // AP_BATTMONITOR_SCRIPTING_ENABLED - +#endif // AP_BATTERY_SCRIPTING_ENABLED