search

bluzDK / bluzDK-firmware

Firmware for the bluz development kit
Other
15 stars 15 forks source link

Brought gateway_develop up to date with develop, fixing several bugs and allowing Timer:: to work again #17

Closed gruvin closed 8 years ago

gruvin commented 8 years ago

Well this one is a doozy Eric. And I know I'm stepping on your toes here ... but I might also be helping ... and of course the usual, "take it or leave it" policy applies. ;-)

You'll recall from my previous pull request (close that one now) that my Timer:: class, while it compiled fine, didn't actually run in the gateway_develop branch.

I had assumed that you had already merged develop into gateway_develop, since you said it was the new master, as such. Anyway, upon investigation, I found numerous bug fixes you had made in develop, which had not been merged into gateway_develop. So, I set about doing that, successfully resolving several conflicts along the way.

Thus, it is my belief that this pull request brings gateway_develop right up to date -- on the bluzDK side of things, at least. It certainly fixes all the problems I was facing with Timer:: and includes your sockets buffer overrun bug fix, etc.

I haven't done anything to affect the bluz-gw side of things, as far as I can tell. But I have not tested that, sorry.

Feel free to run with this to save yourself a bunch of time -- or not. Up to you. Either way, for now, if I may be so bold, this is my "master" v1.1.xxx pre-release -- because I find it to be the most functional and stable.

Of course, I have no idea how much work you have done locally, not yet pushed to bluzDK/gateway_develop. You could be way ahead of me. I just needed to figure out why on Earth I couldn't get Timer:: to work in this branch. Selfishly, I can now sleep more soundly!

Bryan.

gruvin commented 8 years ago

Well, it seems this is redundant now. Never to mind. Onwards and upwards! :-) Learning is so much fun!