Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf: invert ekf2-disable command-line option

This commit is contained in:
Peter Barker 2023-11-17 17:07:30 +11:00 committed by Peter Barker
parent f40250c073
commit aa9bbd0fcb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/ardupilotwaf/boards.py
View File

@ -462,8 +462,8 @@ class Board:
# We always want to use PRI format macros # We always want to use PRI format macros
cfg.define('__STDC_FORMAT_MACROS', 1) cfg.define('__STDC_FORMAT_MACROS', 1)
if cfg.options.disable_ekf2: if cfg.options.enable_ekf2:
env.CXXFLAGS += ['-DHAL_NAVEKF2_AVAILABLE=0'] env.CXXFLAGS += ['-DHAL_NAVEKF2_AVAILABLE=1']
if cfg.options.disable_ekf3: if cfg.options.disable_ekf3:
env.CXXFLAGS += ['-DHAL_NAVEKF3_AVAILABLE=0'] env.CXXFLAGS += ['-DHAL_NAVEKF3_AVAILABLE=0']

6
Tools/autotest/sim_vehicle.py
View File

@ -378,8 +378,8 @@ def do_build(opts, frame_options):
if opts.math_check_indexes: if opts.math_check_indexes:
cmd_configure.append("--enable-math-check-indexes") cmd_configure.append("--enable-math-check-indexes")
if opts.disable_ekf2: if opts.enable_ekf2:
cmd_configure.append("--disable-ekf2") cmd_configure.append("--enable-ekf2")
if opts.disable_ekf3: if opts.disable_ekf3:
cmd_configure.append("--disable-ekf3") cmd_configure.append("--disable-ekf3")
@ -1295,7 +1295,7 @@ group_sim.add_option("--flash-storage",
group_sim.add_option("--fram-storage", group_sim.add_option("--fram-storage",
action='store_true', action='store_true',
help="use fram storage emulation") help="use fram storage emulation")
group_sim.add_option("--disable-ekf2", group_sim.add_option("--enable-ekf2",
action='store_true', action='store_true',
help="disable EKF2 in build") help="disable EKF2 in build")
group_sim.add_option("--disable-ekf3", group_sim.add_option("--disable-ekf3",

4
wscript
View File

@ -360,10 +360,10 @@ configuration in order to save typing.
default=False, default=False,
help='Use flash storage emulation.') help='Use flash storage emulation.')
g.add_option('--disable-ekf2', g.add_option('--enable-ekf2',
action='store_true', action='store_true',
default=False, default=False,
help='Configure without EKF2.') help='Configure with EKF2.')
g.add_option('--disable-ekf3', g.add_option('--disable-ekf3',
action='store_true', action='store_true',