From 3f346fcbfefea065213375c4053a3846540e5f04 Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Thu, 2 Jan 2014 20:36:35 +0000 Subject: [PATCH] query hardware- and firmwareversion if product code is received git-svn-id: https://svn.fhem.de/fhem/trunk@4534 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/34_SWAP.pm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/34_SWAP.pm b/fhem/FHEM/34_SWAP.pm index 9d114d581..27d78e8bd 100755 --- a/fhem/FHEM/34_SWAP.pm +++ b/fhem/FHEM/34_SWAP.pm @@ -932,14 +932,12 @@ SWAP_Parse($$) $rhash->{product} = $products->{$productcode} if( defined($productcode) && defined($products->{$productcode} ) ); - #SWAP_Set( $rhash, $rname, "getConfig" ) if( !$first ); - SWAP_Set( $rhash, $rname, "statusRequest" ) if( $first ); - } - - if( my $parse = $modules{$rhash->{TYPE}}{SWAP_ParseFn} ) { - no strict "refs"; - &{$parse}($rhash,$reg,$func,$data); - use strict "refs"; + if( $first ) { + SWAP_Set( $rhash, $rname, "statusRequest" ); + } else { + SWAP_Send($rhash, $rhash->{addr}, QUERY, "01" ); + SWAP_Send($rhash, $rhash->{addr}, QUERY, "02" ); + } } my @list; @@ -989,6 +987,12 @@ SWAP_Parse($$) } } + if( my $parse = $modules{$rhash->{TYPE}}{SWAP_ParseFn} ) { + no strict "refs"; + &{$parse}($rhash,$reg,$func,$data); + use strict "refs"; + } + if( !defined($rhash->{SWAP_nonce}) || hex($nonce) < hex($rhash->{SWAP_nonce}) ) { delete( $rhash->{SWAP_MISSED} );