Some more Hue lights by ebaauw · Pull Request #6936 · dresden-elektronik/deconz-rest-plugin

ebaauw · 2023-04-30T19:07:24Z

Additional models

See Discord, #restapi-issues channel.

`productname`

Expose productname for "all" Hue devices exposed through DDF:

Read for light-oids, using 0xC0/0xC1 manufacturer-specific commands on the Basic cluster. The offset for the 0xC0 command is computed using the modelid and manufacturername items, instead of taking these from the 0xC1 response at offset 0. This way, only a single 0xC0 needs to be issued.
Hardcoded sensor-oids. These have a dedicated DDF per model anyway, and 0xC0/0xC1 doesn't work for all sensor-oids (notably the Hue motion sensor family report themselves as Hue dimmer switch).

`cmd` in DDF `read` and `write`

Add support for cmd (instead of attr) in read and write functions of item in DDF. Both take an optional eval to specify the command payload as hex string.

Add ZCL_WriteAttribute() and ZCL_SendCommand() to zcl.cpp;
Move ZCL handling from WriteZCLAttribute() in device_access_fn.cpp to ZCL_WriteAttribute();
Call ZCL_SendCommand() from ReadZCLAttribute() and WriteZCLAttribute() to send the specified command instead of Read Attributes or Write Attributes.

Add LCA008 (1600lm E27 bulb) and Iris gen4, see Discord.

Remove Hue-specific command.

Shut up eslint warning.

- Create `ZCL_WriteAttribute()` and `ZCL_SendCommand()` in spirit of `ZCL_ReadAttributes()`; - Move ZCL logic from `writeZclAttribute()` to `ZCL_WriteAtrribute()`; - Call `ZCL_SendCommand()` from `readZclAttribute()` and `writeZclAttribute()`.

Attribute is read-only.

Only update item when real productname has been found. Use the dummy assignment, to see offset in deCONZ log.

Compute offset from modelid and manufacturername, rather than parsing the 0xC1 from offset 0.

- Use `zcl:attr` and `zcl:cmd` instead of deprecated `zcl` for `fn`. - Hue motion sensor family: Remove `config/ledindication` and `config/usertest` from ZHALightLevel and ZHATemeprature resources. These attributes apply only to the ZHAPresence.

Don't use Qt here.

Display `productname` in API.

- Deprecate `"fn": "zcl"` in favour of `"fn": "zcl:attr"` and `"fn": "zcl:cmd"` at manup's request; - Define separate function for sending command from `read` and from `write`; - Handle no Qt in `zcl.cpp`.

SwoopX · 2023-05-09T20:00:06Z

I guess I like the proposed changes on the functions, especially as this presumably solves one of my experienced annoyances and I don't need to code it myself 🙂

Iirc from fiddling around back in the days, command usage will fail when involving any state changes. However, totally fine for me for the time being and saving it as stage 2 for later.

SwoopX · 2023-05-19T19:14:09Z

@ebaauw Could you please also include a change for this particular code here?

deconz-rest-plugin/thermostat.cpp

Line 331 in 91df7d7

item->setValue(s);

and make it item->setValue(s, ResourceItem::SourceDevice); ?

This would allow using the read cmd for config/schedule. Without the suggested change, the command is send in an infinite loop, as the item get an incorrect value source causing unwanted poll behavior.

@SwoopX

At request of @SwoopX

ebaauw · 2023-05-20T11:47:01Z

Could you please also include a change for this particular code here?

@SwoopX : 81376ca375823291359b0510969d8b86c88b4622

No idea what it does, but it compiles.

manup · 2023-05-20T11:52:49Z

The ResourceItem::SourceDevice parameter tells the StateChange API where a value comes from (API, unknown, device).
It helps figuring out if a value set via the REST-API was actually applied.

manup

Only a few minor comments, overall the PR looks pretty good to me.

ebaauw added 2 commits April 30, 2023 18:39

Update light_zb3_C.json

