Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-05 07:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: move AC_Avoidance defines into libraries

Browse Source
This commit is contained in:
Peter Barker 2024-03-09 13:35:26 +11:00 committed by Peter Barker
parent ef82d8b8cc
commit f6e7b9de5b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/autotest/test_build_options.py
View File

@ -182,8 +182,6 @@ class TestBuildOptions(object):
# or all vehicles: # or all vehicles:
feature_define_whitelist = set([ feature_define_whitelist = set([
'AP_RANGEFINDER_ENABLED', # only at vehicle level ATM 'AP_RANGEFINDER_ENABLED', # only at vehicle level ATM
'AC_AVOID_ENABLED', # Rover doesn't obey this
'AC_OAPATHPLANNER_ENABLED', # Rover doesn't obey this
'BEACON_ENABLED', # Rover doesn't obey this (should also be AP_BEACON_ENABLED) 'BEACON_ENABLED', # Rover doesn't obey this (should also be AP_BEACON_ENABLED)
'WINCH_ENABLED', # Copter doesn't use this; should use AP_WINCH_ENABLED 'WINCH_ENABLED', # Copter doesn't use this; should use AP_WINCH_ENABLED
]) ])

4
Tools/scripts/build_options.py
View File

@ -42,8 +42,8 @@ BUILD_OPTIONS = [
Feature('Safety', 'PARACHUTE', 'HAL_PARACHUTE_ENABLED', 'Enable Parachute', 0, None), Feature('Safety', 'PARACHUTE', 'HAL_PARACHUTE_ENABLED', 'Enable Parachute', 0, None),
Feature('Safety', 'FENCE', 'AP_FENCE_ENABLED', 'Enable Geofence', 2, None), Feature('Safety', 'FENCE', 'AP_FENCE_ENABLED', 'Enable Geofence', 2, None),
Feature('Safety', 'RALLY', 'HAL_RALLY_ENABLED', 'Enable Rally Points', 0, None), # noqa Feature('Safety', 'RALLY', 'HAL_RALLY_ENABLED', 'Enable Rally Points', 0, None), # noqa
Feature('Safety', 'AC_AVOID', 'AC_AVOID_ENABLED', 'Enable Avoidance', 0, 'FENCE'), Feature('Safety', 'AC_AVOID', 'AP_AVOIDANCE_ENABLED', 'Enable Avoidance', 0, 'FENCE'),
Feature('Safety', 'AC_OAPATHPLANNER', 'AC_OAPATHPLANNER_ENABLED', 'Enable Object Avoidance Path Planner', 0, 'FENCE'), Feature('Safety', 'AC_OAPATHPLANNER', 'AP_OAPATHPLANNER_ENABLED', 'Enable Object Avoidance Path Planner', 0, 'FENCE'),
Feature('Battery', 'BATTERY_FUELFLOW', 'AP_BATTERY_FUELFLOW_ENABLED', 'Enable Fuel Flow BatteryMonitor', 0, None), Feature('Battery', 'BATTERY_FUELFLOW', 'AP_BATTERY_FUELFLOW_ENABLED', 'Enable Fuel Flow BatteryMonitor', 0, None),
Feature('Battery', 'BATTERY_FUELLEVEL_PWM', 'AP_BATTERY_FUELLEVEL_PWM_ENABLED', 'Enable Flow Level PWM BatteryMonitor', 0, None), # noqa: E501 Feature('Battery', 'BATTERY_FUELLEVEL_PWM', 'AP_BATTERY_FUELLEVEL_PWM_ENABLED', 'Enable Flow Level PWM BatteryMonitor', 0, None), # noqa: E501

4
Tools/scripts/extract_features.py
View File

@ -136,8 +136,8 @@ class ExtractFeatures(object):
('HAL_PARACHUTE_ENABLED', 'AP_Parachute::update',), ('HAL_PARACHUTE_ENABLED', 'AP_Parachute::update',),
('AP_FENCE_ENABLED', r'AC_Fence::check\b',), ('AP_FENCE_ENABLED', r'AC_Fence::check\b',),
('HAL_RALLY_ENABLED', r'AP_Rally::get_rally_max\b',), ('HAL_RALLY_ENABLED', r'AP_Rally::get_rally_max\b',),
('AC_AVOID_ENABLED', 'AC_Avoid::AC_Avoid',), ('AP_AVOIDANCE_ENABLED', 'AC_Avoid::AC_Avoid',),
('AC_OAPATHPLANNER_ENABLED', 'AP_OAPathPlanner::AP_OAPathPlanner',), ('AP_OAPATHPLANNER_ENABLED', 'AP_OAPathPlanner::AP_OAPathPlanner',),
('AC_PAYLOAD_PLACE_ENABLED', 'PayloadPlace::start_descent'), ('AC_PAYLOAD_PLACE_ENABLED', 'PayloadPlace::start_descent'),
('AP_MISSION_NAV_PAYLOAD_PLACE_ENABLED', ExtractFeatures.FindString('PayloadPlace')), ('AP_MISSION_NAV_PAYLOAD_PLACE_ENABLED', ExtractFeatures.FindString('PayloadPlace')),
('AP_ICENGINE_ENABLED', 'AP_ICEngine::AP_ICEngine',), ('AP_ICENGINE_ENABLED', 'AP_ICEngine::AP_ICEngine',),