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

49_SSCAM: routine "initonboot" changed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11069 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2016-03-14 21:37:06 +00:00
parent 8a8eeac021
commit 6f6d4b45a9
2 changed files with 9 additions and 7 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.
# 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

15
fhem/FHEM/49_SSCam.pm
View File

@ -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");