48573c7

Add LCA008 (1600lm E27 bulb) and Iris gen4, see Discord.

Update light_zb3_C.json

973409e

ebaauw requested a review from manup April 30, 2023 19:07

ebaauw added this to the v2.22.1-beta milestone Apr 30, 2023

ebaauw added 10 commits May 4, 2023 20:54

Add (hard-coded) productname

7a1c290

Update attr_productname_item.json

441cc5e

Remove Hue-specific command.

Update fc03_state.js

abbc4f3

Shut up eslint warning.

First attempt at parsing 0xC1 command payload.

37fce38

Update 0000_capabilities.js

c0cf539

Update general.xml

cb6f03e

Attribute is read-only.

Update 0000_capabilities.js

1ac20a2

Only update item when real productname has been found. Use the dummy assignment, to see offset in deCONZ log.

Issue 0xC0 command to retrieve productname

6dd4f3e

Compute offset from modelid and manufacturername, rather than parsing the 0xC1 from offset 0.

Update lom007_smart_plug.json

d0648aa

ebaauw requested a review from SwoopX May 5, 2023 10:19

ebaauw added 6 commits May 5, 2023 15:32

Update DDFs

a42a939

- Use `zcl:attr` and `zcl:cmd` instead of deprecated `zcl` for `fn`. - Hue motion sensor family: Remove `config/ledindication` and `config/usertest` from ZHALightLevel and ZHATemeprature resources. These attributes apply only to the ZHAPresence.

Update zcl.cpp

69625f8

Don't use Qt here.

Update zcl.h

919ba7e

Don't use Qt here.

Update rest_sensors.cpp

7281857

Display `productname` in API.

Update device_access_fn.cpp

5ec7098

- Deprecate `"fn": "zcl"` in favour of `"fn": "zcl:attr"` and `"fn": "zcl:cmd"` at manup's request; - Define separate function for sending command from `read` and from `write`; - Handle no Qt in `zcl.cpp`.

Update device_access_fn.cpp

cd6551a

Use indent of two spaces

eb0c609

ebaauw added 2 commits May 20, 2023 13:35

Merge remote-tracking branch 'upstream/master' into hue-lights

991181e

Update thermostat.cpp

81376ca

At request of @SwoopX

ebaauw added the Device Improvement Additional tag to attach to a existing issue. label May 20, 2023

BabaIsYou mentioned this pull request May 21, 2023

ZS-06 / Zigbee IR Remote Control / TS1201 #6814

Closed

manup reviewed May 21, 2023

View reviewed changes

Comment thread device_access_fn.cpp Outdated

Comment thread device_access_fn.cpp Outdated

Comment thread device_access_fn.cpp Outdated

Comment thread device_access_fn.cpp Outdated

Update device_access_fn.cpp

f4ea3d6

manup merged commit 8c2590c into dresden-elektronik:master May 23, 2023

ebaauw deleted the hue-lights branch May 23, 2023 17:53

Navigation Menu

Repository navigation

Some more Hue lights - #6936

Some more Hue lights#6936
manup merged 22 commits into
dresden-elektronik:masterfrom
ebaauw:hue-lights

ebaauw commented Apr 30, 2023 •

edited

Loading

Uh oh!

SwoopX commented May 9, 2023

Uh oh!

SwoopX commented May 19, 2023 •

edited

Loading

Uh oh!

ebaauw commented May 20, 2023

Uh oh!

manup commented May 20, 2023

Uh oh!

manup left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ebaauw commented Apr 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additional models

productname

cmd in DDF read and write

Uh oh!

SwoopX commented May 9, 2023

Uh oh!

SwoopX commented May 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ebaauw commented May 20, 2023

Uh oh!

manup commented May 20, 2023

Uh oh!

manup left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ebaauw commented Apr 30, 2023 •

edited

Loading

`productname`

`cmd` in DDF `read` and `write`

SwoopX commented May 19, 2023 •

edited

Loading