AP_Generator: rename GENERATOR_ENABLED to HAL_GENERATOR_ENABLED

3 years ago · 5433cbe9a5
12 changed files with 14 additions and 14 deletions
--- a/libraries/AP_Generator/AP_Generator.cpp
+++ b/libraries/AP_Generator/AP_Generator.cpp
@ -15,7 +15,7 @@
				@@ -15,7 +15,7 @@

 #include "AP_Generator.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 #include "AP_Generator_IE_650_800.h"
 #include "AP_Generator_IE_2400.h"
--- a/libraries/AP_Generator/AP_Generator.h
+++ b/libraries/AP_Generator/AP_Generator.h
@ -2,11 +2,11 @@
				@@ -2,11 +2,11 @@

 #include <AP_HAL/AP_HAL.h>

-#ifndef GENERATOR_ENABLED
-#define GENERATOR_ENABLED !HAL_MINIMIZE_FEATURES && !defined(HAL_BUILD_AP_PERIPH)
+#ifndef HAL_GENERATOR_ENABLED
+#define HAL_GENERATOR_ENABLED !HAL_MINIMIZE_FEATURES && !defined(HAL_BUILD_AP_PERIPH)
 #endif

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 #include <AP_Param/AP_Param.h>
 #include <GCS_MAVLink/GCS.h>
--- a/libraries/AP_Generator/AP_Generator_Backend.cpp
+++ b/libraries/AP_Generator/AP_Generator_Backend.cpp
@ -14,7 +14,7 @@
				@@ -14,7 +14,7 @@
 */
 #include "AP_Generator_Backend.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 // Base class consructor
 AP_Generator_Backend::AP_Generator_Backend(AP_Generator& frontend) :
--- a/libraries/AP_Generator/AP_Generator_Backend.h
+++ b/libraries/AP_Generator/AP_Generator_Backend.h
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@

 #include "AP_Generator.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 class AP_Generator_Backend
 {
--- a/libraries/AP_Generator/AP_Generator_IE_2400.cpp
+++ b/libraries/AP_Generator/AP_Generator_IE_2400.cpp
@ -15,7 +15,7 @@
				@@ -15,7 +15,7 @@

 #include "AP_Generator_IE_2400.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 #include <AP_Logger/AP_Logger.h>

--- a/libraries/AP_Generator/AP_Generator_IE_2400.h
+++ b/libraries/AP_Generator/AP_Generator_IE_2400.h
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@

 #include "AP_Generator_IE_FuelCell.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 class AP_Generator_IE_2400 : public AP_Generator_IE_FuelCell
 {
--- a/libraries/AP_Generator/AP_Generator_IE_650_800.cpp
+++ b/libraries/AP_Generator/AP_Generator_IE_650_800.cpp
@ -15,7 +15,7 @@
				@@ -15,7 +15,7 @@

 #include "AP_Generator_IE_650_800.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 extern const AP_HAL::HAL& hal;

--- a/libraries/AP_Generator/AP_Generator_IE_650_800.h
+++ b/libraries/AP_Generator/AP_Generator_IE_650_800.h
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@

 #include "AP_Generator_IE_FuelCell.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 class AP_Generator_IE_650_800 : public AP_Generator_IE_FuelCell
 {
--- a/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
+++ b/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
@ -16,7 +16,7 @@
				@@ -16,7 +16,7 @@
 #include "AP_Generator_IE_FuelCell.h"
 #include <AP_SerialManager/AP_SerialManager.h>

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 // Initialize the fuelcell object and prepare it for use
 void AP_Generator_IE_FuelCell::init()
--- a/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
+++ b/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@

 #include "AP_Generator_Backend.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 #include <AP_Param/AP_Param.h>
 #include <GCS_MAVLink/GCS.h>
--- a/libraries/AP_Generator/AP_Generator_RichenPower.cpp
+++ b/libraries/AP_Generator/AP_Generator_RichenPower.cpp
@ -15,7 +15,7 @@
				@@ -15,7 +15,7 @@

 #include "AP_Generator_RichenPower.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 #include <AP_Logger/AP_Logger.h>
 #include <AP_SerialManager/AP_SerialManager.h>
--- a/libraries/AP_Generator/AP_Generator_RichenPower.h
+++ b/libraries/AP_Generator/AP_Generator_RichenPower.h
@ -3,7 +3,7 @@
				@@ -3,7 +3,7 @@

 #include "AP_Generator_Backend.h"

-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED

 #include <AP_Common/AP_Common.h>
 #include <SRV_Channel/SRV_Channel.h>