Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove EKF2 from all builds #25567

Merged
merged 3 commits into from
Nov 26, 2023

Conversation

peterbarker
Copy link
Contributor

We're looking to remove EKF2 from the codebase.

This is a first step; we'll retain the ability to compile it in on the custom build server and OEM setups and the like for at least one stable version.

@@ -644,6 +644,10 @@ def configure_env(self, cfg, env):
AP_BARO_PROBE_EXTERNAL_I2C_BUSES = 1,
)

env.DEFINES.update(
'HAL_NAVEKF2_AVAILABLE', 1
Copy link
Collaborator

@Ryanf55 Ryanf55 Nov 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'HAL_NAVEKF2_AVAILABLE', 1
'HAL_NAVEKF2_AVAILABLE' = 1

Fixes the following:
https://github.com/ArduPilot/ardupilot/actions/runs/6917086287/job/18817856622?pr=25567#step:7:45

TypeError: update expected at most 1 argument, got 2

@muramura
Copy link
Contributor

Built with disable_ekf2.
Refer to the EKF2 file.
It is better not to reference the file completely.

@peterbarker peterbarker force-pushed the pr/ekf2-out-by-default branch 2 times, most recently from 8399eca to 0de0be8 Compare November 26, 2023 19:19
@peterbarker
Copy link
Contributor Author

Built with disable_ekf2. Refer to the EKF2 file. It is better not to reference the file completely.

I think you're trying to say that we're still looking at a lot of code in the NavEKF2 directory when we're compiling this code out - and that's probably right.

In this PR I'm really just trying to change the default compilation option, not make sweeping changes in code we're wanting to remove anyway :-)

Your observation would also be correct for NavEKF3, however.

just because we don't compile this in doesn't mean we shouldn't continue to test it
@peterbarker peterbarker force-pushed the pr/ekf2-out-by-default branch from 0de0be8 to b17942c Compare November 26, 2023 19:33
@peterbarker peterbarker merged commit 5f1f3e5 into ArduPilot:master Nov 26, 2023
87 checks passed
@peterbarker peterbarker deleted the pr/ekf2-out-by-default branch November 28, 2023 00:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants