search

dcs-bios / dcs-bios-arduino-library

Arduino Library to talk to DCS-BIOS
MIT License
61 stars 29 forks source link

Remove callbacks and move code out of primary protocol parsing #8

Closed Gadroc closed 9 years ago

Gadroc commented 9 years ago

Moved all output code to onFrameSync and moved onFrameSync over to end of frame so long executing updates happen during the 30ms between frames.

This resovles #4

jboecker commented 9 years ago

Can you rebase on my master branch? When I try to merge now, I end up with this: image Note that the "improve serial performance" and "move code to separate files" commits now appear twice in the history, once as part of the already merged individual pull requests and once as part of this new one.

When I rebase your branch before merging:

git checkout -b gadroc-rebased gadroc/master
git rebase master

git checkout -b merge-test master
git merge gadroc-rebased

I get this, which is a lot easier to read: image

I apologize for not avoiding this mess in the first place, I am new at this maintainer thing.

I think this could have been avoided by merging the first two pull requests with git, which would have done a fast-forward merge (the button on GitHub always merges with --no-ff).

Lesson learned: do merges offline with git so I can preview everything before pushing. That would have avoided the slightly confusing history that resulted from merging #6 and #7 two weeks ago and it did save me now from pushing the abomination in the first image.

Also, sorry for not reacting for two weeks -- real life and all that...

Gadroc commented 9 years ago

No problem. It very well be my issue. I'll get it cleaned up here sometime today.

Gadroc commented 9 years ago

give it a go now