-
Notifications
You must be signed in to change notification settings - Fork 356
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
base: master
Are you sure you want to change the base?
Fied wing updates #304
Conversation
Apa, Cruise Mode and fix for Vector trust.
Moved Motor code
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_338.html |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_339.html |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_340.html |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_341.html |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_342.html |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_343.html |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_344.html |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_345.html |
please don't commit hex files with your patches.
|
@@ -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 |
There was a problem hiding this comment.
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.
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_347.html |
Building this PR Failed :/ |
Successfully built this PR! |
You're still trying to commit baseflight.hex. |
int32_t holdHeading = GPS_ground_course / 10; | ||
if (holdHeading > 180) | ||
holdHeading -= 360; | ||
scaler = ( GEO_SKALEFACT / GPS_scaleLonDown) * cfg.fw_cruise_distance; |
There was a problem hiding this comment.
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
Successfully built this PR! |
Successfully built this PR! |
Successfully built this PR! |
OK, as long as this stuff builds I can let this in for now. Once the new one is merged I'll close this one. |
Actually, maybe better do this; To squash them all. |
Also, please rename trust -> thrust in the code, there's no need to pollute with incorrect variable names. |
Hey, let's get these last 2 things fixed so I can merge this? |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_354.html |
Building this PR Failed :/ |
Your changes violate the baseflight coding style guidelines: http://dev.baseflight.net:8080/job/Baseflight%20Pull%20Requests/ws/git_diff_355.html |
Building this PR Failed :/ |
Successfully built this PR! |
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) |
Thanks for cleanup. Up to you, @EmilsPa is probably sick of these emails at this point. On Wed, Jan 6, 2016 at 7:48 PM, Johannes [email protected] wrote:
|
Fix the merge please. Started to look at cleaning up the TPA. |
@schugabe, you heard the man :) On Wed, Jan 6, 2016 at 9:47 PM, EmilsPa [email protected] wrote:
|
Is there some way to do the Jenkins check before committing? |
Biggest thing is the style, you can install astyle and run this: Should fix many issues. |
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.