diff --git a/fhem/FHEM/73_GasCalculator.pm b/fhem/FHEM/73_GasCalculator.pm index 63ad2811d..210adf60f 100644 --- a/fhem/FHEM/73_GasCalculator.pm +++ b/fhem/FHEM/73_GasCalculator.pm @@ -769,34 +769,15 @@ sub GasCalculator_Notify($$) Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator End_________________________________________________________________________________________________________________________________"; } - 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)); - } - } - elsif ($attr{$GasCalcName}{ReadingDestination} eq "CounterDevice") + ### If readings exist, update list of available readings + if($GasCalcDev->{READINGS}) { - ### 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}}; + ### 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)); - } - } - else - { + ### Create Log entries for debugging + Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - notify x_sets list: " . join(" ", (keys %GasCalculator_sets)); } return undef; @@ -853,6 +834,8 @@ sub GasCalculator_Notify($$) @@ -864,6 +847,8 @@ sub GasCalculator_Notify($$) @@ -1413,21 +1398,12 @@ sub GasCalculator_Notify($$) - -
@@ -1435,33 +1411,11 @@ sub GasCalculator_Notify($$)
    Die get - Funktion liefert nur den Wert des jeweiligen Readings zurück.
    + Die get - Funktion funktioniert nur für Readings welche im CalculatorDevice gespeichert wurden.
    + Die Readings welche im Counter - Device gespeichert wurden, müssen individuell mit get - Befehl ausgelesen werden.
-