From 4586d2403e72ce65610b28c3c9be78613cbb6f0a Mon Sep 17 00:00:00 2001 From: nasseeder1 <> Date: Thu, 7 Apr 2016 20:10:18 +0000 Subject: [PATCH] 49_SSCAM: command check for set cmd's don't work completely git-svn-id: https://svn.fhem.de/fhem/trunk@11202 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/49_SSCam.pm | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index e0fc6adfb..35d5d397b 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: command check for set cmd's don't work completely - feature: FHEMWEB Event-Monitor: stops autoscroll when user scrolls manually. If user scrolls to the bottom end, autoscroll continues. - feature: perlSyntaxCheck global attribute (currently used by notify & at) diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 7c79eab65..d0f46dd11 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -27,6 +27,7 @@ ########################################################################################################## # Versions History: # +# 1.23.1 07.04.2016 command check for set cmd's don't work completely # 1.23 02.04.2016 change to RemoveInternalTimer for functions # 1.22 27.03.2016 bugfix "link_open" doesn't work after last update # 1.21 23.03.2016 added "lastrec"," lastrec_open" to playback last recording @@ -317,7 +318,7 @@ sub SSCam_Set { elsif ($opt eq "motdetsc") { if (!$hash->{CREDENTIALS}) {return "Credentials of $name are not set - make sure you've set it with \"set $name credentials username password\"";} - unless ($prop) { return " \"$opt\" needs one of those arguments: disable, camera, SVS !";} + if (!$prop || $prop !~ /^(disable|camera|SVS)$/) { return " \"$opt\" needs one of those arguments: disable, camera, SVS !";} $hash->{HELPER}{MOTDETSC} = $prop; cammotdetsc($hash); @@ -441,7 +442,7 @@ sub SSCam_Set { } else { - return $setlist; + return "$setlist"; } return; } @@ -4019,7 +4020,6 @@ return; The command "motdetsc" (stands for "motion detection source") switchover the motion detection to the desired mode. If motion detection will be tuned by camera, the original camera settings are kept. - Wird die Bewegungserkennung durch die Kamera eingestellt, werden die originalen Kameraeinstellungen beibehalten. The successful execution of that opreration you can retrace by the state in SVS -> IP-camera -> event detection -> motion. The state of motion detection source will also be shown by the Reading "CamMotDetSc".