[deconz] Add Pairing/Scene actions, new devices and improve code #14622

J-N-K · 2023-03-17T16:25:00Z

Closes #14124
Fixes #13368
Fixes #13132
Fixes #12703
Fixes #12082
Fixes #11031
Closes #10997
Fixes #10858
Fixes #8260
Fixes #12228

This includes all changes from the SmartHome/J version of the binding and some more improvements.

Signed-off-by: Jan N. Klug <github@klug.nrw>

jlaur

Thanks a lot for this massive collection of refactoring and other improvements. I have provided some initial comments after glancing over first half of the changed files.

bundles/org.openhab.binding.deconz/README.md

bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/Util.java

...b.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/dto/NewSceneResponse.java

...ng.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/DeconzBridgeHandler.java

...ding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java

...deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java

J-N-K · 2023-03-17T17:27:26Z

This is NOT ready for review. I know that there are still reverts that need to be checked but it's much easier for me to self-review on GitHub.

Signed-off-by: Jan N. Klug <github@klug.nrw>

J-N-K · 2023-03-17T19:55:43Z

There is one thing that I could either include here or in a later PR: the absolute color temperature channel is plain Number even though it is using K. We could change to the system-channeltype.

jlaur

A few additional comments.

...ding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java

...deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java

...g.deconz/src/main/java/org/openhab/binding/deconz/internal/netutils/WebSocketConnection.java

jlaur · 2023-03-18T00:00:51Z

bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml

@@ -28,19 +32,28 @@
 		<item-type>Switch</item-type>
 		<label>All On</label>
 		<description>"On" if all lights in this group are "On", otherwise "Off".</description>
+		<tags>
+			<tag>Lighting</tag>


@lolodomo - is this a correct single tag for a Switch? I can't determine this from the rules established in #12262, and no other bindings have it.

bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml

jlaur · 2023-03-18T00:11:10Z

There is one thing that I could either include here or in a later PR: the absolute color temperature channel is plain Number even though it is using K. We could change to the system-channeltype.

I agree. Up to you if you want to include it in this PR - it would certainly fit in. 🙂

J-N-K · 2023-03-18T08:11:47Z

After thinking about it I prefer another PR for that. The reason is that all of the changes here are "safe", while changing the channel type might cause issues and it's easier to debug if these changes are separated.

Signed-off-by: Jan N. Klug <github@klug.nrw>

...g.deconz/src/main/java/org/openhab/binding/deconz/internal/netutils/WebSocketConnection.java

jlaur · 2023-03-18T12:19:28Z

bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml

+
+		<representation-property>uid</representation-property>
+
+		<config-description-ref uri="thing-type:deconz:sensor"/>


Can we add this new thing to the textual configuration example? This would particularly useful since it has channel configuration for which the syntax might be unfamiliar or hard to remember.

"Someone" can sure do it. Whoever wants to use figure out how to do it can do so, but I won't waste my time to make it easier for people who deliberately chose the hard way. Use discovery and managed things and you'll have no issues.

bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml

Signed-off-by: Jan N. Klug <github@klug.nrw>

jlaur · 2023-03-18T12:40:17Z

@J-N-K - if you see any issues from the filter "is:issue is:open in:title deconz" that you can quickly assess will be fixed by this PR, please link them. I think the PR is ready for being merged, and we can get back to the tag question with @lolodomo later.

J-N-K · 2023-03-18T12:58:30Z

I'm not sure about #12228, that should be checked.

jlaur · 2023-03-18T14:45:49Z

I'm not sure about #12228, that should be checked.

I have just tested it, it's fixed also. 👍 I have added it to the list in the PR description.

J-N-K · 2023-03-18T14:51:10Z

I guess that makes deconz drop out of the "top 10 bindings with open issues" list :-)

Signed-off-by: Jan N. Klug <github@klug.nrw>

jlaur · 2023-03-18T14:54:05Z

I guess that makes deconz drop out of the "top 10 bindings with open issues" list :-)

Certainly! 😄 Thanks for all the work done over the years and now in this backport.

jlaur

LGTM

Redsandro · 2023-03-18T18:55:11Z

I haven't tested it yet but this may also close #13740.

jlaur · 2023-03-19T14:06:02Z

bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml

 	<thing-type id="airqualitysensor">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="deconz"/>
 		</supported-bridge-type-refs>
-		<label>Air quality Sensor</label>
-		<description>An air quality sensor</description>
+		<label>Carbon-monoxide Sensor</label>


@J-N-K - late finding: Was this change intended? This is the same label as for thing type carbonmonoxidesensor.

Yes, when the description does not provide additional information it can be omitted. I also remove the article because it is not needed.

Edit: Uh. I See what you mean. I'll fix that.

Fixed in #14636

…nhab#14622) * port changes * update instructions * Incorporate review comments from openhab#14134 * new improvements (mostly Java 17 changes) * further improvements Signed-off-by: Jan N. Klug <github@klug.nrw>

J-N-K added 4 commits March 16, 2023 21:05

port changes

f422ef2

Signed-off-by: Jan N. Klug <github@klug.nrw>

update instructions

87f60d4

Signed-off-by: Jan N. Klug <github@klug.nrw>

Incorporate review comments from openhab#14134

107bb3f

Signed-off-by: Jan N. Klug <github@klug.nrw>

new improvements (mostly Java 17 changes)

cc98ae1

Signed-off-by: Jan N. Klug <github@klug.nrw>

jlaur requested changes Mar 17, 2023

