Skip to content

ArduinoOTA library change #2013

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

Merged
merged 15 commits into from
Jun 1, 2016
Merged

ArduinoOTA library change #2013

merged 15 commits into from
Jun 1, 2016

Conversation

NullMedia
Copy link
Contributor

Modified callbacks to allow lambda with capture list.

@igrr
Copy link
Member

igrr commented May 10, 2016

Thanks for the pull request! Could you please squash and rebase all the changes?

@NullMedia
Copy link
Contributor Author

Oh heck... I'd love to... Um, can I do that on the website? (New to this!)

@igrr
Copy link
Member

igrr commented May 10, 2016

I think you have to use git client to do this, command line or GUI.

@igrr
Copy link
Member

igrr commented May 10, 2016

Also please check the errors in examples:
https://travis-ci.org/esp8266/Arduino/builds/129147394#L770

@NullMedia
Copy link
Contributor Author

Ok, working on it!

@codecov-io
Copy link

codecov-io commented May 10, 2016

Current coverage is 22.64%

Merging #2013 into master will not change coverage

@@             master      #2013   diff @@
==========================================
  Files            19         19          
  Lines          3627       3627          
  Methods         326        326          
  Messages          0          0          
  Branches       1195       1195          
==========================================
  Hits            821        821          
  Misses         2507       2507          
  Partials        299        299          

Powered by Codecov. Last updated by 43fb139...2f0ece7

@NullMedia
Copy link
Contributor Author

Ok, did I do it right? (sorry!)

@igrr
Copy link
Member

igrr commented May 11, 2016

Not exactly, see this explanation :) If you don't feel like using the command line client, don't bother, I'll squash that myself.
Could you do one more thing please — move definitions of THandlerFunction and other callback function types into the body of ArduinoOTAClass? THandlerFunction is a pretty common name and it would be good not to put it into global namespace. Thanks.

@NullMedia
Copy link
Contributor Author

Made changes, and think I've merged them now... any further attempts at rebasing just lead to errors... (error: could not apply xxxx). Unfortunately never used git before, learning lots today! Thanks.

@igrr igrr merged commit d60d744 into esp8266:master Jun 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants