From 28fb460bb592fd32363929eed74e6c26fd7e9b2e Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Mon, 2 Mar 2015 20:46:28 +0000
Subject: [PATCH] 10_ZWave.pm: config fixes (Forum #34505)

git-svn-id: https://svn.fhem.de/fhem/trunk@8143 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_ZWave.pm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index ae4a65f2e..dec38347c 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -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