diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index c3af45053..d5e285d37 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -164,6 +164,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( + "9.7.20" => "20.09.2020 control parse function by the hparse hash step 3 (refactored getsnapinfo, getsnapgallery, runView Snap) ", "9.7.19" => "18.09.2020 control parse function by the hparse hash step 2 ", "9.7.18" => "16.09.2020 control parse function by the hparse hash ", "9.7.17" => "13.09.2020 optimize _Oprunliveview ", @@ -488,6 +489,9 @@ my %hparse = ( # Ha Getcapabilities => { fn => "_parseGetcapabilities", }, getmotionenum => { fn => "_parsegetmotionenum", }, geteventlist => { fn => "_parsegeteventlist", }, + gopreset => { fn => "_parsegopreset", }, + getsnapinfo => { fn => "_parsegetsnapinfo", }, + getsnapgallery => { fn => "_parsegetsnapgallery", }, ); my %hdt = ( # Delta Timer Hash für Zeitsteuerung der Funktionen @@ -588,6 +592,7 @@ my %sdswfn = ( # Fun # Standardvariablen und Forward-Deklaration my $defSlim = 3; # default Anzahl der abzurufenden Schnappschüsse mit snapGallery +my $defColumns = 3; # default Anzahl der Spalten einer snapGallery my $defSnum = "1,2,3,4,5,6,7,8,9,10"; # mögliche Anzahl der abzurufenden Schnappschüsse mit snapGallery my $compstat = "8.2.8"; # getestete SVS-Version my $valZoom = ".++,+,stop,-,--."; # Inhalt des Setters "setZoom" @@ -831,7 +836,8 @@ sub Define { # Startwerte setzen if(IsModelCam($hash)) { # initiale Webkommandos setzen $attr{$name}{webCmd} = "on:off:snap:enable:disable:runView:stopView"; - } else { + } + else { $attr{$name}{webCmd} = "homeMode"; $attr{$name}{webCmdLabel} = "HomeMode"; } @@ -854,8 +860,8 @@ sub Define { if(IsModelCam($hash)) { readingsBulkUpdate ($hash, "Availability", "???"); # Verfügbarkeit ist unbekannt readingsBulkUpdate ($hash, "state", "off"); # Init für "state" , Problemlösung für setstate, Forum #308 - - } else { + } + else { readingsBulkUpdate ($hash, "state", "Initialized"); # Init für "state" wenn SVS } @@ -997,7 +1003,8 @@ sub FWsummaryFn { $ttsnap = $ttips_en{"ttsnap"}; $ttsnap =~ s/§NAME§/$calias/gx; $ttcmdstop = $ttips_en{"ttcmdstop"}; $ttcmdstop =~ s/§NAME§/$calias/gx; $tthlsreact = $ttips_en{"tthlsreact"}; $tthlsreact =~ s/§NAME§/$calias/gx; - } else { + } + else { $ttrecstart = $ttips_de{"ttrecstart"}; $ttrecstart =~ s/§NAME§/$calias/gx; $ttrecstop = $ttips_de{"ttrecstop"}; $ttrecstop =~ s/§NAME§/$calias/gx; $ttsnap = $ttips_de{"ttsnap"}; $ttsnap =~ s/§NAME§/$calias/gx; @@ -1010,8 +1017,8 @@ sub FWsummaryFn { if($wltype eq "image") { if(ReadingsVal($name, "SVSversion", "") eq "8.2.3-5828" && ReadingsVal($name, "CamVideoType", "") !~ /MJPEG/x) { $ret .= "
Because SVS version 8.2.3-5828 is running you cannot see the MJPEG-Stream. Please upgrade to a higher SVS version !

"; - - } else { + } + else { $ret .= "
"; } @@ -1022,7 +1029,8 @@ sub FWsummaryFn { if(ReadingsVal($d, "Record", "Stop") eq "Stop") { # Aufnahmebutton endlos Start $ret .= "$imgrecendless "; - } else { + } + else { # Aufnahmebutton Stop $ret .= "$imgrecstop "; } @@ -1035,9 +1043,9 @@ sub FWsummaryFn { $ret .= ""; - } - - } elsif($wltype eq "iframe") { + } + } + elsif($wltype eq "iframe") { $ret .= ""; @@ -1047,28 +1055,28 @@ sub FWsummaryFn { $ret .= ""; - } - - } elsif($wltype eq "embed") { + } + } + elsif($wltype eq "embed") { $ret .= ""; if($hash->{HELPER}{AUDIOLINK} && ReadingsVal($d, "CamAudioType", "Unknown") !~ /Unknown/x) { $ret .= ""; - } - - } elsif($wltype eq "link") { + } + } + elsif($wltype eq "link") { $alias = $hash->{HELPER}{ALIAS}; $ret .= "$alias
"; - - } elsif($wltype eq "base64img") { + } + elsif($wltype eq "base64img") { $alias = $hash->{HELPER}{ALIAS}; $ret .= "$alias
"; $ret .= "$imgstop "; $ret .= $imgblank; $ret .= "$imgdosnap "; - - } elsif($wltype eq "hls") { + } + elsif($wltype eq "hls") { $alias = $hash->{HELPER}{ALIAS}; $ret .= "