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

ebaauw · 2020-05-30T19:41:18Z

Add support for Tint remote control by Müller Light, see [Request Device Support] Tint remote control by Müller-Licht #1209.
Add support for Tint by Müller Light special scenes, through state.effect, see [Request Device Support] Tint remote control by Müller-Licht #1209.
Refactor logic of PUT to light state, take 2, see Input needed: Refactor logic setting light state #2475.
- Only report an error for violations of the data type (e.g. setting setting ct to true, or setting ct to an integer value < 0 or > 0xFFFF). Coerce the value if of the correct type, but invalid;
- Return HTTP status 200 on API errors (just like the Hue bridge). This means that invalid keys or values in the body are ignored, but valid ones are still executed;
- Add a sanity check that ctmax > ctmin. Change default ctmax to 65279 (0xFEFF).
- For window covering devices, use {"stop": true} instead of {"tilt": "stop"}.
- Remove state.alert for Window Covering Device.
Fully implement /lights resource lastannounced and lastseen, see Proposal: deprecate reachable attributes #2590:
- Persist values in database;
- Web socket notifications (limited to 1 per second per device);
- In UTC (ending with Z);
- Allow rule dx condition on lastannounced (e.g. to turn off a light on power on, in case it doesn't support PowerOn On/Off).
Refactor updating ResourceItem values for /lights resources.
Full web socket notifications for /lights resource top-level attributes. Not all events are generated yet, though.
Re-enable Hue app, see Philips Hue app complains about "old version bridge" #2837.
Re-enbale siren of Bitron Home 902010/24 Smoke Sensor, see Bitron Home 902010/24 Smoke Sensor/Warning Device, Siren does not work #2886.

Skip the _On_ command in between _Move to Level (with On/Off)_ and _Move to Level_, see #2824.

Don't remove `/groups/0`.

Add Tint remote control by Müller Light, see #1209.

Add Tint remote control by Müller Light

Add `previousCt`.

- Handle `state.xy` (for Tint remote control by Müller Light); - Don't attach `/groups/0` to sensors.

Add Tint remote control by Müller Light, see #1209.

Thomas-Vos · 2020-05-31T11:31:58Z

de_web_plugin.cpp

+        {
+            sensorNode.addItem(DataTypeUInt16, RStateX);
+            sensorNode.addItem(DataTypeUInt16, RStateY);
+            sensorNode.addItem(DataTypeUInt16, RStateTiltAngle);


Shouldn't this be RStateAngle instead of RStateTiltAngle? From my testing so far it shows "tiltangle":null in the REST API instead of the angle.

Indeed, thanks for noticing!

It's correct in database.cpp. If you restart deCONZ, you should see state.angle instead.

Oops.

Max `ct` value is 0xFEFF (65279), see #2475.

Refactor logic for PUT light state, see #2475.

bortim · 2020-06-06T11:08:49Z

Hello @ebaauw,

when will this branch be part of an official build?
I am using deconz and api with in a docker-container on a raspberry pi.
Because of multiple missing libs I was not able to compile it directly within the container.

Regards

Use values by latest Hue bridge gen-2 firmware, to re-enable Hue app, see #2837.

- Add a global variable for the `DeRestPluginPrivate` instance, to enable calling `enqeueuEvent()` (amongs others) from `LightNode` (amongst others) methods.

- Add a global variable for the `DeRestPluginPrivate` instance, to enable calling `enqeueuEvent()` (amongs others) from `LightNode` (amongst others) methods, see #2475. - Ignore _Enhanced Current Hue_ for Müller Lights, see #1209 - Add support for Müller lights special scene, see #1209

- Add manufacturer-specific attribute for Müller Light special scene; - Add more _Color Control_ attributes.

- Add methods to update `ResourceItem` value, including issuing event, updating `etag`, and saving to database.

- Remove `state.alert` for _Window Covering Device_; - Make `state.effect` a true `ResourceItem`; - Add `setValue` methods to set `ResourceItem` value, issue `Event`, update `etag`, and save database.

- Use true `ResourceItem` for `state.effect`; - Add `Resource::toVariant()`.

Refactor handling PUT of `/lights` `state`, see #1209.

Add bindings for Mueller Light.

- Fix name `RAttrLastAnnounced`; - Fix format of UTC date/time attributes: - `null` when invalid; - End with `Z` when in UTC; - Return `RStateEffect` as string.

- Add optional `forceUpdate` parameter to `LightNode::setValue()`; - Remove `LightNode::setColorXY()`, `LightNode::colorMode()`, and `LightNode::setColorMode()` in favour of `LightNode::setValue()` and `Resource::toString()`.

- Websocket notifications for `lastseen` and `lastannounced`; - Restore `lastseen` and `lastannounced` from database; - Add optional `forceUpdate` parameter to `LightNode::setValue()`; - Remove `LightNode::setColorXY()`, `LightNode::colorMode()`, and `LightNode::setColorMode()` in favour of `LightNode::setValue()` and `Resource::toString()`.

- Leverage `LightNode::setValue()`; - Collect attributes in one web socket notification.

Leverage `LightNode::setValue()`.

Leverage `LightNode::setValue()`

Leverage `LightNode::setValue()`.

ebaauw · 2020-06-08T18:34:53Z

@manup, could you please have a look at this PR? Running it on my production for a day and haven't encountered any issues, but it's turned into a bigger one.

- Limit #events for `lastseen` (of same resource) to 1/sec; - Keep `lastseen` and `lastannounced` in sec resolution.

- Keep `lastseen` and `lastannounced` in sec resolution.

Support rule condition for `dx` `attr/lastannounced`, see #2590

Oops

bortim · 2020-06-14T15:55:50Z

Hello @ebaauw ,

I have a problem after rebooting, because the Tint remote is forgotten.
I have to add a new sensor and reset the remote by the button over the batteries.

Pressing some buttons on the tint does not result in a reachable = true.
I checked this by curl-ing the API.

Regards
bortim

manup

Just added some minor comments, the PR runs in my setup fine.
I'm doing some more tests with color loop now.

manup · 2020-06-15T13:25:42Z

bindings.cpp

@@ -2881,7 +2895,7 @@ void DeRestPluginPrivate::checkOldSensorGroups(Sensor *sensor)
                    i->removeDeviceMembership(sensor->id());
                }

-                if (i->state() == Group::StateNormal && !i->hasDeviceMembers())
+                if (i->address() != 0 && i->state() == Group::StateNormal && !i->hasDeviceMembers())


i->address() != 0 may we should use some constants here to get more meaning and make it easier to search for places where group 0x0000 is used.

GROUP_0 / GROUP_ZERO or something similar.

There's several things going wrong with /groups/0. Events are issued on /groups/65520 instead of on /groups/0. A GET of /groups/65520 returns the same as a GET of /groups/0. The entire code handling this should be reviewed. I think we might need to decouple the REST resource ID from the group address for all groups, similar to the Hue bridge.

manup · 2020-06-15T13:27:54Z

de_web_plugin.cpp

@@ -343,6 +345,8 @@ QString ApiRequest::apikey() const
 DeRestPluginPrivate::DeRestPluginPrivate(QObject *parent) :
    QObject(parent)
 {
+    plugin = this;


In v2 we should inject this as dependency in the constructor instead a global variable. Makes writing tests easier.

Yeah, using a global variable definitely doesn't deserve a beauty prize. I tried to add a variable to the constructors at first, but couldn't get that to work. Got lost in wanting to put that into RestNodeBase but needing to pass it to the LightNode and SensorNode classes. I'm afraid my C++ is a bit rusty here, and Qt doesn't help.

manup · 2020-06-15T14:06:23Z

rest_lights.cpp

                }
            }
        }
        else if (param == "xy"  && taskRef.lightNode->item(RStateX) && taskRef.lightNode->item(RStateY) &&
                 taskRef.lightNode->modelId() != QLatin1String("FLS-PP"))
        {
-            // @manup: is check for FLS-PP needed, or is this already handled by check for state.xy?
+            // @manup: is check for FLS-PP needed, or is this already handled by check for state.x and state.y?


Hmm good question: The check refers to the very old "FLS-PP" wireless ballast from 2012 which didn't support xy color mode there are less than 200 deployed but still active. When they are configured we'd need to strip the xy ResourceItems (the ballast wrongly claims it supports this color mode).

The newer ones with model id "FLS-PP3" support xy and don't fall into this check.

You make devices of too high quality, now you never get rid of old stuff ;-)

Another argument for capabilities...

manup · 2020-06-15T14:14:30Z

rest_lights.cpp

-                        state[key] = item->toVariant();
+                        if (rid.suffix == RStateEffect)
+                        {
+                            state[key] = RStateEffectValuesMueller[item->toNumber()];


Is a guard here for Müller Licht needed?

No, but better naming is. Should probably have used RStateEffectAllValues vs RStateEffectDefaultValues. No clue how to expand this to other lights with similar capabilities, but implemented differently.

ebaauw · 2020-06-15T17:27:08Z

I have a problem after rebooting, because the Tint remote is forgotten.

What are you rebooting? How do you start deCONZ after reboot? Are you sure it starts with your self-compiled REST API plugin?

What do you mean by “ forgotten”? Does it still show in the GUI? Does the /sensors resource still exist? Can the remote still control lights in the associated groups? Does the node in the GUI blinkt blue when you press a button?

I have to add a new sensor and reset the remote by the button over the batteries.

Resetting the remote would only be needed if it has lost the association to the Zigbee network. That cannot be caused by restarting deCONZ.

Pressing some buttons on the tint does not result in a reachable = true.

Is that before or after reboot? Before or after reset and re-pair? Does lastseen change?

bortim · 2020-06-15T18:23:55Z

I have a problem after rebooting, because the Tint remote is forgotten.

What are you rebooting? How do you start deCONZ after reboot? Are you sure it starts with your self-compiled REST API plugin?

I am rebooting my "host" - a Raspberry Pi 3 B.
deCONZ is started as a service: systemctl enable deconz // systemctl start deconz
Yes I am, because I compiled the branch with the remote-support and copied it to the deconz folder.

What do you mean by “ forgotten”? Does it still show in the GUI? Does the /sensors resource still exist? Can the remote still control lights in the associated groups? Does the node in the GUI blinkt blue when you press a button?

I am using deconz headless so I can't
The ressource still exists - curl -X GET /sensors/21
[{"error":{"address":"/sensors/21","description":"resource, /sensors/21, not available","type":3}}]
Only if i repair it again, events are created on the websocket for my iobroker.
And the remote-sensor does not have any entry in the Phoscon-Browser-App - is this an issue?

I have to add a new sensor and reset the remote by the button over the batteries.
Resetting the remote would only be needed if it has lost the association to the Zigbee network. That cannot be caused by restarting deCONZ.

Hm okay - strange behavier within my network.

Pressing some buttons on the tint does not result in a reachable = true.

Is that before or after reboot? Before or after reset and re-pair? Does lastseen change?

Usually I do the following:

Start Raspberry with deCONZ & iobroker
Add batteries to the tint (I remove them after playing with iobroker, deconz, a led-stripe and the remote).
Add Sensor with phoscon
Reset the tint to get it working again
Press button
wait for "finished" green in phoscon
play with iobroker, deconz, a led-stripe and the remote
shutdown raspberry
begin with 1. on the next weekend

With
sudo systemctl stop deconz and
sudo systemctl start deconz
it is reproducable for me.

ebaauw · 2020-06-15T21:07:29Z

And the remote-sensor does not have any entry in the Phoscon-Browser-App - is this an issue?

For Phoscon: it doesn't (yet ?) support the remote.

I am using deconz headless so I can't

That's unfortunate. I wouldn't know how to troubleshoot without access to the GUI.

The ressource still exists - curl -X GET /sensors/21
[{"error":{"address":"/sensors/21","description":"resource, /sensors/21, not available","type":3}}]

This actually suggest that the resource no longer exists. Is it included if you do a GET of /sensors?

With
sudo systemctl stop deconz and
sudo systemctl start deconz
it is reproducable for me.

Very strange. How long after pairing the remote do you stop deCONZ? It would seem that the newly paired sensor resource hasn't been written to the database. Do you see the same for other devices? I don't see how this could be related to this PR; best open an separate issue for it.

bortim · 2020-06-16T10:32:18Z

And the remote-sensor does not have any entry in the Phoscon-Browser-App - is this an issue?

For Phoscon: it doesn't (yet ?) support the remote.

Thank you for clearification.

The ressource still exists - curl -X GET /sensors/21
[{"error":{"address":"/sensors/21","description":"resource, /sensors/21, not available","type":3}}]

This actually suggest that the resource no longer exists. Is it included if you do a GET of /sensors?

It is not included. Thank you for that hint.
But I got a solution for that:
I have installed my ubuntu and deconz new and now it is working.

Thanks a lot!

ebaauw added 9 commits May 30, 2020 20:51

Update rest_lights.cpp

c39df29

Skip the _On_ command in between _Move to Level (with On/Off)_ and _Move to Level_, see #2824.

Add state.angle.

3425d47

Update bindings.cpp

7543489

Don't remove `/groups/0`.

Update sensor.cpp

bf13a4b

Add Tint remote control by Müller Light, see #1209.

Update database.cpp

c2ce0bb

Add Tint remote control by Müller Light

Update sensor.h

5ef2042

Add `previousCt`.

Update rest_sensors.cpp

2e3e944

- Handle `state.xy` (for Tint remote control by Müller Light); - Don't attach `/groups/0` to sensors.

Update de_web_plugin.cpp

caaf67c

Add Tint remote control by Müller Light, see #1209.

Update de_web_plugin.cpp

6165414

Thomas-Vos reviewed May 31, 2020

View reviewed changes

Update de_web_plugin.cpp

0ee7cd6

Oops.

ebaauw mentioned this pull request May 31, 2020

Devices with multiple switch endpoints #1122

Closed

ebaauw added 3 commits June 1, 2020 13:31

Update general.xml

6b290aa

Max `ct` value is 0xFEFF (65279), see #2475.

Update light_node.cpp

5a06f2b

Max `ct` value is 0xFEFF (65279), see #2475.

Update rest_lights.cpp

5b0bf0c

Refactor logic for PUT light state, see #2475.

ebaauw changed the title ~~Tint remote control by Müller Light~~ Tint remote control by Müller Light; Refactor setting light state Jun 1, 2020

Thomas-Vos mentioned this pull request Jun 4, 2020

Rules not triggered #2148

Closed

Merge remote-tracking branch 'upstream/master'

30536e0

ebaauw added 11 commits June 6, 2020 18:55

Update rest_configuration.cpp

1460b6d

Use values by latest Hue bridge gen-2 firmware, to re-enable Hue app, see #2837.

Update de_web_plugin_private.h

e7c7f0d

- Add a global variable for the `DeRestPluginPrivate` instance, to enable calling `enqeueuEvent()` (amongs others) from `LightNode` (amongst others) methods.

Update event.cpp

acd3e48

Update general.xml

b15004c

- Add manufacturer-specific attribute for Müller Light special scene; - Add more _Color Control_ attributes.

Update light_node.h

d02441b

- Add methods to update `ResourceItem` value, including issuing event, updating `etag`, and saving to database.

Update light_node.cpp

2adab02

- Remove `state.alert` for _Window Covering Device_; - Make `state.effect` a true `ResourceItem`; - Add `setValue` methods to set `ResourceItem` value, issue `Event`, update `etag`, and save database.

Update resource.cpp

a2bf7d0

- Use true `ResourceItem` for `state.effect`; - Add `Resource::toVariant()`.

Update resource.h

b59a726

- Use true `ResourceItem` for `state.effect`; - Add `Resource::toVariant()`.

Update rest_lights.cpp

12fa2ec

Refactor handling PUT of `/lights` `state`, see #1209.

Update bindings.cpp

3f19b57

Add bindings for Mueller Light.

ebaauw added 10 commits June 7, 2020 12:16

Update resource.cpp

c570902

- Fix name `RAttrLastAnnounced`; - Fix format of UTC date/time attributes: - `null` when invalid; - End with `Z` when in UTC; - Return `RStateEffect` as string.

Update light_node.h

8f4285d

- Add optional `forceUpdate` parameter to `LightNode::setValue()`; - Remove `LightNode::setColorXY()`, `LightNode::colorMode()`, and `LightNode::setColorMode()` in favour of `LightNode::setValue()` and `Resource::toString()`.

Update rest_groups.cpp

5dc23b8

Update rest_lights.cpp

4d3905e

- Leverage `LightNode::setValue()`; - Collect attributes in one web socket notification.

Update window_covering.cpp

9fa3b2e

Leverage `LightNode::setValue()`.

Update de_web_plugin.cpp

8ed5488

Leverage `LightNode::setValue()`

Update zcl_tasks.cpp

8a95e13

Leverage `LightNode::setValue()`.

Update rest_lights.cpp

e746a71

Update resource.cpp

6d36eff

ebaauw requested a review from manup June 8, 2020 18:31

ebaauw added 6 commits June 8, 2020 20:49

Update light_node.cpp

0fa4fe0

- Limit #events for `lastseen` (of same resource) to 1/sec; - Keep `lastseen` and `lastannounced` in sec resolution.

Update resource.cpp

670950b

- Keep `lastseen` and `lastannounced` in sec resolution.

Update rest_lights.cpp

00dbacb

Update rest_rules.cpp

b56d4be

Support rule condition for `dx` `attr/lastannounced`, see #2590

Merge remote-tracking branch 'upstream/master'

f04edde

Update rest_rules.cpp

0705338

Oops

This was referenced Jun 14, 2020

GLEDOPTO GL-C-008S creates event flood #2940

Closed

Lastannounced-Updates results in permanent updates Jey-Cee/ioBroker.deconz#150

Closed

manup merged commit 630845e into dresden-elektronik:master Jun 15, 2020

manup reviewed Jun 15, 2020

View reviewed changes

bortim mentioned this pull request Jun 18, 2020

Use change-event for updating the object parameters Jey-Cee/ioBroker.deconz#151

Merged

Mimiix mentioned this pull request Jul 20, 2020

Deconz accepts unsupported parameters and reports wrong result #2386

Closed

Thomas-Vos mentioned this pull request Jun 7, 2022

Müller-Licht tint remote control 404049 #5841

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

ebaauw commented May 30, 2020 •

edited

Thomas-Vos May 31, 2020 •

edited

ebaauw May 31, 2020

bortim commented Jun 6, 2020

ebaauw commented Jun 8, 2020

bortim commented Jun 14, 2020

manup left a comment

manup Jun 15, 2020

ebaauw Jun 15, 2020 •

edited

manup Jun 15, 2020

ebaauw Jun 15, 2020

manup Jun 15, 2020

ebaauw Jun 15, 2020

manup Jun 15, 2020

ebaauw Jun 15, 2020

ebaauw commented Jun 15, 2020

bortim commented Jun 15, 2020 •

edited

ebaauw commented Jun 15, 2020

bortim commented Jun 16, 2020

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

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

Conversation

ebaauw commented May 30, 2020 • edited

Thomas-Vos May 31, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bortim commented Jun 6, 2020

ebaauw commented Jun 8, 2020

bortim commented Jun 14, 2020

manup left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ebaauw Jun 15, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ebaauw commented Jun 15, 2020

bortim commented Jun 15, 2020 • edited

ebaauw commented Jun 15, 2020

bortim commented Jun 16, 2020

ebaauw commented May 30, 2020 •

edited

Thomas-Vos May 31, 2020 •

edited

ebaauw Jun 15, 2020 •

edited

bortim commented Jun 15, 2020 •

edited