From 6be51be43850c1996ac26e126390b222f0e1bcfd Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Tue, 23 Jun 2020 15:50:33 +0000 Subject: [PATCH] 49_SSCam: contrib 9.3.0 git-svn-id: https://svn.fhem.de/fhem/trunk@22241 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/49_SSCam.pm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/fhem/contrib/DS_Starter/49_SSCam.pm b/fhem/contrib/DS_Starter/49_SSCam.pm index ad30d4c3c..3f0ba5295 100644 --- a/fhem/contrib/DS_Starter/49_SSCam.pm +++ b/fhem/contrib/DS_Starter/49_SSCam.pm @@ -3398,7 +3398,7 @@ sub SSCam_doptzaction { return; } if ($hash->{HELPER}{PTZACTION} eq "goabsptz" && !ReadingsVal("$name", "CapPTZAbs", "false")) { - Log3($name, 2, "$name - ERROR - Operation \"$hash->{HELPER}{PTZACTION}\" is only possible if camera supports absolute PTZ action - please compare with device Reading \"CapPTZAbs\""); + Log3($name, 2, "$name - ERROR - Operation \"$hash->{HELPER}{PTZACTION}\" is only possible if camera supports absolute PTZ action - please compare with Reading \"CapPTZAbs\""); return; } if ( $hash->{HELPER}{PTZACTION} eq "movestart" && ReadingsVal("$name", "CapPTZDirections", "0") < 1) { @@ -7161,7 +7161,7 @@ return $cap; sub SSCam_IsCapZoom { # Zoomeigenschaft my $hash = shift; my $name = $hash->{NAME}; - return 1; + my $cap = ReadingsVal($name, "CapPTZZoom", "false") ne "false" ? 1 : 0; return $cap; @@ -7452,13 +7452,17 @@ sub SSCam_ptzpanel(@) { ## Ausgabe $ptz_ret .= ''; - $ptz_ret .= ""; - $ptz_ret .= ""; - $ptz_ret .= ""; + if($valPresets) { + $ptz_ret .= ""; + $ptz_ret .= ""; + $ptz_ret .= ""; + } - $ptz_ret .= ""; - $ptz_ret .= ""; - $ptz_ret .= ""; + if($valPatrols) { + $ptz_ret .= ""; + $ptz_ret .= ""; + $ptz_ret .= ""; + } if(SSCam_IsCapZoom($hash)) { $ptz_ret .= ""; @@ -7467,7 +7471,6 @@ sub SSCam_ptzpanel(@) { } $ptz_ret .= "
Preset: $Presets
Preset: $Presets
Patrol: $Patrols
Patrol: $Patrols
"; - } if ($rowisset) {