View reviewed changes

J-N-K added 3 commits March 17, 2023 18:46

fixes

f4445f8

Signed-off-by: Jan N. Klug <github@klug.nrw>

further improvements

3871721

Signed-off-by: Jan N. Klug <github@klug.nrw>

minor improvements

05c22f9

Signed-off-by: Jan N. Klug <github@klug.nrw>

J-N-K changed the title ~~Deconz~~ [deconz] Add Pairing/Scene actions, new devices and improve code Mar 17, 2023

J-N-K added the enhancement An enhancement or new feature for an existing add-on label Mar 17, 2023

J-N-K marked this pull request as ready for review March 17, 2023 19:55

J-N-K requested a review from a team as a code owner March 17, 2023 19:55

jlaur requested changes Mar 18, 2023

View reviewed changes

jlaur mentioned this pull request Mar 18, 2023

[deconz] Add actions for device joining and scenes #14134

Closed

jlaur linked an issue Mar 18, 2023 that may be closed by this pull request

[deconz] Backport SmartHome/J enhancements and fixes #14124

Closed

address review comments

7c5109a

Signed-off-by: Jan N. Klug <github@klug.nrw>

jlaur reviewed Mar 18, 2023

View reviewed changes

...g.deconz/src/main/java/org/openhab/binding/deconz/internal/netutils/WebSocketConnection.java Show resolved Hide resolved

jlaur reviewed Mar 18, 2023

View reviewed changes

bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml Outdated Show resolved Hide resolved

address review comment

f5fbaa0

Signed-off-by: Jan N. Klug <github@klug.nrw>

fix

368500e

Signed-off-by: Jan N. Klug <github@klug.nrw>

jlaur approved these changes Mar 18, 2023

View reviewed changes

jlaur merged commit ee1de11 into openhab:main Mar 18, 2023
2 checks passed

jlaur added this to the 4.0 milestone Mar 18, 2023

J-N-K deleted the deconz branch March 18, 2023 16:27

This was referenced Mar 18, 2023

[deCONZ] missing Brightness and On Time Channel on all things #10233

Closed

[deconz] Gateway stays offline after OH restart: Error while connecting: Destroyed container cannot be restarted #13141

Closed

This was referenced Mar 19, 2023

[deconz] Issue with Danfoss Ally thermostat #11517

Closed

[deconz] Make the lastseen channel for lights and power sockets available in openHAB #10149

Closed

jlaur reviewed Mar 19, 2023

View reviewed changes

jlaur mentioned this pull request Mar 19, 2023

[deconz] Add more example things/items #14639

Merged

jlaur mentioned this pull request Mar 26, 2023

[deconz] [Proposal] Normalize valve value to zigbee specification #14259

Closed

LukasA83 mentioned this pull request Apr 21, 2023

[deconz] thermostat valve value shows UNDEF - regression from pr #14622 #14867

Closed

lolodomo mentioned this pull request May 11, 2023

Checking if upgrade instructions were provided for all OH 4 PRs #14928

Closed

29 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[deconz] Add Pairing/Scene actions, new devices and improve code #14622

[deconz] Add Pairing/Scene actions, new devices and improve code #14622

J-N-K commented Mar 17, 2023 •

edited by jlaur

jlaur left a comment

J-N-K commented Mar 17, 2023

J-N-K commented Mar 17, 2023

jlaur left a comment

jlaur Mar 18, 2023

jlaur commented Mar 18, 2023

J-N-K commented Mar 18, 2023

jlaur Mar 18, 2023

J-N-K Mar 18, 2023

jlaur commented Mar 18, 2023

J-N-K commented Mar 18, 2023

jlaur commented Mar 18, 2023

J-N-K commented Mar 18, 2023 •

edited

jlaur commented Mar 18, 2023

jlaur left a comment

Redsandro commented Mar 18, 2023

jlaur Mar 19, 2023

J-N-K Mar 19, 2023 •

edited

J-N-K Mar 19, 2023


		<representation-property>uid</representation-property>

		<config-description-ref uri="thing-type:deconz:sensor"/>

[deconz] Add Pairing/Scene actions, new devices and improve code #14622

[deconz] Add Pairing/Scene actions, new devices and improve code #14622

Conversation

J-N-K commented Mar 17, 2023 • edited by jlaur

jlaur left a comment

Choose a reason for hiding this comment

J-N-K commented Mar 17, 2023

J-N-K commented Mar 17, 2023

jlaur left a comment

Choose a reason for hiding this comment

jlaur Mar 18, 2023

Choose a reason for hiding this comment

jlaur commented Mar 18, 2023

J-N-K commented Mar 18, 2023

jlaur Mar 18, 2023

Choose a reason for hiding this comment

J-N-K Mar 18, 2023

Choose a reason for hiding this comment

jlaur commented Mar 18, 2023

J-N-K commented Mar 18, 2023

jlaur commented Mar 18, 2023

J-N-K commented Mar 18, 2023 • edited

jlaur commented Mar 18, 2023

jlaur left a comment

Choose a reason for hiding this comment

Redsandro commented Mar 18, 2023

jlaur Mar 19, 2023

Choose a reason for hiding this comment

J-N-K Mar 19, 2023 • edited

Choose a reason for hiding this comment

J-N-K Mar 19, 2023

Choose a reason for hiding this comment

J-N-K commented Mar 17, 2023 •

edited by jlaur

J-N-K commented Mar 18, 2023 •

edited

J-N-K Mar 19, 2023 •

edited