[ipcamera] Add white LED controls for Dahua and also Email and Push for Reolink with v20 command support #16144

Skinah · 2023-12-29T22:32:04Z

This PR adds the following channels as requested by users in the linked issues:

Reolink:
enableEmail
enablePush
whiteLED
autoWhiteLED

Dahua:
whiteLED
autoWhiteLED

Additionally, the PR also adds:

Better support for the Dahua API behind an NVR.
Support for both Reolinks old and newer v20 API commands that newer firmware's use.
Channels will now get removed from Reolink even if the user opts not to use the token method.
A bug was fixed that effects all ONVIF cameras that was causing two event streams to be opened instead of one.
Fixed a bug that stopped ONVIF event streams to auto restart if the camera dropped out after PR [ipcamera] Fix connection checks with ONVIF cameras with no snapshots #15119
It will remove more un-supported channels if a camera reports that the feature is missing.
Speeds up connections to ONVIF after PR [ipcamera] Fix connection checks with ONVIF cameras with no snapshots #15119 causing cameras much longer to come online.
Fixes a non thread safe use of isOnline boolean causing newer Instar API cameras to keep fetching snapshots as it never completed connecting as intended.
Adds support if an ONVIF camera gives a snapshot url on a different port to what is setup in config to fix issue reported on forum here: https://community.openhab.org/t/ipcam-binding-testing-eversecu-b2-r-lightbulb-camera-that-claims-to-be-onvif-conformant/152932/21

closes #15757
closes #15118

Signed-off-by: Matthew Skinner <matt@pcmus.com>

openhab-bot · 2023-12-29T23:02:31Z

This pull request has been mentioned on openHAB Community. There might be relevant details there:

https://community.openhab.org/t/adding-reolink-api-to-the-ipcamera-binding-beta-testers-needed/142202/155

Signed-off-by: Matthew Skinner <matt@pcmus.com>

lsiepel

Thanks, Some minor comments and a question

Edit: Could you also fix the two MemberNameCheck warnings while you are at it? (alarm_state and dog_cat in ReolinkState.java)

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

...enhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/DahuaHandler.java

...hab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java

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

Signed-off-by: Matthew Skinner <matt@pcmus.com>

…/thing/thing-types.xml Co-authored-by: lsiepel <leosiepel@gmail.com> Signed-off-by: Matthew Skinner <matt@pcmus.com>

…/binding/ipcamera/internal/ReolinkHandler.java Co-authored-by: lsiepel <leosiepel@gmail.com> Signed-off-by: Matthew Skinner <matt@pcmus.com>

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Skinah · 2024-01-26T11:32:18Z

@lsiepel Thank you for the review and help. All comments have been addressed, have spent 10+ hours testing these changes over four different cameras in different ways to set them up. Happy with it and needing a break :)

lsiepel

Thanks, LGTM

lsiepel · 2024-01-26T14:12:07Z

@Skinah Minor suggestion; i would recommend to split future PR's into seperate bug and enhancements PR's. So they are easy to review, cherry pick and also mentioned seperately in the changelog.

