Added mag and dataflash logging support to AnyLeaf H7

[David-OConnor]

#26999

[andyp1per]

Now you need to modify the commit message to start with "AP_HAL_ChibiOS: "

git rebase -i HEAD~

The use "r" for reword, edit the message and finish

[David-OConnor]

Hmm... Just tried that and... the results were not as expected. To be explicit, in the text editor that popped up, I prepended the commit text on the top line with AP_HAL_ChibiOS: , and replaced pick with r. Now we have 3 commits.

[David-OConnor]

Now the squash process is passing, but adds 2 commits each time. (Where you replace pick with squash except for the top line, in the opened text editor)

[David-OConnor]

I'm going to pause on troubleshooting, as each thing I try increases the commit log size.

I am running this:

git rebase -i HEAD~x where x = the number of commits in the PR.

Then a text editor pops up. I replace pick with s in the list except for the top one. The editor closes; another pops up; I close that as am not sure what to do with it. I then try to push; it requires me to pull first. I pull, I push, and we have more commits, instead of fewer!

[David-OConnor]

Now I get this:

PS C:\Users\the_a\Desktop\t7\ardupilot> git rebase -i HEAD~7

Auto-merging ArduCopter/compassmot.cpp
CONFLICT (content): Merge conflict in ArduCopter/compassmot.cpp
error: could not apply d198c3e13d... Copter: emit system time during compassmot on SITL
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply d198c3e13d... Copter: emit system time during compassmot on SITL
PS C:\Users\the_a\Desktop\t7\ardupilot>

Somehow this file is still conflicting with unrelated code when I go to squash the commits.

[andyp1per]

I've fixed it for you

[David-OConnor]

Thank you!

[peterbarker]

Merged it, thanks!