FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

MAX: Use defaults for missing configs, allow set comfortTemperature for WMT

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2329 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2012-12-15 12:35:00 +00:00
parent 4943c73587
commit 4d5475cad9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/10_MAX.pm
View File

@ -194,13 +194,13 @@ MAX_Set($@)
readingsSingleUpdate($hash, $setting, $args[0], 0);
my $comfortTemperature = ReadingsVal($hash->{NAME},"comfortTemperature","");
my $ecoTemperature = ReadingsVal($hash->{NAME},"ecoTemperature","");
my $maximumTemperature = ReadingsVal($hash->{NAME},"maximumTemperature","");
my $minimumTemperature = ReadingsVal($hash->{NAME},"minimumTemperature","");
my $windowOpenTemperature = ReadingsVal($hash->{NAME},"windowOpenTemperature","");
my $windowOpenDuration = ReadingsVal($hash->{NAME},"windowOpenDuration","");
my $measurementOffset = ReadingsVal($hash->{NAME},"measurementOffset","");
my $comfortTemperature = ReadingsVal($hash->{NAME},"comfortTemperature","21");
my $ecoTemperature = ReadingsVal($hash->{NAME},"ecoTemperature","17");
my $maximumTemperature = ReadingsVal($hash->{NAME},"maximumTemperature","30.5");
my $minimumTemperature = ReadingsVal($hash->{NAME},"minimumTemperature","4.5");
my $windowOpenTemperature = ReadingsVal($hash->{NAME},"windowOpenTemperature","12");
my $windowOpenDuration = ReadingsVal($hash->{NAME},"windowOpenDuration","15");
my $measurementOffset = ReadingsVal($hash->{NAME},"measurementOffset","0");
return "Invalid comfortTemperature" if($comfortTemperature eq "" or $comfortTemperature < 4.5 or $comfortTemperature > 30.5);
return "Invalid ecoTemperature" if($ecoTemperature eq "" or $ecoTemperature < 4.5 or $ecoTemperature > 30.5);
@ -277,7 +277,7 @@ MAX_Set($@)
return "$ret associate:$assoclist desiredTemperature:eco,comfort,boost,auto,$templist ecoTemperature:$templist comfortTemperature:$templist measurementOffset:$templistOffset maximumTemperature:$templist minimumTemperature:$templist windowOpenTemperature:$templist windowOpenDuration";
} elsif($hash->{type} eq "WallMountedThermostat") {
return "$ret associate:$assoclist displayActualTemperature:0,1 desiredTemperature:eco,comfort,boost,auto,$templist";
return "$ret associate:$assoclist displayActualTemperature:0,1 desiredTemperature:eco,comfort,boost,auto,$templist ecoTemperature:$templist comfortTemperature:$templist maximumTemperature:$templist";
} elsif($hash->{type} eq "ShutterContact") {
return "$ret associate:$assoclist";
} else {