Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

49_SSCam: contrib 8.14.2

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19740 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-06-28 19:36:00 +00:00
parent a3ca42ac8b
commit bcc1ff9591
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
# Versions History intern # Versions History intern
our %SSCam_vNotesIntern = ( our %SSCam_vNotesIntern = (
"8.14.2" => "28.06.2019 increase get SID timeout to at least 60 s, set compatibility to SVS 8.2.4, improve disable/enable behavior ",
"8.14.1" => "23.06.2019 Presets and Patrols containing spaces in its names are replaced by \"_\", deletion of Presets corrected ". "8.14.1" => "23.06.2019 Presets and Patrols containing spaces in its names are replaced by \"_\", deletion of Presets corrected ".
"bugfix userattr when changing Prests ", "bugfix userattr when changing Prests ",
"8.14.0" => "01.06.2019 Link to Cam/SVS-Setup Screen and online help in Detailview ", "8.14.0" => "01.06.2019 Link to Cam/SVS-Setup Screen and online help in Detailview ",
@ -265,7 +266,7 @@ our %SSCam_vNotesExtern = (
); );
# getestete SVS-Version # getestete SVS-Version
my $compstat = "8.2.3"; my $compstat = "8.2.4";
# Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API)
my %SSCam_errauthlist = ( my %SSCam_errauthlist = (
@ -630,6 +631,12 @@ sub SSCam_Attr($$$$) {
} else { } else {
$val = ($do == 1 ? "disabled" : "initialized"); $val = ($do == 1 ? "disabled" : "initialized");
} }
if ($do == 1) {
RemoveInternalTimer($hash);
} else {
InternalTimer(gettimeofday()+int(rand(30)), "SSCam_initonboot", $hash, 0);
}
readingsSingleUpdate($hash, "state", $val, 1); readingsSingleUpdate($hash, "state", $val, 1);
readingsSingleUpdate($hash, "PollState", "Inactive", 1) if($do == 1); readingsSingleUpdate($hash, "PollState", "Inactive", 1) if($do == 1);
@ -4562,7 +4569,7 @@ sub SSCam_camop ($) {
Log3($name, 4, "$name - --- Begin Function $OpMode nonblocking ---"); Log3($name, 4, "$name - --- Begin Function $OpMode nonblocking ---");
$httptimeout = AttrVal($name, "httptimeout", 4); $httptimeout = AttrVal($name, "httptimeout", 4);
$httptimeout = $httptimeout+90 if($OpMode =~ /setoptpar|Disable/); # setzen der Optimierungsparameter/Disable 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"); Log3($name, 5, "$name - HTTP-Call will be done with httptimeout-Value: $httptimeout s");
@ -6355,8 +6362,9 @@ sub SSCam_login ($$) {
return; return;
} }
my $httptimeout = AttrVal($name,"httptimeout",4); my $httptimeout = AttrVal($name,"httptimeout",60);
Log3($name, 5, "$name - HTTP-Call login will be done with httptimeout-Value: $httptimeout s"); $httptimeout = 60 if($httptimeout < 60);
Log3($name, 4, "$name - HTTP-Call login will be done with httptimeout-Value: $httptimeout s");
my $urlwopw; # nur zur Anzeige bei verbose >= 4 und "showPassInLog" == 0 my $urlwopw; # nur zur Anzeige bei verbose >= 4 und "showPassInLog" == 0