Skip to content

Conversation

vbextreme
Copy link
Contributor

fix issues #4320 delay/yield, when the yield function takes more than a millisecond the delay fails.
Only for avr.

@matthijskooijman
Copy link
Collaborator

Did you figure out the rebase? Or did you just start from scratch? :-)

Anyway, there's still two issues unresolved:

  • You have not yet improved the commit message
  • The indentation now uses, AFAICS, 8 spaces, while the original uses tabs. This means that a bunch of lines are marked as changed now, while they didn't actually change, and the indentation is no longer consistent in this file.

@vbextreme vbextreme force-pushed the master branch 4 times, most recently from 5725f07 to af898c3 Compare December 27, 2015 10:14
@vbextreme
Copy link
Contributor Author

ok?

@matthijskooijman
Copy link
Collaborator

The diff looks perfect now, though the commit message shows the same message three times? I guess just the initial line might be sufficient here, combined with the diff it should be clear what the problem was and how it is fixed.

@vbextreme
Copy link
Contributor Author

I fight with "rebase" but finally I did it.

@matthijskooijman
Copy link
Collaborator

Cool, looks good. @cmaglie, merge this?

@Testato
Copy link

Testato commented Dec 27, 2015

+1

@cmaglie cmaglie added Component: Core Related to the code for the standard Arduino API Type: Bug Architecture: AVR Applies only to the AVR microcontrollers (Uno, etc.) labels Dec 28, 2015
@cmaglie cmaglie added this to the Release 1.6.8 milestone Dec 28, 2015
@cmaglie cmaglie merged commit b1231c3 into arduino:master Dec 28, 2015
@matthijskooijman matthijskooijman mentioned this pull request Dec 28, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Architecture: AVR Applies only to the AVR microcontrollers (Uno, etc.) Component: Core Related to the code for the standard Arduino API Type: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants