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

Add CLRACINGF4AIRV3 to CLRACINGF4AIR target #3239

Merged
merged 1 commit into from Jun 26, 2018

Conversation

Projects
None yet
3 participants
@bnn1044
Copy link
Contributor

commented May 19, 2018

add CLRACINGF4AIR V3 target.

@digitalentity

This comment has been minimized.

Copy link
Member

commented May 30, 2018

@bnn1044 is this ready?

@bnn1044

This comment has been minimized.

Copy link
Contributor Author

commented May 31, 2018

Yes. Test on the bench.

@digitalentity digitalentity changed the base branch from master to development May 31, 2018

@digitalentity digitalentity added this to the 2.0 milestone May 31, 2018

@digitalentity

This comment has been minimized.

Copy link
Member

commented May 31, 2018

@bnn1044 can you please rebase against development branch?

@bnn1044 bnn1044 force-pushed the bnn1044:CLRACINGF4AIRV3 branch from 9cd981c to fc9ab94 May 31, 2018

@bnn1044

This comment has been minimized.

Copy link
Contributor Author

commented May 31, 2018

@digitalentity Rebase done

@digitalentity

This comment has been minimized.

Copy link
Member

commented May 31, 2018

@bnn1044 there are numerous conflicts. Please fix.

@bnn1044 bnn1044 force-pushed the bnn1044:CLRACINGF4AIRV3 branch 2 times, most recently from 1a865ff to e14b7dd May 31, 2018

docs/Cli.md Outdated
@@ -341,6 +341,8 @@ Re-apply any new defaults as desired.
| yaw_deadband | 5 | These are values (in us) by how much RC input can be different before it's considered valid. For transmitters with jitter on outputs, this value can be increased. Defaults are zero, but can be increased up to 10 or so if rc inputs twitch while idle. |
| throttle_tilt_comp_str | 0 | Can be used in ANGLE and HORIZON mode and will automatically boost throttle when banking. Setting is in percentage, 0=disabled. |
| flaperon_throw_offset | 200 | Defines throw range in us for both ailerons that will be passed to servo mixer via input source 14 (`FEATURE FLAPS`) when FLAPERON mode is activated. |
| gimbal_mode | NORMAL | When feature SERVO_TILT is enabled, this can be either NORMAL or MIXTILT |
>>>>>>> fc9ab94... add CLRACINGF4AIRV3 TARGET

This comment has been minimized.

Copy link
@fiam

fiam May 31, 2018

Member

There are conflict markers merged. Also, it looks like this touches a lot of places that it shouldn't.

This comment has been minimized.

Copy link
@bnn1044

bnn1044 May 31, 2018

Author Contributor

Hmm. Look like the rebase to development I messed up. Will update later. Thanks.

@bnn1044 bnn1044 force-pushed the bnn1044:CLRACINGF4AIRV3 branch from e14b7dd to 110d7e2 May 31, 2018

@digitalentity
Copy link
Member

left a comment

Please remove stale ST CDC middleware files

@@ -0,0 +1,929 @@
/**

This comment has been minimized.

Copy link
@digitalentity

digitalentity Jun 15, 2018

Member

Why this file is here?

@@ -0,0 +1,332 @@
/*

This comment has been minimized.

Copy link
@digitalentity

digitalentity Jun 15, 2018

Member

Same applies for this file - it doesn't belog here

This comment has been minimized.

Copy link
@bnn1044

bnn1044 Jun 19, 2018

Author Contributor

OK. I use the development as base.
I don't know why it is there.

@bnn1044 bnn1044 force-pushed the bnn1044:CLRACINGF4AIRV3 branch from 110d7e2 to 559a096 Jun 19, 2018

@bnn1044 bnn1044 force-pushed the bnn1044:CLRACINGF4AIRV3 branch from 559a096 to 44165a6 Jun 20, 2018

@fiam

This comment has been minimized.

Copy link
Member

commented Jun 20, 2018

This seems fixed now.

Problems pointed in this review are now fixed.

@fiam fiam merged commit 5db1e1a into iNavFlight:development Jun 26, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.