From 6f6d4b45a97ea281cc04142d3c4b051ca661f2d6 Mon Sep 17 00:00:00 2001 From: nasseeder1 <> Date: Mon, 14 Mar 2016 21:37:06 +0000 Subject: [PATCH] 49_SSCAM: routine "initonboot" changed git-svn-id: https://svn.fhem.de/fhem/trunk@11069 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/49_SSCam.pm | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index d38548c83..53ce923ad 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. + - change: 49_SSCAM: routine "initonboot" changed - bugfix: 49_SSCAM: default recordtime 15 s is used if attribute "rectime" is set to "0" - bugfix: YAMAHA_AVR: fix not working navigateListMenu under certain diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index f6864f6ee..14a90790b 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -27,6 +27,7 @@ ########################################################################################################## # Versions History: # +# 1.20.2 14.03.2016 change: routine "initonboot" changed # 1.20.1 12.03.2016 bugfix: default recordtime 15 s is used if attribute "rectime" is set to "0" # 1.20 09.03.2016 command "extevent" added # 1.19.3 07.03.2016 bugfix "uninitialized value $lastrecstarttime", @@ -194,14 +195,10 @@ sub SSCam_Define { readingsEndUpdate($hash,1); getcredentials($hash,1); # Credentials lesen und in RAM laden ($boot=1) - RemoveInternalTimer($hash); # alle Timer löschen - # Subroutine Watchdog-Timer starten (sollen Cam-Infos regelmäßig abgerufen werden ?), verzögerter zufälliger Start 0-60s - InternalTimer(gettimeofday()+int(rand(60)), "watchdogpollcaminfo", $hash, 0); - # initiale Rotinen nach Restart ausführen , verzögerter zufälliger Start - InternalTimer(gettimeofday()+int(rand(10)), "initonboot", $hash, 0); + InternalTimer(gettimeofday()+int(rand(30)), "initonboot", $hash, 0); return undef; } @@ -551,6 +548,10 @@ sub initonboot ($) { getptzlistpatrol($hash); } + + # Subroutine Watchdog-Timer starten (sollen Cam-Infos regelmäßig abgerufen werden ?), verzögerter zufälliger Start 0-60s + InternalTimer(gettimeofday()+int(rand(30)), "watchdogpollcaminfo", $hash, 0); + } else { @@ -2609,7 +2610,7 @@ sub camret_nonbl ($) { } else { - if (AttrVal($name, "rectime", undef) == 0) { + if (defined($attr{$name}{rectime}) && AttrVal($name,"rectime", undef) == 0) { $rectime = 0; } else @@ -2662,7 +2663,7 @@ sub camret_nonbl ($) { readingsEndUpdate($hash, 1); # Logausgabe - $logstr = $rectime != "0" ? "Camera $camname Recording with Recordtime $rectime"."s started" : "Camera $camname endless Recording started - stop it manually or by stop-command !"; + $logstr = $rectime != "0" ? "Camera $camname Recording with Recordtime $rectime"."s started" : "Camera $camname endless Recording started - stop it by stop-command !"; &printlog($hash,$logstr,"3"); $logstr = "--- End Function cam: $OpMode nonblocking ---"; &printlog($hash,$logstr,"4");