search

lkaino / Triflight

Triflight flight controller firmware for tricopters
http://rcexplorer.se
GNU General Public License v3.0
50 stars 19 forks source link

Merge changes back into Cleanflight #30

Open hydra opened 8 years ago

hydra commented 8 years ago

Hi guys!

Looks like you guys are doing some good work here. Cleanflight v1.13.0-RC1 was created yesterday and is a stable codebase from which to further develop your changes.

Could you start creating pull requests so that we can get the TriFlight changes merged back into Cleanflight if you think they are ready?

lkaino commented 8 years ago

Hey Dominic and thanks for showing interest!

I read your comment about 1.13 and will definitely do a rebase soon, need to familiarize with the new configuration architecture.

Some of the Triflight features are proven to work and for those I could start creating pull-requests. But we only just started on a unit test project and the documentation is non-existent so there's still work to do before they are good enough for CF.

The next version will contain some bigger changes, but I wish after that we can stabilize the features and get them back to CF.

Bengt-M commented 8 years ago

Totally agree and would be glad to assist.

Maybe a two-step approach could be in place? To first do one merge to pave the road. Fixing all dependencies and side things but without actually changing the function to the Triflight magic. Can remove a lot of small merge conflicts and make next re-basing and merge more easy.

oxivanisher commented 8 years ago

I would so love you guys if you can merge the forks together! Opensource development as its finest! Keep up the great work @lkaino and @hydra. :+1:

cmanley commented 7 years ago

Please include the improved GPS features of the inav port too :) ...eventually (I know it's a lot of work)

hydra commented 7 years ago

@lkaino merging is quite trival. put your new settings (if any) in one or more structures, add a PG ID (into parameter_group_id.h) use PG_DECLARE in a header file, for the structures. use PG_REGISTER in a C file. Then change any usages from master_config.somestruct.value or profile_master.somestruct.value to someStruct().value.

Look at existing code for working examples.

oxivanisher commented 7 years ago

Is there a status update on this? Really looking forward to use this with cleanflight again.

kangsterizer commented 7 years ago

I think the author will need to make PRs of separate pieces of code. I just did a local merge to inav and theres a good bit of hard coded values specifically for the author's copter and boards.

Other than than its not all that much work though I'm pretty much unaware of which features should be considered stable/mergeable or not ;-) (I'm sure the author knows this like 1000x better than me, so just hoping he reappears ;P)

ck3mp3r commented 7 years ago

@lkaino what is the status on merging this back into cleanflight? I've seen mention in the README rebasing onto iNav and/or betaflight?

lkaino commented 7 years ago

Triflight is now based on betaflight (cleanflight also). I cleaned out some dirty functionality on the way. It's not far from being ready to merge. Would like to get following done before that: