From 3c825bdffc8d0a819051584e0c63f66ff8040eee Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 19 Jan 2021 12:53:39 +1100 Subject: [PATCH] waf: make AP_NavEKF3_core.h a vehicle dependent include --- Tools/ardupilotwaf/ap_library.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Tools/ardupilotwaf/ap_library.py b/Tools/ardupilotwaf/ap_library.py index 5bcebb84e4..bc1af08561 100644 --- a/Tools/ardupilotwaf/ap_library.py +++ b/Tools/ardupilotwaf/ap_library.py @@ -51,8 +51,10 @@ def _vehicle_index(vehicle): _vehicle_indexes[vehicle] = len(_vehicle_indexes) + 1 return _vehicle_indexes[vehicle] -_vehicle_macros = ('SKETCHNAME', 'SKETCH', 'APM_BUILD_DIRECTORY', - 'APM_BUILD_TYPE') +# note that AP_NavEKF3_core.h is needed for AP_NavEKF3_feature.h +_vehicle_macros = ['SKETCHNAME', 'SKETCH', 'APM_BUILD_DIRECTORY', + 'APM_BUILD_TYPE', + 'AP_NavEKF3_core.h'] _macros_re = re.compile(r'\b(%s)\b' % '|'.join(_vehicle_macros)) def _remove_comments(s): @@ -159,6 +161,7 @@ class ap_library_check_headers(Task.Task): 'libraries/AP_Camera/AP_RunCam.h', 'libraries/AP_Common/AP_FWVersionDefine.h', 'libraries/AP_Scripting/lua_generated_bindings.h', + 'libraries/AP_NavEKF3/AP_NavEKF3_feature.h', ) whitelist = tuple(os.path.join(*p.split('/')) for p in whitelist)