From 923aa5b9a6af25be4d5fb847ab3837e2574141b7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 14 Sep 2020 17:49:00 +0000 Subject: [PATCH] 10_ZWave.pm: remove duplicate code git-svn-id: https://svn.fhem.de/fhem/trunk@22771 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_ZWave.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index 948b7eba7..db3b84d31 100644 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -1772,6 +1772,7 @@ my %zwm_unit = ( heating => ["kWh" ], cooling => ["kWh" ] ); +my @meter_type_text = ("undef", "energy", "gas", "water", "heating", "cooling"); sub ZWave_meterParse($$) @@ -1789,7 +1790,6 @@ ZWave_meterParse($$) "undef" : $rate_type_text[$rate_type]); my $meter_type = ($v1 & 0x1f); - my @meter_type_text =("undef", "energy", "gas", "water", "heating","cooling"); my $meter_type_text = ($meter_type > $#meter_type_text ? "undef" : $meter_type_text[$meter_type]); @@ -1843,7 +1843,6 @@ ZWave_meterParse($$) } } -my @meter_type_text =("undef", "energy", "gas", "water", "undef"); sub ZWave_meterSet($$) @@ -6236,7 +6235,7 @@ ZWave_firmwareUpdateParse($$$) The command will reset ALL accumulated values, it is not possible to choose a single value.
  • meterResetToValue type value
    - Reset type (one of energy, gas or water) to the value specified. + Reset type (one of energy,gas,water,heating,cooling) to the value specified. Only supported by METER version 6.


  • Class MULTI_CHANNEL