FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 08:11:44 +00:00
Code Issues Releases Wiki Activity

49_SSCam: contrib 9.3.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22239 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-06-23 11:38:46 +00:00
parent 5f92ed7cb5
commit 74463bfe77
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3987,16 +3987,16 @@ sub SSCam_getptzlistpreset {
RemoveInternalTimer($hash, "SSCam_getptzlistpreset"); RemoveInternalTimer($hash, "SSCam_getptzlistpreset");
return if(IsDisabled($name)); return if(IsDisabled($name));
if (ReadingsVal("$name", "DeviceType", "") 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" | !SSCam_IsCapPTZPan($hash)) { if(!SSCam_IsCapPTZTilt($hash) | !SSCam_IsCapPTZPan($hash)) {
Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname has no capability to tilt/pan"); Log3($name, 4, "$name - Retrieval of Presets for $camname can't be executed - $camname has no capability to tilt/pan");
return; return;
} }
if ($hash->{HELPER}{ACTIVE} eq "off") { if($hash->{HELPER}{ACTIVE} eq "off") {
$hash->{OPMODE} = "Getptzlistpreset"; $hash->{OPMODE} = "Getptzlistpreset";
$hash->{HELPER}{LOGINRETRIES} = 0; $hash->{HELPER}{LOGINRETRIES} = 0;
@ -4019,16 +4019,16 @@ sub SSCam_getptzlistpatrol {
RemoveInternalTimer($hash, "SSCam_getptzlistpatrol"); RemoveInternalTimer($hash, "SSCam_getptzlistpatrol");
return if(IsDisabled($name)); return if(IsDisabled($name));
if (ReadingsVal("$name", "DeviceType", "") 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 Patrols for $camname can't be executed - $camname is not a PTZ-Camera");
return; return;
} }
if (ReadingsVal("$name", "CapPTZTilt", "") eq "false" | !SSCam_IsCapPTZPan($hash)) { if(!SSCam_IsCapPTZTilt($hash) | !SSCam_IsCapPTZPan($hash)) {
Log3($name, 4, "$name - Retrieval of Patrols for $camname can't be executed - $camname has no capability to tilt/pan"); Log3($name, 4, "$name - Retrieval of Patrols for $camname can't be executed - $camname has no capability to tilt/pan");
return; return;
} }
if ($hash->{HELPER}{ACTIVE} ne "on") { if($hash->{HELPER}{ACTIVE} ne "on") {
$hash->{OPMODE} = "Getptzlistpatrol"; $hash->{OPMODE} = "Getptzlistpatrol";
$hash->{HELPER}{LOGINRETRIES} = 0; $hash->{HELPER}{LOGINRETRIES} = 0;
@ -7162,20 +7162,28 @@ sub SSCam_IsCapZoom {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
return 1; return 1;
my $cap = ReadingsVal($name,"CapPTZZoom","false") ne "false" ? 1 : 0; my $cap = ReadingsVal($name, "CapPTZZoom", "false") ne "false" ? 1 : 0;
return $cap; return $cap;
} }
sub SSCam_IsCapPTZPan { # PTZ Eigenschaft sub SSCam_IsCapPTZPan { # PTZ Pan Eigenschaft
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
return 1; my $cap = ReadingsVal($name, "CapPTZPan", "false") ne "false" ? 1 : 0;
my $cap = ReadingsVal($name,"CapPTZPan","false") ne "false" ? 1 : 0;
return $cap; return $cap;
} }
sub SSCam_IsCapPTZTilt { # PTZ Tilt Eigenschaft
my $hash = shift;
my $name = $hash->{NAME};
my $cap = ReadingsVal($name, "CapPTZTilt", "false") ne "false" ? 1 : 0;
return $cap;
}
############################################################################### ###############################################################################
# JSON Boolean Test und Mapping # JSON Boolean Test und Mapping
############################################################################### ###############################################################################