FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

49_SSCAM: V2.2.3, fix if SVSversion small is "0"

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14612 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2017-07-01 08:16:50 +00:00
parent d3691f6447
commit a84944ea0e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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. - new: 00_SmartMeterP1: V1.7 New module for reading elec.+gas smartmeters.
- feature: 93_DbRep: V5.3.1, new commands optimizeTables (MySQL) and vacuum - feature: 93_DbRep: V5.3.1, new commands optimizeTables (MySQL) and vacuum
(SQLite, PostgreSQL) to optimize database (SQLite, PostgreSQL) to optimize database

7
fhem/FHEM/49_SSCam.pm
View File

@ -27,6 +27,7 @@
######################################################################################################################### #########################################################################################################################
# Versions History: # 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, # 2.2.2 11.06.2017 bugfix sscam_login, sscam_login_return,
# Forum: https://forum.fhem.de/index.php/topic,45671.msg646701.html#msg646701 # 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) # 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; use HttpUtils;
# no if $] >= 5.017011, warnings => 'experimental'; # no if $] >= 5.017011, warnings => 'experimental';
my $SSCamVersion = "2.2.2"; my $SSCamVersion = "2.2.3";
# Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API)
my %SSCam_errauthlist = ( my %SSCam_errauthlist = (
@ -2442,7 +2443,7 @@ sub sscam_camop ($) {
} elsif ($OpMode eq "Snap") { } elsif ($OpMode eq "Snap") {
# ein Schnappschuß wird ausgelöst # 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\""; $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); readingsSingleUpdate($hash, "LastSnapId", "", 0);
} elsif ($OpMode eq "getsnapfilename") { } elsif ($OpMode eq "getsnapfilename") {
@ -2992,7 +2993,7 @@ sub sscam_camop_parse ($) {
readingsBulkUpdate($hash,"SVScustomPortHttps",$data->{'data'}{'customizedPortHttps'}); readingsBulkUpdate($hash,"SVScustomPortHttps",$data->{'data'}{'customizedPortHttps'});
readingsBulkUpdate($hash,"SVSlicenseNumber",$data->{'data'}{'liscenseNumber'}); readingsBulkUpdate($hash,"SVSlicenseNumber",$data->{'data'}{'liscenseNumber'});
readingsBulkUpdate($hash,"SVSuserPriv",$userPriv); readingsBulkUpdate($hash,"SVSuserPriv",$userPriv);
if($version{"SMALL"}) { if(defined($version{"SMALL"})) {
readingsBulkUpdate($hash,"SVSversion",$version{"MAJOR"}.".".$version{"MINOR"}.".".$version{"SMALL"}."-".$version{"BUILD"}); readingsBulkUpdate($hash,"SVSversion",$version{"MAJOR"}.".".$version{"MINOR"}.".".$version{"SMALL"}."-".$version{"BUILD"});
} else { } else {
readingsBulkUpdate($hash,"SVSversion",$version{"MAJOR"}.".".$version{"MINOR"}."-".$version{"BUILD"}); readingsBulkUpdate($hash,"SVSversion",$version{"MAJOR"}.".".$version{"MINOR"}."-".$version{"BUILD"});