FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 05:16:45 +00:00
Code Issues Releases Wiki Activity

MAX: Fix default values for min/maxTemperature

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2730 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2013-02-15 03:20:32 +00:00
parent dcca50859a
commit 7c8aa8240f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/10_MAX.pm
View File

@ -39,8 +39,8 @@ sub validDecalcification { my ($decalcDay, $decalcHour) = ($_[0] =~ /^(...) (\d{
sub validWeekProfile { return length($_[0]) == 4*13*7; } sub validWeekProfile { return length($_[0]) == 4*13*7; }
my %readingDef = ( #min/max/default my %readingDef = ( #min/max/default
"maximumTemperature" => [ \&validTemperature, 30.5], "maximumTemperature" => [ \&validTemperature, "on"],
"minimumTemperature" => [ \&validTemperature, 4.5], "minimumTemperature" => [ \&validTemperature, "off"],
"comfortTemperature" => [ \&validTemperature, 21], "comfortTemperature" => [ \&validTemperature, 21],
"ecoTemperature" => [ \&validTemperature, 17], "ecoTemperature" => [ \&validTemperature, 17],
"windowOpenTemperature" => [ \&validTemperature, 12], "windowOpenTemperature" => [ \&validTemperature, 12],
@ -139,6 +139,7 @@ MAX_CheckIODev($)
return !defined($hash->{IODev}) || ($hash->{IODev}{TYPE} ne "MAXLAN" && $hash->{IODev}{TYPE} ne "CUL_MAX"); return !defined($hash->{IODev}) || ($hash->{IODev}{TYPE} ne "MAXLAN" && $hash->{IODev}{TYPE} ne "CUL_MAX");
} }
#Idenitify for numeric values and maps "on" and "off" to their temperatures
sub sub
MAX_ParseTemperature($) MAX_ParseTemperature($)
{ {
@ -153,6 +154,8 @@ MAX_Validate(@)
return $readingDef{$name}[0]->($val); return $readingDef{$name}[0]->($val);
} }
#Get a reading, validating it's current value (maybe forcing to the default if invalid)
#"on" and "off" are converted to their numeric values
sub sub
MAX_ReadingsVal(@) MAX_ReadingsVal(@)
{ {
@ -417,8 +420,7 @@ MAX_Set($@)
my $temperature = $controlpoints[$j]; my $temperature = $controlpoints[$j];
return "Invalid time: $controlpoints[$j+1]" if(!defined($hour) || !defined($min) || $hour > 23 || $min > 59); return "Invalid time: $controlpoints[$j+1]" if(!defined($hour) || !defined($min) || $hour > 23 || $min > 59);
return "Invalid temperature" if(!validTemperature($temperature)); return "Invalid temperature" if(!validTemperature($temperature));
$temperature = 4.5 if($temperature eq "off"); $temperature = MAX_ParseTemperature($temperature); #replace "on" and "off" by their values
$temperature = 30.5 if($temperature eq "on");
$newWeekprofilePart .= sprintf("%04x", (int($temperature*2) << 9) | int(($hour * 60 + $min)/5)); $newWeekprofilePart .= sprintf("%04x", (int($temperature*2) << 9) | int(($hour * 60 + $min)/5));
} }
Log GetLogLevel($hash->{NAME}, 5), "New Temperature part for $day: $newWeekprofilePart"; Log GetLogLevel($hash->{NAME}, 5), "New Temperature part for $day: $newWeekprofilePart";