Skip to content
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

Tint remote control by Müller Light; Refactor setting light state #2849

Merged
merged 42 commits into from
Jun 15, 2020
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c39df29
Update rest_lights.cpp
ebaauw May 30, 2020
3425d47
Add `state.angle`.
ebaauw May 30, 2020
7543489
Update bindings.cpp
ebaauw May 30, 2020
bf13a4b
Update sensor.cpp
ebaauw May 30, 2020
c2ce0bb
Update database.cpp
ebaauw May 30, 2020
5ef2042
Update sensor.h
ebaauw May 30, 2020
2e3e944
Update rest_sensors.cpp
ebaauw May 30, 2020
caaf67c
Update de_web_plugin.cpp
ebaauw May 30, 2020
6165414
Update de_web_plugin.cpp
ebaauw May 30, 2020
0ee7cd6
Update de_web_plugin.cpp
ebaauw May 31, 2020
6b290aa
Update general.xml
ebaauw Jun 1, 2020
5a06f2b
Update light_node.cpp
ebaauw Jun 1, 2020
5b0bf0c
Update rest_lights.cpp
ebaauw Jun 1, 2020
30536e0
Merge remote-tracking branch 'upstream/master'
ebaauw Jun 4, 2020
1460b6d
Update rest_configuration.cpp
ebaauw Jun 6, 2020
e7c7f0d
Update de_web_plugin_private.h
ebaauw Jun 6, 2020
ff2ef67
Update de_web_plugin.cpp
ebaauw Jun 6, 2020
acd3e48
Update event.cpp
ebaauw Jun 6, 2020
b15004c
Update general.xml
ebaauw Jun 6, 2020
d02441b
Update light_node.h
ebaauw Jun 6, 2020
2adab02
Update light_node.cpp
ebaauw Jun 6, 2020
a2bf7d0
Update resource.cpp
ebaauw Jun 6, 2020
b59a726
Update resource.h
ebaauw Jun 6, 2020
12fa2ec
Update rest_lights.cpp
ebaauw Jun 6, 2020
3f19b57
Update bindings.cpp
ebaauw Jun 7, 2020
551d6ec
Update resource.h
ebaauw Jun 7, 2020
c570902
Update resource.cpp
ebaauw Jun 7, 2020
8f4285d
Update light_node.h
ebaauw Jun 7, 2020
07af3ed
Update light_node.cpp
ebaauw Jun 7, 2020
5dc23b8
Update rest_groups.cpp
ebaauw Jun 7, 2020
4d3905e
Update rest_lights.cpp
ebaauw Jun 7, 2020
9fa3b2e
Update window_covering.cpp
ebaauw Jun 7, 2020
8ed5488
Update de_web_plugin.cpp
ebaauw Jun 7, 2020
8a95e13
Update zcl_tasks.cpp
ebaauw Jun 7, 2020
e746a71
Update rest_lights.cpp
ebaauw Jun 7, 2020
6d36eff
Update resource.cpp
ebaauw Jun 7, 2020
0fa4fe0
Update light_node.cpp
ebaauw Jun 8, 2020
670950b
Update resource.cpp
ebaauw Jun 8, 2020
00dbacb
Update rest_lights.cpp
ebaauw Jun 10, 2020
b56d4be
Update rest_rules.cpp
ebaauw Jun 12, 2020
f04edde
Merge remote-tracking branch 'upstream/master'
ebaauw Jun 12, 2020
0705338
Update rest_rules.cpp
ebaauw Jun 12, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update rest_rules.cpp
Oops
  • Loading branch information
ebaauw committed Jun 12, 2020
commit 07053384d380815673cff8fe7a63fea9b07a2396
2 changes: 1 addition & 1 deletion rest_rules.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ bool DeRestPluginPrivate::evaluateRule(Rule &rule, const Event &e, Resource *eRe

if (eItem->descriptor().suffix == RStateLastUpdated)
{}
if (eItem->descriptor().suffix == RAttrLastAnnounced)
else if (eItem->descriptor().suffix == RAttrLastAnnounced)
{}
else if (eItem->descriptor().suffix == RConfigLocalTime)
{}
Expand Down