From 4278b8ca869431a491d945ceea0df9cf8ca0f0e1 Mon Sep 17 00:00:00 2001 From: sailor-fhem <> Date: Tue, 6 Sep 2016 07:35:09 +0000 Subject: [PATCH] 73_GasCalculator: bugfix: get/set list corrected for CounterDevice git-svn-id: https://svn.fhem.de/fhem/trunk@12123 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/73_GasCalculator.pm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/73_GasCalculator.pm b/fhem/FHEM/73_GasCalculator.pm index c1691dc38..63ad2811d 100644 --- a/fhem/FHEM/73_GasCalculator.pm +++ b/fhem/FHEM/73_GasCalculator.pm @@ -769,15 +769,34 @@ sub GasCalculator_Notify($$) Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator End_________________________________________________________________________________________________________________________________"; } - ### If readings exist already, update list of available readings - if($GasCalcDev->{READINGS}) - { - ### Copy readings in list of available "gets" and "sets" - %GasCalculator_gets = %{$GasCalcDev->{READINGS}}; - %GasCalculator_sets = %{$GasCalcDev->{READINGS}}; + if ($attr{$GasCalcName}{ReadingDestination} eq "CalculatorDevice") + { + ### If readings exist, update list of available readings + if($GasCalcDev->{READINGS}) + { + ### Copy readings in list of available "gets" and "sets" + %GasCalculator_gets = %{$GasCalcDev->{READINGS}}; + %GasCalculator_sets = %{$GasCalcDev->{READINGS}}; - ### Create Log entries for debugging - Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - notify x_sets list: " . join(" ", (keys %GasCalculator_sets)); + ### Create Log entries for debugging + Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - notify x_sets list: " . join(" ", (keys %GasCalculator_sets)); + } + } + elsif ($attr{$GasCalcName}{ReadingDestination} eq "CounterDevice") + { + ### If readings exist, update list of available readings + if($GasCountDev->{READINGS}) + { + ### Copy readings in list of available "gets" and "sets" + %GasCalculator_gets = %{$GasCountDev->{READINGS}}; + %GasCalculator_sets = %{$GasCountDev->{READINGS}}; + + ### Create Log entries for debugging + Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - notify x_sets list: " . join(" ", (keys %GasCalculator_sets)); + } + } + else + { } return undef;