From 3377d1d25b1e077900ee124678fff053f02ee055 Mon Sep 17 00:00:00 2001 From: tpoitzsch <> Date: Sat, 29 Aug 2015 15:24:26 +0000 Subject: [PATCH] LUXTRONIK: Replaced with set hotWaterCircPumpDeaerate on|off git-svn-id: https://svn.fhem.de/fhem/trunk@9156 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/23_LUXTRONIK2.pm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/fhem/FHEM/23_LUXTRONIK2.pm b/fhem/FHEM/23_LUXTRONIK2.pm index 1e8e3622b..d6e0fc8aa 100644 --- a/fhem/FHEM/23_LUXTRONIK2.pm +++ b/fhem/FHEM/23_LUXTRONIK2.pm @@ -307,21 +307,21 @@ LUXTRONIK2_Set($$@) $hash->{LOCAL} = 0; return $resultStr; } - elsif( int(@_)==4 && $cmd eq 'hotWaterCircPumpExtern' ) { # Einstellung->Entlüftung + elsif( int(@_)==4 && $cmd eq 'hotWaterCircPumpDeaerate' ) { # Einstellung->Entlüftung Log3 $name, 3, "LUXTRONIK2: set $name $cmd $val"; return "$name Error: Wrong parameter given for opModeHotWater, use Automatik,Party,Off" if $val !~ /on|off/; $hash->{LOCAL} = 1; $resultStr = LUXTRONIK2_SetParameter ($hash, $cmd, $val); - if ($val eq "on" ) { $resultStr .= LUXTRONIK2_SetParameter ($hash, "confirmDegasing", 1); } - else { $resultStr .= LUXTRONIK2_SetParameter ($hash, "confirmDegasing", 0); } # only send if no degasing checkbox is selected at all. + if ($val eq "on" ) { $resultStr .= LUXTRONIK2_SetParameter ($hash, "runDeaerate", 1); } + else { $resultStr .= LUXTRONIK2_SetParameter ($hash, "runDeaerate", 0); } # only send if no Deaerate checkbox is selected at all. $hash->{LOCAL} = 0; return $resultStr; } my $list = "statusRequest:noArg" ." activeTariff:0,1,2,3,4,5,6,7,8,9" - ." hotWaterCircPumpExtern:on,off" + ." hotWaterCircPumpDeaerate:on,off" ." hotWaterTemperatureTarget " ." resetStatistics:all,statBoilerGradientCoolDownMin,statAmbientTemp...,statElectricity...,statHours...,statHeatQ..." ." returnTemperatureSetBack " @@ -1135,11 +1135,11 @@ LUXTRONIK2_SetParameter($$$) $realValue = $setValue / 10; } - elsif ($parameterName eq "hotWaterCircPumpExtern") { #isVisible(167) + elsif ($parameterName eq "hotWaterCircPumpDeaerate") { #isVisible(167) $setParameter = 684; $setValue = $realValue eq "on" ? 1 : 0; } - elsif ($parameterName eq "confirmDegasing") { + elsif ($parameterName eq "runDeaerate") { $setParameter = 158; $setValue = $realValue; } @@ -1191,7 +1191,7 @@ LUXTRONIK2_SetParameter($$$) $socket->close(); - readingsSingleUpdate($hash,$parameterName,$realValue,1) unless $parameterName eq "confirmDegasing"; + readingsSingleUpdate($hash,$parameterName,$realValue,1) unless $parameterName eq "runDeaerate"; return undef; } @@ -1802,8 +1802,10 @@ LUXTRONIK2_doStatisticDeltaSingle ($$$$$$$)
hotWaterTemperatureTarget <temperature>
hotWaterCirculationPumpExtern <on | off>
hotWaterCircPumpDeaerate <on | off>
opModeHotWater <Mode>
hotWaterCirculationPumpExtern <on | off>
hotWaterCircPumpDeaerate <on | off>
hotWaterTemperatureTarget <Temperatur>