From 2ce61cce581827beb7367df66c7387d258379773 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 14 Aug 2023 14:13:11 +1000 Subject: [PATCH] AP_Generator: rename generator define to fix feature extraction pattern-matching requires a regular pattern. Renaming the class would be bad, so just rename the define --- Tools/scripts/build_options.py | 4 ++-- libraries/AP_Generator/AP_Generator.cpp | 4 ++-- libraries/AP_Generator/AP_Generator.h | 4 ++-- libraries/AP_Generator/AP_Generator_IE_2400.cpp | 4 ++-- libraries/AP_Generator/AP_Generator_IE_2400.h | 4 ++-- libraries/AP_Generator/AP_Generator_IE_650_800.cpp | 4 ++-- libraries/AP_Generator/AP_Generator_IE_650_800.h | 4 ++-- libraries/AP_Generator/AP_Generator_config.h | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Tools/scripts/build_options.py b/Tools/scripts/build_options.py index 170b17a174..e9da0453b3 100644 --- a/Tools/scripts/build_options.py +++ b/Tools/scripts/build_options.py @@ -97,8 +97,8 @@ BUILD_OPTIONS = [ Feature('Generator', 'GENERATOR', 'HAL_GENERATOR_ENABLED', 'Enable Generator', 0, None), Feature('Generator', 'GENERATOR_RICHENPOWER', 'AP_GENERATOR_RICHENPOWER_ENABLED', 'Enable Richenpower Generator', 0, "GENERATOR"), # noqa - Feature('Generator', 'GENERATOR_IE2400', 'AP_GENERATOR_IE2400_ENABLED', 'Enable IntelligentEnergy 2400', 0, "GENERATOR"), # noqa - Feature('Generator', 'GENERATOR_IE650', 'AP_GENERATOR_IE650_800_ENABLED', 'Enable IntelligentEnergy 650 and 800 support', 0, "GENERATOR"), # noqa + Feature('Generator', 'GENERATOR_IE2400', 'AP_GENERATOR_IE_2400_ENABLED', 'Enable IntelligentEnergy 2400', 0, "GENERATOR"), # noqa + Feature('Generator', 'GENERATOR_IE650', 'AP_GENERATOR_IE_650_800_ENABLED', 'Enable IntelligentEnergy 650 and 800 support', 0, "GENERATOR"), # noqa Feature('OSD', 'OSD', 'OSD_ENABLED', 'Enable OSD', 0, None), Feature('OSD', 'PLUSCODE', 'HAL_PLUSCODE_ENABLE', 'Enable PlusCode', 0, 'OSD'), diff --git a/libraries/AP_Generator/AP_Generator.cpp b/libraries/AP_Generator/AP_Generator.cpp index f531c05ec7..d612d00853 100644 --- a/libraries/AP_Generator/AP_Generator.cpp +++ b/libraries/AP_Generator/AP_Generator.cpp @@ -65,13 +65,13 @@ void AP_Generator::init() // Not using a generator return; -#if AP_GENERATOR_IE650_800_ENABLED +#if AP_GENERATOR_IE_650_800_ENABLED case Type::IE_650_800: _driver_ptr = new AP_Generator_IE_650_800(*this); break; #endif -#if AP_GENERATOR_IE2400_ENABLED +#if AP_GENERATOR_IE_2400_ENABLED case Type::IE_2400: _driver_ptr = new AP_Generator_IE_2400(*this); break; diff --git a/libraries/AP_Generator/AP_Generator.h b/libraries/AP_Generator/AP_Generator.h index d0a11a597a..be36d09e20 100644 --- a/libraries/AP_Generator/AP_Generator.h +++ b/libraries/AP_Generator/AP_Generator.h @@ -82,10 +82,10 @@ private: enum class Type { GEN_DISABLED = 0, -#if AP_GENERATOR_IE650_800_ENABLED +#if AP_GENERATOR_IE_650_800_ENABLED IE_650_800 = 1, #endif -#if AP_GENERATOR_IE2400_ENABLED +#if AP_GENERATOR_IE_2400_ENABLED IE_2400 = 2, #endif #if AP_GENERATOR_RICHENPOWER_ENABLED diff --git a/libraries/AP_Generator/AP_Generator_IE_2400.cpp b/libraries/AP_Generator/AP_Generator_IE_2400.cpp index b56c3f3935..70dc5563f0 100644 --- a/libraries/AP_Generator/AP_Generator_IE_2400.cpp +++ b/libraries/AP_Generator/AP_Generator_IE_2400.cpp @@ -15,7 +15,7 @@ #include "AP_Generator_IE_2400.h" -#if AP_GENERATOR_IE2400_ENABLED +#if AP_GENERATOR_IE_2400_ENABLED #include @@ -203,4 +203,4 @@ void AP_Generator_IE_2400::log_write() _err_code ); } -#endif // AP_GENERATOR_IE2400_ENABLED +#endif // AP_GENERATOR_IE_2400_ENABLED diff --git a/libraries/AP_Generator/AP_Generator_IE_2400.h b/libraries/AP_Generator/AP_Generator_IE_2400.h index 178e0d69fc..b660bc105e 100644 --- a/libraries/AP_Generator/AP_Generator_IE_2400.h +++ b/libraries/AP_Generator/AP_Generator_IE_2400.h @@ -2,7 +2,7 @@ #include "AP_Generator_IE_FuelCell.h" -#if AP_GENERATOR_IE2400_ENABLED +#if AP_GENERATOR_IE_2400_ENABLED class AP_Generator_IE_2400 : public AP_Generator_IE_FuelCell { @@ -53,5 +53,5 @@ private: uint16_t _spm_pwr; // Stack Power Module (SPM) power draw (Watts) }; -#endif // AP_GENERATOR_IE2400_ENABLED +#endif // AP_GENERATOR_IE_2400_ENABLED diff --git a/libraries/AP_Generator/AP_Generator_IE_650_800.cpp b/libraries/AP_Generator/AP_Generator_IE_650_800.cpp index 2a208a8d59..4fef789161 100644 --- a/libraries/AP_Generator/AP_Generator_IE_650_800.cpp +++ b/libraries/AP_Generator/AP_Generator_IE_650_800.cpp @@ -15,7 +15,7 @@ #include "AP_Generator_IE_650_800.h" -#if AP_GENERATOR_IE650_800_ENABLED +#if AP_GENERATOR_IE_650_800_ENABLED extern const AP_HAL::HAL& hal; @@ -122,5 +122,5 @@ AP_BattMonitor::Failsafe AP_Generator_IE_650_800::update_failsafes() const return AP_BattMonitor::Failsafe::None; } -#endif // AP_GENERATOR_IE650_800_ENABLED +#endif // AP_GENERATOR_IE_650_800_ENABLED diff --git a/libraries/AP_Generator/AP_Generator_IE_650_800.h b/libraries/AP_Generator/AP_Generator_IE_650_800.h index 545e3e244a..4107f463fd 100644 --- a/libraries/AP_Generator/AP_Generator_IE_650_800.h +++ b/libraries/AP_Generator/AP_Generator_IE_650_800.h @@ -2,7 +2,7 @@ #include "AP_Generator_IE_FuelCell.h" -#if AP_GENERATOR_IE650_800_ENABLED +#if AP_GENERATOR_IE_650_800_ENABLED class AP_Generator_IE_650_800 : public AP_Generator_IE_FuelCell { @@ -95,4 +95,4 @@ private: | ERROR_BAT_UT; // (0x8), Battery undertemperature (<-15 degC) }; -#endif // AP_GENERATOR_IE650_800_ENABLED +#endif // AP_GENERATOR_IE_650_800_ENABLED diff --git a/libraries/AP_Generator/AP_Generator_config.h b/libraries/AP_Generator/AP_Generator_config.h index 7dbe5fc99b..83d096cfa0 100644 --- a/libraries/AP_Generator/AP_Generator_config.h +++ b/libraries/AP_Generator/AP_Generator_config.h @@ -14,12 +14,12 @@ #define AP_GENERATOR_IE_ENABLED AP_GENERATOR_BACKEND_DEFAULT_ENABLED #endif -#ifndef AP_GENERATOR_IE2400_ENABLED -#define AP_GENERATOR_IE2400_ENABLED AP_GENERATOR_IE_ENABLED +#ifndef AP_GENERATOR_IE_2400_ENABLED +#define AP_GENERATOR_IE_2400_ENABLED AP_GENERATOR_IE_ENABLED #endif -#ifndef AP_GENERATOR_IE650_800_ENABLED -#define AP_GENERATOR_IE650_800_ENABLED AP_GENERATOR_IE_ENABLED +#ifndef AP_GENERATOR_IE_650_800_ENABLED +#define AP_GENERATOR_IE_650_800_ENABLED AP_GENERATOR_IE_ENABLED #endif #ifndef AP_GENERATOR_RICHENPOWER_ENABLED