FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

10_ZWave.pm: config fixes (Forum #34505)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8143 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-03-02 20:46:28 +00:00
parent 2c47bd920a
commit 3855bc197a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/10_ZWave.pm
View File

@ -810,8 +810,9 @@ sub
ZWave_cleanString($$)
{
my ($c, $postfix) = @_;
$c =~ s/[^A-Z]+(.)/uc($1)/gei;
$c =~ s/[^A-Z]//i;
$c =~ s/^[0-9.]+ //g;
$c =~ s/[^A-Z0-9]+/ /ig;
$c =~ s/ (.)/uc($1)/gei;
my $shortened=0;
while(length($c) > 32) { # might be endless loop
$c =~ s/[A-Z][^A-Z]*$//;
@ -922,13 +923,9 @@ ZWave_configCheckParam($$$$@)
}
return ("Parameter is not decimal", "") if($arg[0] !~ m/^[0-9]+$/);
if($t eq "short") {
return ("", sprintf("04%02x02%04x", $h->{index}, $arg[0]));
}
if($t eq "byte") {
return ("", sprintf("04%02x01%02x", $h->{index}, $arg[0]));
}
return ("", sprintf("04%02x01%02x", $h->{index}, $arg[0]));
my $len = ($t eq "int" ? 8 : ($t eq "short" ? 4 : 2));
return ("", sprintf("04%02x02%0*x", $h->{index}, $len, $arg[0]));
}
sub