From f71b4ec56899d3b44780d5de6279b356cf1cd721 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 24 Sep 2021 13:10:46 +1000 Subject: [PATCH] AP_BattMonitor: rename GENERATOR_ENABLED to HAL_GENERATOR_ENABLED --- libraries/AP_BattMonitor/AP_BattMonitor.cpp | 4 ++-- libraries/AP_BattMonitor/AP_BattMonitor_Generator.cpp | 2 +- libraries/AP_BattMonitor/AP_BattMonitor_Generator.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor.cpp b/libraries/AP_BattMonitor/AP_BattMonitor.cpp index bdfa294ae6..3e0c3305ca 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor.cpp @@ -282,14 +282,14 @@ AP_BattMonitor::init() drivers[instance] = new AP_BattMonitor_FuelLevel_PWM(*this, state[instance], _params[instance]); break; #endif // HAL_BATTMON_FUEL_ENABLE -#if GENERATOR_ENABLED +#if HAL_GENERATOR_ENABLED case Type::GENERATOR_ELEC: drivers[instance] = new AP_BattMonitor_Generator_Elec(*this, state[instance], _params[instance]); break; case Type::GENERATOR_FUEL: drivers[instance] = new AP_BattMonitor_Generator_FuelLevel(*this, state[instance], _params[instance]); break; -#endif // GENERATOR_ENABLED +#endif // HAL_GENERATOR_ENABLED #if HAL_MPPT_PACKETDIGITAL_CAN_ENABLE case Type::MPPT_PacketDigital: drivers[instance] = new AP_BattMonitor_MPPT_PacketDigital(*this, state[instance], _params[instance]); diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Generator.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Generator.cpp index cd3d12cf47..8dee4bd0fe 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Generator.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Generator.cpp @@ -15,7 +15,7 @@ #include "AP_BattMonitor_Generator.h" -#if GENERATOR_ENABLED +#if HAL_GENERATOR_ENABLED #include #include diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Generator.h b/libraries/AP_BattMonitor/AP_BattMonitor_Generator.h index 504bc6704b..bacd1e399a 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Generator.h +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Generator.h @@ -2,7 +2,7 @@ #include -#if GENERATOR_ENABLED +#if HAL_GENERATOR_ENABLED #include "AP_BattMonitor.h" #include "AP_BattMonitor_Backend.h"