From 89c88ad6e664920f6bb6992803d9baddf5399af6 Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Sat, 1 Jul 2017 08:16:50 +0000 Subject: [PATCH] 49_SSCAM: V2.2.3, fix if SVSversion small is "0" git-svn-id: https://svn.fhem.de/fhem/trunk@14612 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 382663753..7359da281 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: V2.2.3, fix if SVSversion small is "0" - new: 00_SmartMeterP1: V1.7 New module for reading elec.+gas smartmeters. - feature: 93_DbRep: V5.3.1, new commands optimizeTables (MySQL) and vacuum (SQLite, PostgreSQL) to optimize database diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index ae804af2b..0026ea922 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -27,6 +27,7 @@ ######################################################################################################################### # Versions History: # +# 2.2.3 30.06.2017 fix if SVSversion small "0", create events for "snap" # 2.2.2 11.06.2017 bugfix sscam_login, sscam_login_return, # Forum: https://forum.fhem.de/index.php/topic,45671.msg646701.html#msg646701 # 2.2.1 15.05.2017 avoid FW_detailFn because of FW_deviceOverview is active (double streams in detailview if on) @@ -170,7 +171,7 @@ use Time::HiRes; use HttpUtils; # no if $] >= 5.017011, warnings => 'experimental'; -my $SSCamVersion = "2.2.2"; +my $SSCamVersion = "2.2.3"; # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) my %SSCam_errauthlist = ( @@ -2442,7 +2443,7 @@ sub sscam_camop ($) { } elsif ($OpMode eq "Snap") { # ein Schnappschuß wird ausgelöst $url = "http://$serveraddr:$serverport/webapi/$apitakesnappath?api=\"$apitakesnap\"&dsId=\"0\"&method=\"TakeSnapshot\"&version=\"$apitakesnapmaxver\"&camId=\"$camid\"&blSave=\"true\"&_sid=\"$sid\""; - readingsSingleUpdate($hash,"state", "snap", 0); + readingsSingleUpdate($hash,"state", "snap", 1); readingsSingleUpdate($hash, "LastSnapId", "", 0); } elsif ($OpMode eq "getsnapfilename") { @@ -2992,7 +2993,7 @@ sub sscam_camop_parse ($) { readingsBulkUpdate($hash,"SVScustomPortHttps",$data->{'data'}{'customizedPortHttps'}); readingsBulkUpdate($hash,"SVSlicenseNumber",$data->{'data'}{'liscenseNumber'}); readingsBulkUpdate($hash,"SVSuserPriv",$userPriv); - if($version{"SMALL"}) { + if(defined($version{"SMALL"})) { readingsBulkUpdate($hash,"SVSversion",$version{"MAJOR"}.".".$version{"MINOR"}.".".$version{"SMALL"}."-".$version{"BUILD"}); } else { readingsBulkUpdate($hash,"SVSversion",$version{"MAJOR"}.".".$version{"MINOR"}."-".$version{"BUILD"});