mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

49_SSCam: V7.0.1, enable/disable issue

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17218 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2018-08-27 19:47:40 +00:00
parent 12f06ad9d6
commit 306d668520
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@@ -1,5 +1,7 @@
# 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: V7.0.1, enable/disable issue
(forum.fhem.de/index.php/topic,45671.msg830869.html#msg830869)
- change: 98_DOIFtools: add help labels in commandref for attr, set and get
add MODEL to statistics report, check DOIF excludes Perl mode
- new: 98_MSwitch.pm: Multi Switch Modul

15
fhem/FHEM/49_SSCam.pm
View File

@@ -27,6 +27,7 @@
#########################################################################################################################
# Versions History:
#
# 7.0.1 27.08.2018 enable/disable issue (https://forum.fhem.de/index.php/topic,45671.msg830869.html#msg830869)
# 7.0.0 27.07.2018 compatibility to API v2.8
# 6.0.1 04.07.2018 Reading CamFirmware
# 6.0.0 03.07.2018 HTTPS Support, buttons for refresh SSCamSTRM-devices
@@ -3747,7 +3748,7 @@ sub SSCam_camop ($) {
Log3($name, 4, "$name - --- Begin Function $OpMode nonblocking ---");
$httptimeout = AttrVal($name, "httptimeout", 4);
$httptimeout = $httptimeout+90 if($OpMode eq "setoptpar"); # setzen der Optimierungsparameter dauert lange !
$httptimeout = $httptimeout+90 if($OpMode =~ /setoptpar|Disable/); # setzen der Optimierungsparameter/Disable dauert lange !
Log3($name, 5, "$name - HTTP-Call will be done with httptimeout-Value: $httptimeout s");
@@ -4698,11 +4699,6 @@ sub SSCam_camop_parse ($) {
# Logausgabe
Log3($name, 3, "$name - Camera $camname has been enabled successfully");
# Token freigeben vor nächstem Kommando
$hash->{HELPER}{ACTIVE} = "off";
# neuen Status abrufen
SSCam_getcaminfo($hash);
} elsif ($OpMode eq "Disable") {
# Kamera wurde deaktiviert
@@ -4716,11 +4712,6 @@ sub SSCam_camop_parse ($) {
# Logausgabe
Log3($name, 3, "$name - Camera $camname has been disabled successfully");
# Token freigeben vor nächstem Kommando
$hash->{HELPER}{ACTIVE} = "off";
# neuen Status abrufen
SSCam_getcaminfo($hash);
} elsif ($OpMode eq "getsvsinfo") {
# Parse SVS-Infos
@@ -4881,7 +4872,7 @@ sub SSCam_camop_parse ($) {
$deviceType = "Fisheye";
}
$camStatus = $data->{'data'}->{'cameras'}->[0]->{'camStatus'};
$camStatus = SSCam_jboolmap($data->{'data'}->{'cameras'}->[0]->{'camStatus'});
if ($camStatus eq "1") {
$camStatus = "enabled";