From 0e9236a116c992accc43fa0948c8eb07bbe26aea Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 24 May 2022 11:17:10 +1000 Subject: [PATCH] Tools: build_options.py: fix double-definition of AP_BARO_MSP_ENABLED Fixes redefinition on custom build server --- Tools/scripts/build_options.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Tools/scripts/build_options.py b/Tools/scripts/build_options.py index 0e6c6075f8..a2e51a71e1 100644 --- a/Tools/scripts/build_options.py +++ b/Tools/scripts/build_options.py @@ -59,7 +59,6 @@ BUILD_OPTIONS = [ Feature('MSP', 'MSP_SENSORS', 'HAL_MSP_SENSORS_ENABLED', 'Enable MSP Sensors', 0, 'MSP_GPS,MSP_BARO,MSP_COMPASS,MSP_AIRSPEED,MSP,MSP_OPTICALFLOW,MSP_RANGEFINDER,OSD'), # NOQA: E501 Feature('MSP', 'MSP_GPS', 'HAL_MSP_GPS_ENABLED', 'Enable MSP GPS', 0, 'MSP,OSD'), Feature('MSP', 'MSP_COMPASS', 'HAL_MSP_COMPASS_ENABLED', 'Enable MSP Compass', 0, 'MSP,OSD'), - Feature('MSP', 'MSP_BARO', 'AP_BARO_MSP_ENABLED', 'Enable MSP Baro', 0, 'MSP,OSD'), Feature('MSP', 'MSP_OPTICALFLOW', 'HAL_MSP_OPTICALFLOW_ENABLED', 'Enable MSP OpticalFlow', 0, 'MSP,OSD'), # also OPTFLOW dep # NOQA: E501 Feature('MSP', 'MSP_RANGEFINDER', 'HAL_MSP_RANGEFINDER_ENABLED', 'Enable MSP Rangefinder', 0, 'MSP,OSD,RANGEFINDERS'), Feature('MSP', 'MSP_DISPLAYPORT', 'HAL_WITH_MSP_DISPLAYPORT', 'Enable MSP DisplayPort OSD (aka CANVAS MODE)', 0, 'MSP,OSD'), # NOQA: E501