…or Reolink with v20 command support (openhab#16144) * New reolink channels * extra channel for Dahua. * Reolink NPE fix * Fix LED modes and auto. * Handle NVR channels for new channels * add nvr channels to Dahua. Signed-off-by: Matthew Skinner <matt@pcmus.com> Signed-off-by: Andras Uhrin <andras.uhrin@gmail.com>

…or Reolink with v20 command support (openhab#16144) * New reolink channels * extra channel for Dahua. * Reolink NPE fix * Fix LED modes and auto. * Handle NVR channels for new channels * add nvr channels to Dahua. Signed-off-by: Matthew Skinner <matt@pcmus.com> Signed-off-by: René Ulbricht <rene_ulbricht@outlook.com>

…or Reolink with v20 command support (openhab#16144) * New reolink channels * extra channel for Dahua. * Reolink NPE fix * Fix LED modes and auto. * Handle NVR channels for new channels * add nvr channels to Dahua. Signed-off-by: Matthew Skinner <matt@pcmus.com> Signed-off-by: Jørgen Austvik <jaustvik@acm.org>

Skinah added 9 commits December 27, 2023 15:26

New reolink channels

72a6199

Signed-off-by: Matthew Skinner <matt@pcmus.com>

extra channel for Dahua.

f2bec60

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Reolink NPE fix

4087dc5

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Fix LED modes and auto.

6949252

Signed-off-by: Matthew Skinner <matt@pcmus.com>

spotless

c89ba9d

Signed-off-by: Matthew Skinner <matt@pcmus.com>

update translations

9ffad0d

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Handle NVR channels for new channels

7ec3d6c

Signed-off-by: Matthew Skinner <matt@pcmus.com>

add nvr channels to Dahua.

e0d2cdb

Signed-off-by: Matthew Skinner <matt@pcmus.com>

improvements

da5e719

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Skinah added the enhancement An enhancement or new feature for an existing add-on label Dec 29, 2023

Fix token use.

f6ba58e

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Skinah added the work in progress A PR that is not yet ready to be merged label Dec 30, 2023

Skinah added 4 commits January 5, 2024 22:40

Add V2 commands

43506ef

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Check users rights.

05bcb67

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Fix two bugs.

cbc0e61

Signed-off-by: Matthew Skinner <matt@pcmus.com>

cleanup

1a8782d

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Skinah changed the title ~~[ipcamera] Add white LED controls for Dahua and also Email and Push enable for Reolink cameras~~ [ipcamera] Add white LED controls for Dahua and also Email and Push for Reolink with v20 command support Jan 6, 2024

Use more gson

d1f3b3f

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Skinah removed the work in progress A PR that is not yet ready to be merged label Jan 7, 2024

Skinah added 5 commits January 7, 2024 21:03

Fix onvif connection bug

fb89a40

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Remove motion commands from white light.

8e01f0d

Signed-off-by: Matthew Skinner <matt@pcmus.com>

fix reolink stateDTO

efa4087

Signed-off-by: Matthew Skinner <matt@pcmus.com>

remove logging.

6a81582

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Reduce logging

c9cb5d9

Signed-off-by: Matthew Skinner <matt@pcmus.com>

lsiepel requested changes Jan 21, 2024

View reviewed changes

Skinah and others added 4 commits January 25, 2024 21:51

update readme.

2180b59

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Update bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF…

e86a9a6

…/thing/thing-types.xml Co-authored-by: lsiepel <leosiepel@gmail.com> Signed-off-by: Matthew Skinner <matt@pcmus.com>

Update bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF…

4a53fa4

…/thing/thing-types.xml Co-authored-by: lsiepel <leosiepel@gmail.com> Signed-off-by: Matthew Skinner <matt@pcmus.com>

Update bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF…

f5fc65a

…/thing/thing-types.xml Co-authored-by: lsiepel <leosiepel@gmail.com> Signed-off-by: Matthew Skinner <matt@pcmus.com>

Skinah and others added 9 commits January 25, 2024 21:53

Update bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab…

ce9a6f8

…/binding/ipcamera/internal/ReolinkHandler.java Co-authored-by: lsiepel <leosiepel@gmail.com> Signed-off-by: Matthew Skinner <matt@pcmus.com>

translations and spotless.

6b5416a

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Fix ONVIF reports a snapshot url at a port other than the config port.

55bf708

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Improve logs

65d181e

Signed-off-by: Matthew Skinner <matt@pcmus.com>

better logs.

c26bc4b

Signed-off-by: Matthew Skinner <matt@pcmus.com>

onvif fixes

d102b3e

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Fix comment and use admin for checking abilities.

1a77987

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Fix member name check warnings in DTO class

20c0e25

Signed-off-by: Matthew Skinner <matt@pcmus.com>

change auto white led to mean motion turns on and off.

3532db1

Signed-off-by: Matthew Skinner <matt@pcmus.com>

lsiepel approved these changes Jan 26, 2024

View reviewed changes

lsiepel merged commit 5a29d7e into openhab:main Jan 26, 2024
3 checks passed

lsiepel added this to the 4.2 milestone Jan 26, 2024

Skinah deleted the ipcamera branch January 28, 2024 01:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ipcamera] Add white LED controls for Dahua and also Email and Push for Reolink with v20 command support #16144

[ipcamera] Add white LED controls for Dahua and also Email and Push for Reolink with v20 command support #16144

Skinah commented Dec 29, 2023 •

edited

openhab-bot commented Dec 29, 2023

lsiepel left a comment •

edited

Skinah commented Jan 26, 2024

lsiepel left a comment

lsiepel commented Jan 26, 2024

[ipcamera] Add white LED controls for Dahua and also Email and Push for Reolink with v20 command support #16144

[ipcamera] Add white LED controls for Dahua and also Email and Push for Reolink with v20 command support #16144

Conversation

Skinah commented Dec 29, 2023 • edited

openhab-bot commented Dec 29, 2023

lsiepel left a comment • edited

Choose a reason for hiding this comment

Skinah commented Jan 26, 2024

lsiepel left a comment

Choose a reason for hiding this comment

lsiepel commented Jan 26, 2024

Skinah commented Dec 29, 2023 •

edited

lsiepel left a comment •

edited