Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

10_ZWave.pm: accept (again) text parameter for config commands

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8501 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-04-30 12:25:35 +00:00
parent 394abe295b
commit c5dbfe043c
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/10_ZWave.pm
View File

@ -31,18 +31,14 @@ my %zwave_class = (
ZIP_SERVER => { id => '24', }, ZIP_SERVER => { id => '24', },
SWITCH_BINARY => { id => '25', SWITCH_BINARY => { id => '25',
set => { off => "0100", set => { off => "0100",
on => "01FF", on => "01FF" },
reportOn => "03FF",
reportOff => "0300", },
get => { swbStatus => "02", }, get => { swbStatus => "02", },
parse => { "03250300" => "state:off", parse => { "03250300" => "state:off",
"032503ff" => "state:on", }, } , "032503ff" => "state:on", }, } ,
SWITCH_MULTILEVEL => { id => '26', SWITCH_MULTILEVEL => { id => '26',
set => { off => "0100", set => { off => "0100",
on => "01FF", on => "01FF",
dim => "01%02x", dim => "01%02x" },
reportOn => "03FF",
reportOff => "0300", },
get => { swmStatus => "02", }, get => { swmStatus => "02", },
parse => { "032603(.*)"=> '($1 eq "00" ? "state:off" : parse => { "032603(.*)"=> '($1 eq "00" ? "state:off" :
($1 eq "ff" ? "state:on" : ($1 eq "ff" ? "state:on" :
@ -508,7 +504,7 @@ ZWave_Cmd($$@)
return "$type $cmd needs $parTxt" if($nArg != int(@a)); return "$type $cmd needs $parTxt" if($nArg != int(@a));
} }
if($cmdFmt !~ m/%s/) { if($cmdFmt !~ m/%s/ && $cmd !~ m/^config/) {
for(my $i1 = 0; $i1<int(@a); $i1++) { for(my $i1 = 0; $i1<int(@a); $i1++) {
return "Error: $a[$i1] is not a decimal number" return "Error: $a[$i1] is not a decimal number"
if($a[$i1] !~ m/^[-\d]+$/); if($a[$i1] !~ m/^[-\d]+$/);
@ -1696,12 +1692,9 @@ s2Hex($)
switch the device on</li> switch the device on</li>
<li>off<br> <li>off<br>
switch the device off</li> switch the device off</li>
<li>reportOn,reportOff<br>
activate/deactivate the reporting of device state changes to the
association group.</li>
<br><br><b>Class SWITCH_MULTILEVEL</b> <br><br><b>Class SWITCH_MULTILEVEL</b>
<li>on, off, reportOn, reportOff<br> <li>on, off<br>
the same as for SWITCH_BINARY.</li> the same as for SWITCH_BINARY.</li>
<li>dim value<br> <li>dim value<br>
dim to the requested value (0..100)</li> dim to the requested value (0..100)</li>