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: entries with loglevl "2" reviewed,changed to loglevl "3"

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10746 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2016-02-07 07:29:01 +00:00
parent b111566b8f
commit 435cdfaaad
2 changed files with 17 additions and 15 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.
- change: 49_SSCAM: entries with loglevl "2" reviewed,changed to loglevl "3"
- feature: 50_TelegramBot receive media files, - feature: 50_TelegramBot receive media files,
send media files directly invocation (PNG, JPG, MP3, PDF, etc) send media files directly invocation (PNG, JPG, MP3, PDF, etc)
etc (see change log in file) etc (see change log in file)

31
fhem/FHEM/49_SSCam.pm
View File

@ -1,4 +1,4 @@
########################################################################################################## ##########################################################################################################
# $Id$ # $Id$
########################################################################################################## ##########################################################################################################
# 49_SSCam.pm # 49_SSCam.pm
@ -27,6 +27,7 @@
########################################################################################################## ##########################################################################################################
# Versions History: # Versions History:
# #
# 1.11.1 07.02.2016 entries with loglevel "2" to loglevel "3" changed
# 1.11 05.02.2016 added function "goPreset" and "goAbsPTZ" to control the move of PTZ lense # 1.11 05.02.2016 added function "goPreset" and "goAbsPTZ" to control the move of PTZ lense
# to absolute positions # to absolute positions
# refere to commandref or have a look in forum at: # refere to commandref or have a look in forum at:
@ -520,7 +521,7 @@ sub watchdogpollcaminfo ($) {
readingsSingleUpdate($hash,"PollState","Active",0); readingsSingleUpdate($hash,"PollState","Active",0);
$logstr = "Polling Camera $camname is currently activated - Pollinginterval: ".$attr{$name}{pollcaminfoall}."s"; $logstr = "Polling Camera $camname is currently activated - Pollinginterval: ".$attr{$name}{pollcaminfoall}."s";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
# in $hash eintragen für späteren Vergleich (Changes von pollcaminfoall) # in $hash eintragen für späteren Vergleich (Changes von pollcaminfoall)
$hash->{HELPER}{OLDVALPOLL} = AttrVal($name, "pollcaminfoall", undef); $hash->{HELPER}{OLDVALPOLL} = AttrVal($name, "pollcaminfoall", undef);
@ -533,7 +534,7 @@ sub watchdogpollcaminfo ($) {
if ($hash->{HELPER}{OLDVALPOLL} != $attr{$name}{pollcaminfoall}) { if ($hash->{HELPER}{OLDVALPOLL} != $attr{$name}{pollcaminfoall}) {
$logstr = "Polling Camera $camname was changed to new Pollinginterval: ".$attr{$name}{pollcaminfoall}."s"; $logstr = "Polling Camera $camname was changed to new Pollinginterval: ".$attr{$name}{pollcaminfoall}."s";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$hash->{HELPER}{OLDVALPOLL} = $attr{$name}{pollcaminfoall}; $hash->{HELPER}{OLDVALPOLL} = $attr{$name}{pollcaminfoall};
&getcaminfoall($hash); &getcaminfoall($hash);
@ -545,7 +546,7 @@ sub watchdogpollcaminfo ($) {
if ($attr{$name}{pollnologging} == "1") { if ($attr{$name}{pollnologging} == "1") {
$logstr = "Log of Polling Camera $camname is currently deactivated"; $logstr = "Log of Polling Camera $camname is currently deactivated";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
# in $hash eintragen für späteren Vergleich (Changes von pollnologging) # in $hash eintragen für späteren Vergleich (Changes von pollnologging)
$hash->{HELPER}{OLDVALPOLLNOLOGGING} = $attr{$name}{pollnologging}; $hash->{HELPER}{OLDVALPOLLNOLOGGING} = $attr{$name}{pollnologging};
@ -553,7 +554,7 @@ sub watchdogpollcaminfo ($) {
} else { } else {
$logstr = "Log of Polling Camera $camname is currently activated"; $logstr = "Log of Polling Camera $camname is currently activated";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
# in $hash eintragen für späteren Vergleich (Changes von pollnologging) # in $hash eintragen für späteren Vergleich (Changes von pollnologging)
$hash->{HELPER}{OLDVALPOLLNOLOGGING} = $attr{$name}{pollnologging}; $hash->{HELPER}{OLDVALPOLLNOLOGGING} = $attr{$name}{pollnologging};
@ -564,7 +565,7 @@ sub watchdogpollcaminfo ($) {
# alter Wert von "pollnologging" war 1 -> Logging war deaktiviert # alter Wert von "pollnologging" war 1 -> Logging war deaktiviert
if ($hash->{HELPER}{OLDVALPOLLNOLOGGING} == "1") { if ($hash->{HELPER}{OLDVALPOLLNOLOGGING} == "1") {
$logstr = "Log of Polling Camera $camname is currently activated"; $logstr = "Log of Polling Camera $camname is currently activated";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$hash->{HELPER}{OLDVALPOLLNOLOGGING} = "0"; $hash->{HELPER}{OLDVALPOLLNOLOGGING} = "0";
} }
@ -956,7 +957,7 @@ sub getcaminfoall ($) {
readingsSingleUpdate($hash,"PollState","Inactive",0); readingsSingleUpdate($hash,"PollState","Inactive",0);
$logstr = "Polling of Camera $camname is deactivated now"; $logstr = "Polling of Camera $camname is deactivated now";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
} }
} }
@ -1873,7 +1874,7 @@ sub camret_nonbl ($) {
# Logausgabe # 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 manually or by stop-command !";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
@ -1899,7 +1900,7 @@ sub camret_nonbl ($) {
# Logausgabe # Logausgabe
$logstr = "Camera $camname Recording stopped"; $logstr = "Camera $camname Recording stopped";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
} }
@ -1913,7 +1914,7 @@ sub camret_nonbl ($) {
# Logausgabe # Logausgabe
$logstr = "Camera $camname exposure mode was set"; $logstr = "Camera $camname exposure mode was set";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
} }
@ -1940,7 +1941,7 @@ sub camret_nonbl ($) {
# Logausgabe # Logausgabe
$logstr = "Snapshot of Camera $camname has been done successfully"; $logstr = "Snapshot of Camera $camname has been done successfully";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
} }
@ -1964,7 +1965,7 @@ sub camret_nonbl ($) {
# Logausgabe # Logausgabe
$logstr = "Camera $camname has been moved to position \"$hash->{HELPER}{GOPRESETNAME}\""; $logstr = "Camera $camname has been moved to position \"$hash->{HELPER}{GOPRESETNAME}\"";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
} }
@ -1988,7 +1989,7 @@ sub camret_nonbl ($) {
# Logausgabe # Logausgabe
$logstr = "Camera $camname has been moved to absolute position \"posX=$hash->{HELPER}{GOPTZPOSX}\" and \"posY=$hash->{HELPER}{GOPTZPOSY}\""; $logstr = "Camera $camname has been moved to absolute position \"posX=$hash->{HELPER}{GOPTZPOSX}\" and \"posY=$hash->{HELPER}{GOPTZPOSY}\"";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
} }
@ -2005,7 +2006,7 @@ sub camret_nonbl ($) {
# Logausgabe # Logausgabe
$logstr = "Camera $camname has been enabled successfully"; $logstr = "Camera $camname has been enabled successfully";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
} }
@ -2022,7 +2023,7 @@ sub camret_nonbl ($) {
# Logausgabe # Logausgabe
$logstr = "Camera $camname has been disabled successfully"; $logstr = "Camera $camname has been disabled successfully";
&printlog($hash,$logstr,"2"); &printlog($hash,$logstr,"3");
$logstr = "--- End Function cam: $OpMode nonblocking ---"; $logstr = "--- End Function cam: $OpMode nonblocking ---";
&printlog($hash,$logstr,"4"); &printlog($hash,$logstr,"4");
} }