Feature/display state manager #838
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
…mouth_display_feature
…mouth_display_feature
…mouth_display_feature
MatthewScholefield
suggested changes
Jun 21, 2017
mycroft/client/enclosure/mouth.py
Outdated
| yOffset = event.data.get("yOffset", yOffset) | ||
| clearPrevious = event.data.get("clearPrev", clearPrevious) | ||
|
|
||
| # clearAfter = int(cleartAfter) # convert clearAfter to 0 or 1 |
There was a problem hiding this comment.
Extra code commented
|
|
||
|
|
||
| def run(): | ||
| """ TODO: document |
There was a problem hiding this comment.
Perhaps rename to initiate_ws or initiate_display_manager_ws (like it was imported as) and make the doc string the comment written near the function ("initiates the web sockets on display manager").
|
Changes made |
MatthewScholefield
approved these changes
Jun 21, 2017
|
I think that would be better change the |
|
There's also a git conflict that needs to be resolved. |
|
Let's merge this next release (the one after July 6th) along with the changes to Enclosure, etc. |
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.
This pull request will implement a persistent clock that is displayed on the MarkI faceplate. It also has a display state manager which allows mycroft core the ability to know which skill currently using the markI faceplate
A few dependencies are needed for this to work
mycroft-core/requirements.txt
pillow==4.1.1
sudo apt-get install python-dev
sudo apt-get install libjpeg-dev
skill-date-time also needs to be merged from dev into masters
MycroftAI/enclosure - need to merge display-update and install-script-fix into the master branch of enclosure and upload code into the arduino