Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

10:ZWave.pm: display the help from the OZW MetaDataItem (Forum #100280)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@19972 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-08-09 20:21:17 +00:00
parent 8feaeea03f
commit 82878a16c4
1 changed files with 59 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
FHEM/10_ZWave.pm
View File

@ -2690,8 +2690,31 @@ ZWave_configParseModel($;$)
my $partial="";
my $bsHelp="";
my %OZW;
while($gz->gzreadline($line)) {
last if($line =~ m+^\s*</Product>+);
if($line =~ m,<(Help|MetaDataItem)>, &&
$line !~ m,</(Help|MetaDataItem)>,) { # Multiline Help
$partial = $line;
next;
}
if($partial) {
if($line =~ m,</(Help|MetaDataItem)>,) {
$line = $partial.$line;
$line =~ s/[\r\n]//gs;
$partial = "";
} else {
$partial .= $line;
next;
}
}
if($line =~ m+<MetaDataItem.*name="(.*?)".*>(.*)</MetaDataItem>+s) {
$OZW{$1} = $2;
}
if($line =~ m/^\s*<CommandClass.*id="([^"]*)"(.*)$/) {
$class = $1;
$classInfo{$class} = $2;
@ -2729,20 +2752,6 @@ ZWave_configParseModel($;$)
$bsHelp = "Bit $1: ";
next;
}
if($line =~ m,<Help>, && $line !~ m,</Help>,) { # Multiline Help
$partial = $line;
next;
}
if($partial) {
if($line =~ m,</Help>,) {
$line = $partial.$line;
$line =~ s/[\r\n]//gs;
$partial = "";
} else {
$partial .= $line;
next;
}
}
if($line =~ m+<Help>(.*)</Help>+s) {
$hash{$cmdName}{Help} .= "$bsHelp$1<br>";
@ -2778,6 +2787,16 @@ ZWave_configParseModel($;$)
$zwave_cmdArgs{get}{$caName} = "noArg";
}
if(%OZW) {
my $OZW="";
foreach my $k (sort keys %OZW) {
my $v = $OZW{$k};
$v = "<a target='_blank' href='$v'>$v</a>" if($v =~ m+http.*://+);
$OZW .= "<h4>$k</h4><ul>$v</ul>";
}
$mc{OZW} = $OZW;
}
$zwave_modelConfig{$cfg} = \%mc;
Log 3, "ZWave got config for $cfg from $fn" if($ret);
return $ret;
@ -5266,6 +5285,7 @@ ZWave_helpFn($$)
my ($d,$cmd) = @_;
my $mc = ZWave_configGetHash($defs{$d});
return "" if(!$mc);
return $mc->{OZW} if($cmd eq "OZW" && $mc->{OZW});
my $h = $mc->{config}{$cmd};
return "" if(!$h || !$h->{Help});
$cmd .= " (numeric code $h->{index})" if(defined($h->{index}));
@ -5323,10 +5343,19 @@ ZWave_fhemwebFn($$$$)
my $url = ($n eq "alliance" ?
"http://products.z-wavealliance.org/products/" :
"http://devel.pepper1.net/zwavedb/device/");
$pl .= "<a target='_blank' href='$url/$link'>Details in $n DB</a>";
$pl .= "<a target='_blank' href='$url/$link'>Details:$n</a>";
$pl .= "</div>";
}
if(ReadingsVal($d, "modelConfig", undef)) {
my $mc = ZWave_configGetHash($defs{$d});
if($mc && $mc->{OZW}) {
$pl .= "<div class='detLink ZWPepper'>";
$pl .= "<a id='details_ozw' href='#'>Details:OZW</a>";
$pl .= "</div>";
}
}
my $img = ZWave_getPic($iodev, lc($model));
if($img && !$FW_ss) {
$pl .= "<div class='img'".($FW_tp?"":" style='float:right'").">";
@ -5337,20 +5366,29 @@ ZWave_fhemwebFn($$$$)
return
"<div id='ZWHelp' class='makeTable help'></div>$pl".
'<script type="text/javascript">'.
"var zwaveDevice='$d', FW_tp='$FW_tp';" . <<'JSEND'
"var zwd='$d', FW_tp='$FW_tp';" . <<'JSEND'
$(document).ready(function() {
$("div#ZWHelp").insertBefore("div.makeTable.internals"); // Move
$("div.detLink.ZWPepper").insertAfter("div.detLink.devSpecHelp");
if(FW_tp) $("div.img.ZWPepper").appendTo("div#menu");
$("select.set,select.get").each(function(){
$(this).get(0).setValueFn = function(val) {
$("div#ZWHelp").html(val);
}
var ss = $(this).get(0);
ss.setValueFn = function(val) { $("div#ZWHelp").html(val); }
$(this).change(function(){
FW_queryValue('{ZWave_helpFn("'+zwaveDevice+'","'+$(this).val()+'")}',
$(this).get(0));
FW_queryValue('{ZWave_helpFn("'+zwd+'","'+$(this).val()+'")}', ss);
});
});
$("a#details_ozw").click(function(){
if($("#devSpecHelp").length) {
$("#devSpecHelp").remove();
return;
}
$("#content").append('<div id="devSpecHelp"></div>');
var dsh = $("#devSpecHelp").get(0);
dsh.setValueFn = function(val) { $("#devSpecHelp").html(val); }
FW_queryValue('{ZWave_helpFn("'+zwd+'","OZW")}', dsh);
});
});
</script>
JSEND