multiwii / baseflight

32 bit fork of the MultiWii RC flight controller firmware
496 stars 354 forks source link

Fied wing updates #304

Open EmilsPa opened 8 years ago

EmilsPa commented 8 years ago

New GPS mode for Fixed Wing. Cruise Mode. Modified TPA to use Angle for attenuation. Fixes for Vector trust on Twin Engine planes. Changed RollComp to integer float don't work well with Gui.

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_338.html

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_339.html

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_340.html

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_341.html

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_342.html

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_343.html

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_344.html

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_345.html

trollcop commented 8 years ago

please don't commit hex files with your patches. GCC built stuff can't be used On Jan 2, 2016 6:51 AM, "baseflight-jenkins" notifications@github.com wrote:

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_345.html

— Reply to this email directly or view it on GitHub https://github.com/multiwii/baseflight/pull/304#issuecomment-168340285.

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_347.html

ghost commented 8 years ago

Building this PR Failed :/

ghost commented 8 years ago

Successfully built this PR!

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_349.html

ghost commented 8 years ago

Building this PR Failed :/

ghost commented 8 years ago

Successfully built this PR!

trollcop commented 8 years ago

You're still trying to commit baseflight.hex. Please remove it from the commits.

ghost commented 8 years ago

Successfully built this PR!

ghost commented 8 years ago

Successfully built this PR!

ghost commented 8 years ago

Successfully built this PR!

trollcop commented 8 years ago

OK, as long as this stuff builds I can let this in for now. Can you open a new PR just to condense all these changes into a single commit and make sure hex file isn't included (I'm not sure if your latest commit will actually delete my hex or not, so I'd rather not risk it).

Once the new one is merged I'll close this one.

trollcop commented 8 years ago

Actually, maybe better do this;

https://github.com/ginatrapani/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit

To squash them all. If baseflight.hex is unaffected after squash then this is OK to merge.

trollcop commented 8 years ago

Also, please rename trust -> thrust in the code, there's no need to pollute with incorrect variable names.

trollcop commented 8 years ago

Hey, let's get these last 2 things fixed so I can merge this?

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_354.html

ghost commented 8 years ago

Building this PR Failed :/

ghost commented 8 years ago

Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_355.html

ghost commented 8 years ago

Building this PR Failed :/

ghost commented 8 years ago

Successfully built this PR!

schugabe commented 8 years ago

In one comment trust was not replaced (in mw.h), and I saw some indent errors (in mw.h and mixer.c).

I have squashed the commits, removed the changes to the hex file and rebased it on the current master. If needed I can submit a new pull request (or list the git commands to repeat the steps)

https://github.com/schugabe/baseflight/commit/67f0c86bc35b1fabe9ca4bcd5c1b042b9ff4ddb6

trollcop commented 8 years ago

Thanks for cleanup.

Up to you, @EmilsPa is probably sick of these emails at this point. Let's see what he says and if not, you can open a new one.

On Wed, Jan 6, 2016 at 7:48 PM, Johannes notifications@github.com wrote:

In one comment trust was not replaced (in mw.h), and I saw some indent errors (in mw.h and mixer.c).

I have squashed the commits, removed the changes to the hex file and rebased it on the current master. If needed I can submit a new pull request (or list the git commands to repeat the steps)

schugabe@67f0c86 https://github.com/schugabe/baseflight/commit/67f0c86bc35b1fabe9ca4bcd5c1b042b9ff4ddb6

— Reply to this email directly or view it on GitHub https://github.com/multiwii/baseflight/pull/304#issuecomment-169295645.

EmilsPa commented 8 years ago

Fix the merge please. Git is a nightmare for me!

Started to look at cleaning up the TPA. But that's for later..

trollcop commented 8 years ago

@schugabe, you heard the man :)

On Wed, Jan 6, 2016 at 9:47 PM, EmilsPa notifications@github.com wrote:

Fix the merge please. Git is a nightmare for me!

Started to look at cleaning up the TPA. But that's for later..

— Reply to this email directly or view it on GitHub https://github.com/multiwii/baseflight/pull/304#issuecomment-169316478.

EmilsPa commented 8 years ago

Is there some way to do the Jenkins check before committing?

readerror67 commented 8 years ago

Biggest thing is the style, you can install astyle and run this: astyle --style=kr --indent=spaces=4 --pad-header --pad-oper --align-pointer=name --align-reference=none --convert-tabs --indent-switches --min-conditional-indent=1 --preserve-date --suffix=none --mode=c src/.

Should fix many issues.