Skip to content

Commit

Permalink
waf: invert ekf2-disable command-line option
Browse files Browse the repository at this point in the history
  • Loading branch information
peterbarker committed Nov 19, 2023
1 parent 58424ae commit 619a29a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Tools/ardupilotwaf/boards.py
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ def configure_env(self, cfg, env):
# We always want to use PRI format macros
cfg.define('__STDC_FORMAT_MACROS', 1)

if cfg.options.disable_ekf2:
env.CXXFLAGS += ['-DHAL_NAVEKF2_AVAILABLE=0']
if cfg.options.enable_ekf2:
env.CXXFLAGS += ['-DHAL_NAVEKF2_AVAILABLE=1']

if cfg.options.disable_ekf3:
env.CXXFLAGS += ['-DHAL_NAVEKF3_AVAILABLE=0']
Expand Down
6 changes: 3 additions & 3 deletions Tools/autotest/sim_vehicle.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,8 @@ def do_build(opts, frame_options):
if opts.math_check_indexes:
cmd_configure.append("--enable-math-check-indexes")

if opts.disable_ekf2:
cmd_configure.append("--disable-ekf2")
if opts.enable_ekf2:
cmd_configure.append("--enable-ekf2")

if opts.disable_ekf3:
cmd_configure.append("--disable-ekf3")
Expand Down Expand Up @@ -1299,7 +1299,7 @@ def generate_frame_help():
group_sim.add_option("--fram-storage",
action='store_true',
help="use fram storage emulation")
group_sim.add_option("--disable-ekf2",
group_sim.add_option("--enable-ekf2",
action='store_true',
help="disable EKF2 in build")
group_sim.add_option("--disable-ekf3",
Expand Down
4 changes: 2 additions & 2 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,10 @@ configuration in order to save typing.
default=False,
help='Use flash storage emulation.')

g.add_option('--disable-ekf2',
g.add_option('--enable-ekf2',
action='store_true',
default=False,
help='Configure without EKF2.')
help='Configure with EKF2.')

g.add_option('--disable-ekf3',
action='store_true',
Expand Down

0 comments on commit 619a29a

Please sign in to comment.