From 247496eca2a3dd296f8b8dee1ae0083689c8618d Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Tue, 26 Jun 2018 20:26:37 +0000 Subject: [PATCH] 49_SSCam: fix state turns to "off" even though cam is disabled git-svn-id: https://svn.fhem.de/fhem/trunk@16913 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/49_SSCam.pm | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index a83b9310f..82829cfd4 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 49_SSCam: fix state turns to "off" even though cam is disabled - bugfix: 38_netatmo: fixed camera recording and notification settings - feature: 36_WMBUS: support for WMBUS type C and Kamstrup Multical 21 encoding. diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 3f9f3c572..ccf573d99 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -27,6 +27,7 @@ ######################################################################################################################### # Versions History: # +# 5.2.7 26.06.2018 fix state turns to "off" even though cam is disabled # 5.2.6 20.06.2018 running stream as human readable entry for SSCamSTRM-Device, goAbsPTZ fix set-entry für non-PTZ # 5.2.5 18.06.2018 trigger lastsnap_fw to SSCamSTRM-Device only if snap was done by it. # 5.2.4 17.06.2018 SSCam_composegallery added and write warning if old composegallery-weblink device is used @@ -239,7 +240,7 @@ use Time::HiRes; use HttpUtils; # no if $] >= 5.017011, warnings => 'experimental'; -my $SSCamVersion = "5.2.6"; +my $SSCamVersion = "5.2.7"; # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) my %SSCam_errauthlist = ( @@ -5458,8 +5459,8 @@ sub SSCam_refresh($$$$) { { map { FW_directNotify("#FHEMWEB:$_", "location.reload('true')", "") } devspec2array("TYPE=FHEMWEB") } } - # Aufnahmestatus in state abbilden & SSCam-Device state setzen (mit/ohne Event) - my $st = (ReadingsVal($name, "Record", "") eq "Start")?"on":"off"; + # Aufnahmestatus/Disabledstatus in state abbilden & SSCam-Device state setzen (mit/ohne Event) + my $st = (ReadingsVal($name, "Availability", "enabled") eq "disabled")?"disabled":(ReadingsVal($name, "Record", "") eq "Start")?"on":"off"; if($lpoll_scm) { readingsSingleUpdate($hash,"state", $st, 1); } else {