diff --git a/fhem/CHANGED b/fhem/CHANGED index 30573383d..c04920930 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -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. + - bugfix: 49_SSCam: fix warnings - feature: 49_SSCam: support of FTUI Widget with SSCamSTRM, new attributes in SSCamSTRM, some fixes - feature: 71_YAMAHA_NP: Added undocumented reverse-engineered diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 03ec2c9bb..bb7f3e5fb 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; # Versions History intern our %SSCam_vNotesIntern = ( + "8.16.1" => "16.07.2019 fix warnings ", "8.16.0" => "14.07.2019 change detail link generation from SSCamSTRM to SSCam ", "8.15.2" => "14.07.2019 fix order of snaps in snapgallery when adding new snaps, fix english date formating in composegallery, ". "align center of FTUI table, set compatibility to 8.2.5 ", @@ -953,7 +954,6 @@ sub SSCam_Set($@) { if($spec =~ /STRM:/) { $spec =~ m/.*STRM:(.*).*/i; # Snap by SSCamSTRM-Device $hash->{HELPER}{INFORM} = $1; - $hash->{HELPER}{SNAPBYSTRMDEV} = 1; } my $emtxt = AttrVal($name, "snapEmailTxt", ""); @@ -6950,18 +6950,19 @@ return ($ret); ############################################################################### sub SSCam_ptzpanel(@) { my ($name,$ptzcdev,$ptzcontrol,$ftui) = @_; - my $hash = $defs{$name}; - my $iconpath = AttrVal("$name","ptzPanel_iconPath","www/images/sscam"); - my $iconprefix = AttrVal("$name","ptzPanel_iconPrefix","black_btn_"); - my $pbs = AttrVal("$ptzcdev","ptzButtonSize", 100); # Größe der Druckbuttons in % - my $pbsf = AttrVal("$ptzcdev","ptzButtonSizeFTUI", 100); # Größe der Druckbuttons im FTUI in % - my $valPresets = ReadingsVal("$name","Presets",""); - my $valPatrols = ReadingsVal("$name","Patrols",""); - my $rowisset = 0; - my $ptz_ret; - my $row; + my $hash = $defs{$name}; + my $iconpath = AttrVal("$name","ptzPanel_iconPath","www/images/sscam"); + my $iconprefix = AttrVal("$name","ptzPanel_iconPrefix","black_btn_"); + my $valPresets = ReadingsVal("$name","Presets",""); + my $valPatrols = ReadingsVal("$name","Patrols",""); + my $rowisset = 0; + my ($pbs,$pbsf) = ("",""); + my ($row,$ptz_ret); return "" if(SSCam_myVersion($hash) <= 71); + + $pbs = AttrVal("$ptzcdev","ptzButtonSize", 100); # Größe der Druckbuttons in % + $pbsf = AttrVal("$ptzcdev","ptzButtonSizeFTUI", 100); # Größe der Druckbuttons im FTUI in % $ptz_ret = ""; $ptz_ret .= ""; @@ -6973,7 +6974,7 @@ sub SSCam_ptzpanel(@) { next if (!$row); $rowisset = 1; $ptz_ret .= "