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

Fied wing updates #304

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Fied wing updates #304

wants to merge 19 commits into from

Conversation

EmilsPa
Copy link
Contributor

@EmilsPa EmilsPa commented Jan 1, 2016

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.

EmilsPa added 2 commits December 3, 2015 20:01
Apa, Cruise Mode and fix for Vector trust.
Moved Motor code
@ghost
Copy link

ghost commented Jan 1, 2016

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

@ghost
Copy link

ghost commented Jan 1, 2016

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

@ghost
Copy link

ghost commented Jan 1, 2016

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

@ghost
Copy link

ghost commented Jan 1, 2016

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

@ghost
Copy link

ghost commented Jan 1, 2016

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

@ghost
Copy link

ghost commented Jan 1, 2016

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

@ghost
Copy link

ghost commented Jan 1, 2016

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

@ghost
Copy link

ghost commented Jan 1, 2016

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

@trollcop
Copy link
Member

trollcop commented Jan 2, 2016

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" [email protected]
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
#304 (comment).

@@ -40,6 +43,19 @@ void fw_nav_reset(void)
}
}

void fw_FlyTo(void) // PatrikE CruiseMode version
{
#define GEO_SKALEFACT 89.832f // Scale to match meters
Copy link
Member

Choose a reason for hiding this comment

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

#defines do not belong inside functions.
move it outside.

@ghost
Copy link

ghost commented Jan 2, 2016

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

@ghost
Copy link

ghost commented Jan 2, 2016

Building this PR Failed :/

@ghost
Copy link

ghost commented Jan 2, 2016

Successfully built this PR!

@trollcop
Copy link
Member

trollcop commented Jan 2, 2016

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

int32_t holdHeading = GPS_ground_course / 10;
if (holdHeading > 180)
holdHeading -= 360;
scaler = ( GEO_SKALEFACT / GPS_scaleLonDown) * cfg.fw_cruise_distance;
Copy link
Member

Choose a reason for hiding this comment

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

spacing
scaler = (GEO_SKAL... etc

@ghost
Copy link

ghost commented Jan 2, 2016

Successfully built this PR!

@ghost
Copy link

ghost commented Jan 2, 2016

Successfully built this PR!

@ghost
Copy link

ghost commented Jan 2, 2016

Successfully built this PR!

@trollcop
Copy link
Member

trollcop commented Jan 3, 2016

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
Copy link
Member

trollcop commented Jan 3, 2016

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
Copy link
Member

trollcop commented Jan 3, 2016

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

@trollcop
Copy link
Member

trollcop commented Jan 5, 2016

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

@ghost
Copy link

ghost commented Jan 5, 2016

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

@ghost
Copy link

ghost commented Jan 5, 2016

Building this PR Failed :/

@ghost
Copy link

ghost commented Jan 5, 2016

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

@ghost
Copy link

ghost commented Jan 5, 2016

Building this PR Failed :/

@ghost
Copy link

ghost commented Jan 5, 2016

Successfully built this PR!

@schugabe
Copy link
Contributor

schugabe commented Jan 6, 2016

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

@trollcop
Copy link
Member

trollcop commented Jan 6, 2016

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 [email protected] 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/baseflight@67f0c86
schugabe@67f0c86


Reply to this email directly or view it on GitHub
#304 (comment).

@EmilsPa
Copy link
Contributor Author

EmilsPa commented Jan 6, 2016

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

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

@trollcop
Copy link
Member

trollcop commented Jan 6, 2016

@schugabe, you heard the man :)

On Wed, Jan 6, 2016 at 9:47 PM, EmilsPa [email protected] 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
#304 (comment).

@EmilsPa
Copy link
Contributor Author

EmilsPa commented Jan 6, 2016

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

@readerror67
Copy link
Contributor

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.

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.

4 participants