From a570160677b7363fe092f6629c4079eb7d7b1e2b Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 16 Mar 2023 10:05:59 +1100 Subject: [PATCH] Tools: tidy AP_EFI defines --- Tools/scripts/build_options.py | 6 +++--- Tools/scripts/extract_features.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tools/scripts/build_options.py b/Tools/scripts/build_options.py index 678b3d5f34..36da281763 100644 --- a/Tools/scripts/build_options.py +++ b/Tools/scripts/build_options.py @@ -86,9 +86,9 @@ BUILD_OPTIONS = [ Feature('ICE', 'ICE Engine', 'AP_ICENGINE_ENABLED', 'Enable Internal Combustion Engine support', 0, 'RPM'), Feature('ICE', 'EFI', 'HAL_EFI_ENABLED', 'Enable EFI Monitoring', 0, None), - Feature('ICE', 'EFI_NMPWU', 'HAL_EFI_NWPWU_ENABLED', 'Enable EFI NMPMU', 0, 'EFI'), - Feature('ICE', 'EFI_CURRAWONGECU', 'HAL_EFI_CURRAWONG_ECU_ENABLED', 'Enable EFI Currawong ECU', 0, 'EFI'), - Feature('ICE', 'EFI_DRONECAN', 'HAL_EFI_DRONECAN_ENABLED', 'Enable EFI DroneCAN', 0, 'EFI'), + Feature('ICE', 'EFI_NMPWU', 'AP_EFI_NWPWU_ENABLED', 'Enable EFI NMPMU', 0, 'EFI'), + Feature('ICE', 'EFI_CURRAWONGECU', 'AP_EFI_CURRAWONG_ECU_ENABLED', 'Enable EFI Currawong ECU', 0, 'EFI'), + Feature('ICE', 'EFI_DRONECAN', 'AP_EFI_DRONECAN_ENABLED', 'Enable EFI DroneCAN', 0, 'EFI'), Feature('ICE', 'GENERATOR', 'HAL_GENERATOR_ENABLED', 'Enable Generator', 0, None), Feature('ICE', 'GENERATOR_RICHENPOWER', 'AP_GENERATOR_RICHENPOWER_ENABLED', 'Enable Richenpower Generator', 0, "GENERATOR"), # noqa diff --git a/Tools/scripts/extract_features.py b/Tools/scripts/extract_features.py index e0799c1429..cb261eb159 100755 --- a/Tools/scripts/extract_features.py +++ b/Tools/scripts/extract_features.py @@ -49,7 +49,7 @@ class ExtractFeatures(object): ('AP_AIS_ENABLED', 'AP_AIS::AP_AIS',), ('HAL_EFI_ENABLED', 'AP_EFI::AP_EFI',), - ('HAL_EFI_{type}_ENABLED', 'AP_EFI_(?P.*)::update',), + ('AP_EFI_{type}_ENABLED', 'AP_EFI_(?P.*)::update',), ('AP_TEMPERATURE_SENSOR_ENABLED', 'AP_TemperatureSensor::AP_TemperatureSensor',), ('AP_TEMPERATURE_SENSOR_{type}_ENABLED', 'AP_TemperatureSensor_(?P.*)::update',), @@ -120,8 +120,8 @@ class ExtractFeatures(object): ('AP_ICENGINE_ENABLED', 'AP_ICEngine::AP_ICEngine',), ('HAL_EFI_ENABLED', 'AP_RPM_EFI::AP_RPM_EFI',), - ('HAL_EFI_NWPWU_ENABLED', r'AP_EFI_NWPMU::update\b',), - ('HAL_EFI_CURRAWONG_ECU_ENABLED', r'AP_EFI_Currawong_ECU::update\b',), + ('AP_EFI_NWPWU_ENABLED', r'AP_EFI_NWPMU::update\b',), + ('AP_EFI_CURRAWONG_ECU_ENABLED', r'AP_EFI_Currawong_ECU::update\b',), ('HAL_GENERATOR_ENABLED', 'AP_Generator::AP_Generator',), ('AP_GENERATOR_{type}_ENABLED', r'AP_Generator_(?P.*)::update',),