FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-30 18:12:28 +00:00
Code Issues Releases Wiki Activity

49_SSCAM: add blank line in set runView, goPreset, runPatrol

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27053 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2023-01-14 13:00:46 +00:00
parent 374de25a52
commit b9510a94c3
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fhem/FHEM/49_SSCam.pm
View File

@ -185,7 +185,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"9.10.8" => "14.01.2023 add blank line in setter runView ", "9.10.8" => "14.01.2023 add blank line in setter runView, goPreset, runPatrol ",
"9.10.7" => "02.08.2022 allow placeholders #CAM, #DATE, #TIME, #FILE, #CTIME (also for Email) ", "9.10.7" => "02.08.2022 allow placeholders #CAM, #DATE, #TIME, #FILE, #CTIME (also for Email) ",
"9.10.6" => "18.07.2022 textField-long property set for recChatTxt, recEmailTxt, recTelegramTxt, snapChatTxt, snapEmailTxt, snapTelegramTxt, ". "9.10.6" => "18.07.2022 textField-long property set for recChatTxt, recEmailTxt, recTelegramTxt, snapChatTxt, snapEmailTxt, snapTelegramTxt, ".
"set 'part1type' to default => text/html instead of text/plain", "set 'part1type' to default => text/html instead of text/plain",
@ -1579,30 +1579,31 @@ sub Set {
} elsif(IsModelCam($hash)) { } elsif(IsModelCam($hash)) {
# selist für Cams # selist für Cams
my $hlslfw = IsCapHLS($hash) ? ",live_fw_hls," : ","; my $hlslfw = IsCapHLS($hash) ? ",live_fw_hls," : ",";
$setlist = "Unknown argument $opt, choose one of ". $setlist = "Unknown argument $opt, choose one of ".
"createSnapGallery:noArg ".
"createStreamDev:generic,hls,lastsnap,mjpeg,switched ".
"createReadingsGroup ".
"credentials ". "credentials ".
"smtpcredentials ". "disable:noArg ".
"enable:noArg ".
"expmode:auto,day,night ". "expmode:auto,day,night ".
"on ".
"off:noArg ".
"motdetsc:disable,camera,SVS ". "motdetsc:disable,camera,SVS ".
"snap ". "snap ".
(AttrVal($name, "snapGalleryBoost",0) ? (AttrVal($name,"snapGalleryNumber",undef) || AttrVal($name,"snapGalleryBoost",0)) ? "snapGallery:noArg " : "snapGallery:$defSnum " : " "). (AttrVal($name, "snapGalleryBoost",0) ? (AttrVal($name,"snapGalleryNumber",undef) || AttrVal($name,"snapGalleryBoost",0)) ? "snapGallery:noArg " : "snapGallery:$defSnum " : " ").
"createReadingsGroup ". "on ".
"createSnapGallery:noArg ". "off:noArg ".
"createStreamDev:generic,hls,lastsnap,mjpeg,switched ".
"enable:noArg ".
"disable:noArg ".
"optimizeParams ". "optimizeParams ".
"runView:#,live_fw".$hlslfw."live_link,live_open,lastrec_fw,lastrec_fw_MJPEG,lastrec_fw_MPEG4/H.264,lastrec_open,lastsnap_fw ". "runView:#,live_fw".$hlslfw."live_link,live_open,lastrec_fw,lastrec_fw_MJPEG,lastrec_fw_MPEG4/H.264,lastrec_open,lastsnap_fw ".
"stopView:noArg ". "stopView:noArg ".
"smtpcredentials ".
(IsCapPTZObjTrack($hash) ? "startTracking:noArg " : ""). (IsCapPTZObjTrack($hash) ? "startTracking:noArg " : "").
(IsCapPTZObjTrack($hash) ? "stopTracking:noArg " : ""). (IsCapPTZObjTrack($hash) ? "stopTracking:noArg " : "").
(IsCapPTZPan($hash) ? "setPreset ": ""). (IsCapPTZPan($hash) ? "setPreset ": "").
(IsCapPTZPan($hash) ? "setHome:---currentPosition---,".ReadingsVal("$name","Presets","")." " : ""). (IsCapPTZPan($hash) ? "setHome:---currentPosition---,".ReadingsVal("$name","Presets","")." " : "").
(IsCapPTZPan($hash) ? "delPreset:".ReadingsVal("$name","Presets","")." " : ""). (IsCapPTZPan($hash) ? "delPreset:".ReadingsVal("$name","Presets","")." " : "").
(IsCapPTZPan($hash) ? "runPatrol:".ReadingsVal("$name", "Patrols", "")." " : ""). (IsCapPTZPan($hash) ? "runPatrol:#,".ReadingsVal("$name", "Patrols", "")." " : "").
(IsCapPTZPan($hash) ? "goPreset:".ReadingsVal("$name", "Presets", "")." " : ""). (IsCapPTZPan($hash) ? "goPreset:#,".ReadingsVal("$name", "Presets", "")." " : "").
(IsCapPTZ($hash) ? "createPTZcontrol:noArg " : ""). (IsCapPTZ($hash) ? "createPTZcontrol:noArg " : "").
(IsCapPTZAbs($hash) ? "goAbsPTZ"." " : ""). (IsCapPTZAbs($hash) ? "goAbsPTZ"." " : "").
(IsCapPTZDir($hash) ? "move"." " : ""). (IsCapPTZDir($hash) ? "move"." " : "").
@ -9104,12 +9105,13 @@ sub ptzPanel {
my $ftui = $paref->{ftui}; my $ftui = $paref->{ftui};
my $hash = $defs{$name}; my $hash = $defs{$name};
my $iconpath = AttrVal ("$name", "ptzPanel_iconPath", "www/images/sscam"); my $iconpath = AttrVal ("$name", 'ptzPanel_iconPath', 'www/images/sscam');
my $iconprefix = AttrVal ("$name", "ptzPanel_iconPrefix", "black_btn_" ); my $iconprefix = AttrVal ("$name", 'ptzPanel_iconPrefix', 'black_btn_');
my $valPresets = ReadingsVal("$name", "Presets", "" ); my $valPresets = '#,'.ReadingsVal("$name", 'Presets', '');
my $valPatrols = ReadingsVal("$name", "Patrols", "" ); my $valPatrols = '#,'.ReadingsVal("$name", 'Patrols', '');
my $rowisset = 0; my $rowisset = 0;
my ($pbs,$pbsf) = ("",""); my ($pbs,$pbsf) = ("","");
my ($row,$ptz_ret); my ($row,$ptz_ret);
return "" if(myVersion($hash) <= 71); return "" if(myVersion($hash) <= 71);
@ -9136,9 +9138,10 @@ sub ptzPanel {
$rownr = sprintf("%2.2d",$rownr); $rownr = sprintf("%2.2d",$rownr);
$row = AttrVal("$name","ptzPanel_row$rownr",undef); $row = AttrVal("$name","ptzPanel_row$rownr",undef);
next if (!$row); next if (!$row);
$rowisset = 1; $rowisset = 1;
$ptz_ret .= "<tr>"; $ptz_ret .= "<tr>";
my @btn = split (",",$row); # die Anzahl Buttons in einer Reihe my @btn = split (",",$row); # die Anzahl Buttons in einer Reihe
for my $btnnr (0..$#btn) { for my $btnnr (0..$#btn) {
$ptz_ret .= "<td class='ptzcontrol'>"; $ptz_ret .= "<td class='ptzcontrol'>";
@ -9206,6 +9209,7 @@ sub ptzPanel {
} }
else { # $FW_ME = URL-Pfad unter dem der FHEMWEB-Server via HTTP erreichbar ist, z.B. /fhem else { # $FW_ME = URL-Pfad unter dem der FHEMWEB-Server via HTTP erreichbar ist, z.B. /fhem
my $iPath = FW_iconPath($img); # automatisches Suchen der Icons im FHEMWEB iconPath my $iPath = FW_iconPath($img); # automatisches Suchen der Icons im FHEMWEB iconPath
if($iPath) { if($iPath) {
$iPath = "$FW_ME/$FW_icondir/$iPath"; $iPath = "$FW_ME/$FW_icondir/$iPath";
} }
@ -9225,7 +9229,6 @@ sub ptzPanel {
$cmd1 = "ftui.setFhemStatus('set $name setZoom $cmd')" if($ftui); $cmd1 = "ftui.setFhemStatus('set $name setZoom $cmd')" if($ftui);
$ptz_ret .= "<a onClick=\"$cmd1\">$img</a>"; $ptz_ret .= "<a onClick=\"$cmd1\">$img</a>";
$ptz_ret .= "</td>"; $ptz_ret .= "</td>";
} }
@ -9294,7 +9297,7 @@ sub ptzPanel {
return $ptz_ret; return $ptz_ret;
} }
else { else {
return ""; return '';
} }
} }