FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

10_ZWave.pm: separate config help for separate models (Forum #49165)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10869 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-02-18 08:39:00 +00:00
parent 4022a5b4ca
commit 8ad85a3010
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/10_ZWave.pm
View File

@ -743,13 +743,20 @@ ZWave_Cmd($$@)
if(!$cmdList{$cmd}) { if(!$cmdList{$cmd}) {
my @list; my @list;
my $mc = ReadingsVal($hash->{NAME}, "modelConfig", "");
foreach my $lcmd (sort keys %cmdList) { foreach my $lcmd (sort keys %cmdList) {
if($zwave_cmdArgs{$type}{$lcmd}) { if($mc && $zwave_cmdArgs{$type}{"$mc$lcmd"}) {
push @list, "$lcmd:".$zwave_cmdArgs{$type}{"$mc$lcmd"};
} elsif($zwave_cmdArgs{$type}{$lcmd}) {
push @list, "$lcmd:$zwave_cmdArgs{$type}{$lcmd}"; push @list, "$lcmd:$zwave_cmdArgs{$type}{$lcmd}";
} elsif($cmdList{$lcmd}{fmt} !~ m/%/) { } elsif($cmdList{$lcmd}{fmt} !~ m/%/) {
push @list, "$lcmd:noArg"; push @list, "$lcmd:noArg";
} else { } else {
push @list, $lcmd; push @list, $lcmd;
} }
} }
my $list = join(" ",@list); my $list = join(" ",@list);
@ -2326,9 +2333,10 @@ ZWave_configParseModel($;$)
$mc{set}{$cmd} = $arg if(!$h->{read_only} || $h->{read_only} ne "true"); $mc{set}{$cmd} = $arg if(!$h->{read_only} || $h->{read_only} ne "true");
$mc{get}{$cmd} ="noArg" if(!$h->{write_only} || $h->{write_only} ne "true"); $mc{get}{$cmd} ="noArg" if(!$h->{write_only} || $h->{write_only} ne "true");
$mc{config}{$cmd} = $h; $mc{config}{$cmd} = $h;
$zwave_cmdArgs{set}{$cmd} = join(",", keys %{$h->{Item}}) if($h->{Item}); my $caName = "$cfg$cmd";
$zwave_cmdArgs{set}{$cmd} = "noArg" if($h->{type} eq "button"); $zwave_cmdArgs{set}{$caName} = join(",", keys %{$h->{Item}}) if($h->{Item});
$zwave_cmdArgs{get}{$cmd} = "noArg"; $zwave_cmdArgs{set}{$caName} = "noArg" if($h->{type} eq "button");
$zwave_cmdArgs{get}{$caName} = "noArg";
} }
$zwave_modelConfig{$cfg} = \%mc; $zwave_modelConfig{$cfg} = \%mc;