-
Notifications
You must be signed in to change notification settings - Fork 52
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
Fix Issue33 and asleep state improvements #35
Open
TonyFleisher
wants to merge
13
commits into
adey:master
Choose a base branch
from
TonyFleisher:issue33-asleep-state
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
Switch occupancy feature updates and merge
Merge branch 'master'
Switch occupancy feature
Merge update with upstream
Merge from upstream
Merge from upstream
Merge from upstream
* v 0.12.2 * cool and heat check presence * Create installerManifest.json * cool heat turnoff * Update installerManifest.json * dimtolevel * v 0.12.5 * Update installerManifest.json * Update installerManifest.json * Update installerManifest.json * Update installerManifest.json * version no * updated images * no motion timer * Delete .DS_Store * Delete .DS_Store * V 0.12.6 * save first notice * v 0.12.7 * v 0.14.0 * Add files via upload * Delete rooms_rules.png * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete roomsRules2.png * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete roomsAdjacent.png * Add files via upload * Delete roomsAdjacent.png * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * v 0.15.2 * Add files via upload * Add files via upload * Add files via upload
Merge from upstream
Fix bug in nightSwitchesOff() Add ability to choose which switches to turn off when leaving asleep Turn on night switches if motion is active when changing to asleep
Change around line 3093 needs improvement. Intent is to stop lights from going off if someone is in the room when we change to sleep, but found it is also causing lights to turn on unexpectedly in some situations. I think we need to include check on oldState (or switches state) to see if we need dimNightLights() |
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.
Fix bug in nightSwitchesOff() - Issue #33
Add ability to choose which switches to turn off when leaving asleep
Turn on (instead of off) night switches if motion is active when entering asleep state