Update to johnny-five v0.11.1 #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
rwaldrongh-1333 Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Updates board snapshot and serialize tests to account for the new thermometer `freq` property.
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
davidsbailey
approved these changes
Jun 2, 2017
|
The only merge conflicts were a few places in package.json and the readme that we customize to make it obvious that this is the Code.org fork of johnny-five, and not the original project.
These are simply changes we rejected in the merge, so they don't show up in the diff here at all. |
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the code-dot-org fork from v0.10.10 to v0.11.1 (diff). Once this is merged and passes CI, I'll release v0.11.1-cdo.0.
The change we're most interested in for Maker Toolkit is that
Thermometernow has adisable()method which will let us tear it down cleanly when disconnecting from the board.