FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-27 10:37:13 +00:00
Code Issues Releases Wiki Activity

MAX: fix SetTemperatureConfig

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2734 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2013-02-15 03:21:00 +00:00
parent 48e490843a
commit dcf2644225
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
fhem/FHEM/10_MAX.pm
View File

@ -160,7 +160,7 @@ MAX_ReadingsVal(@)
{ {
my ($hash,$name) = @_; my ($hash,$name) = @_;
my $val = MAX_ParseTemperature(ReadingsVal($hash->{NAME},$name,"")); my $val = ReadingsVal($hash->{NAME},$name,"");
#$readingDef{$name} array is [validatingFunc, defaultValue] #$readingDef{$name} array is [validatingFunc, defaultValue]
if(exists($readingDef{$name}) and !$readingDef{$name}[0]->($val)) { if(exists($readingDef{$name}) and !$readingDef{$name}[0]->($val)) {
#Error: invalid value #Error: invalid value
@ -174,7 +174,7 @@ MAX_ReadingsVal(@)
readingsSingleUpdate($hash,$name,$val,0); readingsSingleUpdate($hash,$name,$val,0);
} }
} }
return $val; return MAX_ParseTemperature($val);
} }
sub sub
@ -275,19 +275,20 @@ MAX_Set($@)
return $msg; return $msg;
} }
my $boostDuration = MAX_ReadingsVal($hash,"boostDuration"); my %h;
my $boostValveposition = MAX_ReadingsVal($hash,"boostValveposition"); $h{boostDuration} = MAX_ReadingsVal($hash,"boostDuration");
my $decalcification = MAX_ReadingsVal($hash,"decalcification"); $h{boostValveposition} = MAX_ReadingsVal($hash,"boostValveposition");
my $maxValveSetting = MAX_ReadingsVal($hash,"maxValveSetting"); $h{decalcification} = MAX_ReadingsVal($hash,"decalcification");
my $valveOffset = MAX_ReadingsVal($hash,"valveOffset"); $h{maxValveSetting} = MAX_ReadingsVal($hash,"maxValveSetting");
$h{valveOffset} = MAX_ReadingsVal($hash,"valveOffset");
eval "\$$setting = $val"; $h{$setting} = $val;
my ($decalcDay, $decalcHour) = ($decalcification =~ /^(...) (\d{1,2}):00$/); my ($decalcDay, $decalcHour) = ($h{decalcification} =~ /^(...) (\d{1,2}):00$/);
my $decalc = ($decalcDaysInv{$decalcDay} << 5) | $decalcHour; my $decalc = ($decalcDaysInv{$decalcDay} << 5) | $decalcHour;
my $boost = ($boost_durationsInv{$boostDuration} << 5) | int($boostValveposition/5); my $boost = ($boost_durationsInv{$h{boostDuration}} << 5) | int($h{boostValveposition}/5);
my $payload = sprintf("%02x%02x%02x%02x", $boost, $decalc, int($maxValveSetting*255/100), int($valveOffset*255/100)); my $payload = sprintf("%02x%02x%02x%02x", $boost, $decalc, int($h{maxValveSetting}*255/100), int($h{valveOffset}*255/100));
return ($hash->{IODev}{Send})->($hash->{IODev},"ConfigValve",$hash->{addr},$payload,callbackParam => "$setting,$val"); return ($hash->{IODev}{Send})->($hash->{IODev},"ConfigValve",$hash->{addr},$payload,callbackParam => "$setting,$val");
}elsif($setting eq "groupid"){ }elsif($setting eq "groupid"){
@ -304,23 +305,24 @@ MAX_Set($@)
return $msg; return $msg;
} }
my $comfortTemperature = MAX_ReadingsVal($hash,"comfortTemperature"); my %h;
my $ecoTemperature = MAX_ReadingsVal($hash,"ecoTemperature"); $h{comfortTemperature} = MAX_ReadingsVal($hash,"comfortTemperature");
my $maximumTemperature = MAX_ReadingsVal($hash,"maximumTemperature"); $h{ecoTemperature} = MAX_ReadingsVal($hash,"ecoTemperature");
my $minimumTemperature = MAX_ReadingsVal($hash,"minimumTemperature"); $h{maximumTemperature} = MAX_ReadingsVal($hash,"maximumTemperature");
my $windowOpenTemperature = MAX_ReadingsVal($hash,"windowOpenTemperature"); $h{minimumTemperature} = MAX_ReadingsVal($hash,"minimumTemperature");
my $windowOpenDuration = MAX_ReadingsVal($hash,"windowOpenDuration"); $h{windowOpenTemperature} = MAX_ReadingsVal($hash,"windowOpenTemperature");
my $measurementOffset = MAX_ReadingsVal($hash,"measurementOffset"); $h{windowOpenDuration} = MAX_ReadingsVal($hash,"windowOpenDuration");
$h{measurementOffset} = MAX_ReadingsVal($hash,"measurementOffset");
eval "\$$setting = $args[0]"; $h{$setting} = $args[0];
my $comfort = int(MAX_ParseTemperature($comfortTemperature)*2); my $comfort = int($h{comfortTemperature}*2);
my $eco = int(MAX_ParseTemperature($ecoTemperature)*2); my $eco = int($h{ecoTemperature}*2);
my $max = int(MAX_ParseTemperature($maximumTemperature)*2); my $max = int($h{maximumTemperature}*2);
my $min = int(MAX_ParseTemperature($minimumTemperature)*2); my $min = int($h{minimumTemperature}*2);
my $offset = int(($measurementOffset + 3.5)*2); my $offset = int(($h{measurementOffset} + 3.5)*2);
my $windowOpenTemp = int(MAX_ParseTemperature($windowOpenTemperature)*2); my $windowOpenTemp = int($h{windowOpenTemperature}*2);
my $windowOpenTime = int($windowOpenDuration/5); my $windowOpenTime = int($h{windowOpenDuration}/5);
my $payload = sprintf("%02x%02x%02x%02x%02x%02x%02x",$comfort,$eco,$max,$min,$offset,$windowOpenTemp,$windowOpenTime); my $payload = sprintf("%02x%02x%02x%02x%02x%02x%02x",$comfort,$eco,$max,$min,$offset,$windowOpenTemp,$windowOpenTime);
return ($hash->{IODev}{Send})->($hash->{IODev},"ConfigTemperatures",$hash->{addr},$payload, callbackParam => "$setting,$args[0]") return ($hash->{IODev}{Send})->($hash->{IODev},"ConfigTemperatures",$hash->{addr},$payload, callbackParam => "$setting,$args[0]")