From d86e2792fd0a1a0482e33b44cbd3f817887ebb73 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 24 Sep 2021 13:10:47 +1000
Subject: [PATCH] AP_Vehicle: rename GENERATOR_ENABLED to HAL_GENERATOR_ENABLED

---
 libraries/AP_Vehicle/AP_Vehicle.cpp | 6 +++---
 libraries/AP_Vehicle/AP_Vehicle.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/AP_Vehicle/AP_Vehicle.cpp b/libraries/AP_Vehicle/AP_Vehicle.cpp
index 099cdcc292..e3b34f628b 100644
--- a/libraries/AP_Vehicle/AP_Vehicle.cpp
+++ b/libraries/AP_Vehicle/AP_Vehicle.cpp
@@ -49,7 +49,7 @@ const AP_Param::GroupInfo AP_Vehicle::var_info[] = {
     AP_SUBGROUPINFO(frsky_parameters, "FRSKY_", 6, AP_Vehicle, AP_Frsky_Parameters),
 #endif
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
     // @Group: GEN_
     // @Path: ../AP_Generator/AP_Generator.cpp
     AP_SUBGROUPINFO(generator, "GEN_", 7, AP_Vehicle, AP_Generator),
@@ -171,7 +171,7 @@ void AP_Vehicle::setup()
 
     send_watchdog_reset_statustext();
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
     generator.init();
 #endif
     gcs().send_text(MAV_SEVERITY_INFO, "ArduPilot Ready");
@@ -236,7 +236,7 @@ const AP_Scheduler::Task AP_Vehicle::scheduler_tasks[] = {
 #if HAL_WITH_ESC_TELEM
     SCHED_TASK_CLASS(AP_ESC_Telem, &vehicle.esc_telem,      update,                   10,  50),
 #endif
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
     SCHED_TASK_CLASS(AP_Generator, &vehicle.generator,      update,                   10,  50),
 #endif
 #if OSD_ENABLED
diff --git a/libraries/AP_Vehicle/AP_Vehicle.h b/libraries/AP_Vehicle/AP_Vehicle.h
index 9d4a25f008..e1d2b951e7 100644
--- a/libraries/AP_Vehicle/AP_Vehicle.h
+++ b/libraries/AP_Vehicle/AP_Vehicle.h
@@ -339,7 +339,7 @@ protected:
     AP_MSP msp;
 #endif
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
     AP_Generator generator;
 #endif