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: bugfix of get presets, get patrols of zoom-cams

Browse Source 
without pan/tilt

git-svn-id: https://svn.fhem.de/fhem/trunk@12195 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2016-09-23 14:08:27 +00:00
parent 5f82a69a5d
commit 8a2ac76c20
2 changed files with 34 additions and 24 deletions
Show Stats 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. # 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.
- bugfix: 49_SSCam: bugfix of get presets, get patrols of zoom-cams
without pan/tilt
- updated: 74_AMAD: New Version 2.6.3 new Reading userFlowState, - updated: 74_AMAD: New Version 2.6.3 new Reading userFlowState,
new set Command userFlowState, checkAndroidVersion new set Command userFlowState, checkAndroidVersion
on doNotDisturb Reading on doNotDisturb Reading

52
fhem/FHEM/49_SSCam.pm
View File

@ -27,6 +27,7 @@
########################################################################################################## ##########################################################################################################
# Versions History: # Versions History:
# #
# 1.36 18.09.2016 bugfix of get presets, get patrols of zoom-cams without pan/tilt
# 1.35 17.09.2016 internal timer of start-routines optimized # 1.35 17.09.2016 internal timer of start-routines optimized
# 1.34 15.09.2016 simu_SVSversion changed, added 407 errorcode message, external recording changed # 1.34 15.09.2016 simu_SVSversion changed, added 407 errorcode message, external recording changed
# for SVS 7.2 # for SVS 7.2
@ -385,8 +386,8 @@ sub SSCam_Set {
"runView:image,lastrec,lastrec_open,link,link_open ". "runView:image,lastrec,lastrec_open,link,link_open ".
"stopView:noArg ". "stopView:noArg ".
"extevent:1,2,3,4,5,6,7,8,9,10 ". "extevent:1,2,3,4,5,6,7,8,9,10 ".
((ReadingsVal("$name", "DeviceType", "Camera") eq "PTZ") ? "runPatrol:".ReadingsVal("$name", "Patrols", "")." " : ""). ((ReadingsVal("$name", "CapPTZPan", "false") ne "false") ? "runPatrol:".ReadingsVal("$name", "Patrols", "")." " : "").
((ReadingsVal("$name", "DeviceType", "Camera") eq "PTZ") ? "goPreset:".ReadingsVal("$name", "Presets", "")." " : ""). ((ReadingsVal("$name", "CapPTZPan", "false") ne "false") ? "goPreset:".ReadingsVal("$name", "Presets", "")." " : "").
((ReadingsVal("$name", "CapPTZAbs", "false")) ? "goAbsPTZ"." " : ""). ((ReadingsVal("$name", "CapPTZAbs", "false")) ? "goAbsPTZ"." " : "").
((ReadingsVal("$name", "CapPTZDirections", "0") > 0) ? "move"." " : ""); ((ReadingsVal("$name", "CapPTZDirections", "0") > 0) ? "move"." " : "");
@ -615,10 +616,10 @@ sub SSCam_Get {
if ($opt eq "caminfoall") if ($opt eq "caminfoall")
{ {
# "1" ist Statusbit für manuelle Abfrage, kein Einstieg in Pollingroutine # "1" ist Statusbit für manuelle Abfrage, kein Einstieg in Pollingroutine
&getcaminfoall($hash,1); getcaminfoall($hash,1);
} elsif ($opt eq "svsinfo") { } elsif ($opt eq "svsinfo") {
&getsvsinfo($hash); getsvsinfo($hash);
} elsif ($opt eq "snapfileinfo") { } elsif ($opt eq "snapfileinfo") {
if (!ReadingsVal("$name", "LastSnapId", undef)) {return "Reading LastSnapId is empty - please take a snapshot before !"} if (!ReadingsVal("$name", "LastSnapId", undef)) {return "Reading LastSnapId is empty - please take a snapshot before !"}
@ -949,7 +950,7 @@ sub camstartrec ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1008,7 +1009,7 @@ sub camstoprec ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1062,7 +1063,7 @@ sub camexpmode ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1117,7 +1118,7 @@ sub cammotdetsc ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1173,7 +1174,7 @@ sub camsnap ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1231,7 +1232,7 @@ sub runliveview ($) {
readingsSingleUpdate($hash,"state","startview",1); readingsSingleUpdate($hash,"state","startview",1);
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1460,7 +1461,7 @@ sub doptzaction ($) {
$hash->{OPMODE} = $hash->{HELPER}{PTZACTION}; $hash->{OPMODE} = $hash->{HELPER}{PTZACTION};
$hash->{HELPER}{ACTIVE} = "on"; $hash->{HELPER}{ACTIVE} = "on";
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
@ -1490,7 +1491,7 @@ sub movestop ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");; Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");;
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1522,7 +1523,7 @@ sub camenable ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1554,7 +1555,7 @@ sub camdisable ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1640,7 +1641,7 @@ sub getsvsinfo ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1795,7 +1796,7 @@ sub getcapabilities ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1815,11 +1816,14 @@ sub getptzlistpreset ($) {
return if(IsDisabled($name)); return if(IsDisabled($name));
if (defined(ReadingsVal("$name", "DeviceType", undef)) and ReadingsVal("$name", "DeviceType", undef) ne "PTZ") { if (ReadingsVal("$name", "DeviceType", "") ne "PTZ") {
Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname is not a PTZ-Camera"); Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname is not a PTZ-Camera");
return; return;
} }
if (ReadingsVal("$name", "CapPTZTilt", "") eq "false" | ReadingsVal("$name", "CapPTZPan", "") eq "false") {
Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname has no capability to tilt/pan");
return;
}
if ($hash->{HELPER}{ACTIVE} eq "off") { if ($hash->{HELPER}{ACTIVE} eq "off") {
# PTZ-ListPresets abrufen # PTZ-ListPresets abrufen
Log3($name, 4, "$name - Retrieval PTZ-ListPresets of $camname starts now"); Log3($name, 4, "$name - Retrieval PTZ-ListPresets of $camname starts now");
@ -1831,7 +1835,7 @@ sub getptzlistpreset ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {
@ -1852,8 +1856,12 @@ sub getptzlistpatrol ($) {
return if(IsDisabled($name)); return if(IsDisabled($name));
if (defined(ReadingsVal("$name", "DeviceType", undef)) and ReadingsVal("$name", "DeviceType", undef) ne "PTZ") { if (ReadingsVal("$name", "DeviceType", "") ne "PTZ") {
Log3($name, 4, "$name - Retrieval of Patrols for $camname can't be executed - $camname is not a PTZ-Camera"); Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname is not a PTZ-Camera");
return;
}
if (ReadingsVal("$name", "CapPTZTilt", "") eq "false" | ReadingsVal("$name", "CapPTZPan", "") eq "false") {
Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname has no capability to tilt/pan");
return; return;
} }
@ -1868,7 +1876,7 @@ sub getptzlistpatrol ($) {
Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}"); Log3($name, 3, "$name - Active-Token was set by OPMODE: $hash->{OPMODE}");
} }
&getapisites_nonbl($hash); getapisites_nonbl($hash);
} }
else else
{ {