Adding support for external Magnetometer on MATEKF722

[bencrundwell]

No description provided.

[bencrundwell]

"Failed to connect to github.com port 443: Connection timed out" sounds like an internet connectivity issue rather than a bug. How can I kick Travis off to rebuild/test this branch?

[jflyper]

You may be able to restart a build if you link your Travis account to that of Github. (I'm not sure. May need a special permission like member.)

[jflyper]

If you can't do it, I'll kick it.

[bencrundwell]

I don't see any betaflight/betaflight repos in my Travis account, so I'm guessing I don't have enough permissions. If you could kick it it would be much appreciated. It feels ugly re committing with just a space added somewhere to the source!

[mikeller]

This has to be USE_MAG. Please test your proposed changes before you open a pull request.

[bencrundwell]

Sorry, I'm not sure how that happened. I had tested my changes and verified it was all working, but somehow in preparing the patch i must have accidentally selected and deleted the USE_ part. Sorry for the mistake

[mikeller]

All good, mistakes happen.

Now, can you please rebase and squash this into one commit, with a indicative commit message please? 'Update target.h' isn't very helpful as a commit message once it's merged into master.

[mikeller]

@bencrundwell: Looks like the rebase did not quite work as intended. To rebase / squash the commits in your branch / pull request into one with git on the command line you proceed as follows:

• in your branch, do a git rebase -i master;
• in the editor that opens, select pick for the first of your commits, squash for the rest of your commits, save & close (make sure the commit that you've selected pick for has got a message indicative of what the pull request is doing; you can edit the message if needed);
• push your changes with `git push --force-with-lease;
• done. :-)

[bencrundwell]

Sorry, I messed up :(

[mikeller]

Nothing lost. Use the instructions above for the rebase, and select drop for all the commits that aren't yours.

[bencrundwell]

@mikeller Is that better? It appears to be a single commit now, but there is a Merge afterwards that I didn't intend to create

[mikeller]

@bencrundwell: There's still a lot of commits in there that are not yours. Try git rebase -i master again, and use d (drop) on all of the commits that aren't yours.

[bencrundwell]

I don't quite understand whats wrong. My git client shows there are now only my changes between betaflight/betaflight and bencrundwell/betaflight so it should merge in neatly. But the pull request suggests there are +10,002 new lines from 207 files

[bencrundwell]

I've cloned a fresh repo and tried the git rebase -i master, but its not coming up with anything, just noop. I can try rebasing to where I originally branched away, but I don't know if that will make it worse!

[mikeller]

Ok, getting there. Now you've got some of your changes twice. And it still needs to be squashed. :-D

[bencrundwell]

Sorry for all the mess, Its finally all rebased correctly! Thanks for your help @mikeller

[mikeller]

You're welcome, @bencrundwell. git / GitHub have a sometimes steep learning curve, happy to help you get started. Thank you very much for your contribution!