From ce94467cae86bf9b963f31b95bc5702a03ffad7d Mon Sep 17 00:00:00 2001 From: HCS <> Date: Thu, 13 Jul 2017 18:13:29 +0000 Subject: [PATCH] 36_LaCrosseGateway.pm: cleanup for model internal git-svn-id: https://svn.fhem.de/fhem/trunk@14708 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/36_LaCrosseGateway.pm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/36_LaCrosseGateway.pm b/fhem/FHEM/36_LaCrosseGateway.pm index 2045c19dc..2d182e6b2 100644 --- a/fhem/FHEM/36_LaCrosseGateway.pm +++ b/fhem/FHEM/36_LaCrosseGateway.pm @@ -45,7 +45,7 @@ sub LaCrosseGateway_Initialize($) { ." mode:USB,WiFi,Cable" ." usbFlashCommand" ." filter" - ." $readingFnAttributes"; + ." $readingFnAttributes"; } @@ -54,8 +54,7 @@ sub LaCrosseGateway_Fingerprint($$) { } #======================================================================================= -sub LaCrosseGateway_Define($$) { - my ($hash, $def) = @_; +sub LaCrosseGateway_Define($$) {my ($hash, $def) = @_; my @a = split("[ \t][ \t]*", $def); if(@a != 3) { @@ -598,7 +597,20 @@ sub LaCrosseGateway_Parse($$$$) { } if($msg =~ m/^\[LaCrosseITPlusReader.Gateway|\[LaCrosseGateway32 V/) { - $hash->{model} = $msg; + my $model = ""; + my $version = ""; + my $settings = ""; + if($msg =~ m/^\[LaCrosseGateway32 V/) { + ($model, $version, $settings) = split(/ /, $msg, 3); + $model .= " $version"; + } + else { + ($model, $settings) = split(/ /, $msg, 2); + } + $model = substr($model, 1); + + $hash->{model} = $model; + $hash->{settings} = $settings; my $attrVal = AttrVal($name, "timeout", undef); if(defined($attrVal)) {