MAX: show more configuration, fix adding of measurementOffset

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2317 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre
2012-12-11 22:43:44 +00:00
parent 3f4b504887
commit 6a834e3bec
3 changed files with 26 additions and 10 deletions

View File

@@ -35,6 +35,7 @@ use vars qw(%msgCmd2Id);
"01" => "PairPong",
"02" => "Ack",
"03" => "TimeInformation",
"10" => "ConfigWeekProfile",
"11" => "ConfigTemperatures", #like boost/eco/comfort etc
"30" => "ShutterContactState",
"42" => "WallThermostatState", #by WallMountedThermostat
@@ -49,6 +50,8 @@ use vars qw(%msgCmd2Id);
);
%msgCmd2Id = reverse %msgId2Cmd;
my @decalcDays = ("Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri");
my %interfaces = (
"Cube" => undef,
"HeatingThermostat" => "thermostat;battery;temperature",
@@ -366,7 +369,7 @@ MAX_Parse($$)
#The HeatingThermostat uses the measurementOffset during control
#but does not apply it to measuredTemperature before sending it to us
my $measOffset = ReadingsVal($hash->{NAME},"measurementOffset","");
my $measOffset = ReadingsVal($shash->{NAME},"measurementOffset","");
$measuredTemperature += $measOffset if($measuredTemperature ne "" and $measOffset ne "");
$shash->{mode} = $mode;
@@ -429,6 +432,11 @@ MAX_Parse($$)
readingsBulkUpdate($shash, "minimumTemperature", $args[6]);
readingsBulkUpdate($shash, "windowOpenTemperature", $args[7]);
readingsBulkUpdate($shash, "windowOpenDuration", $args[8]) if($shash->{type} eq "HeatingThermostat");
readingsBulkUpdate($shash, "maxValveSetting", $args[9]);
readingsBulkUpdate($shash, "valveOffset", $args[10]);
readingsBulkUpdate($shash, "decalcification", "$decalcDays[$args[11]], $args[12]:00");
#readingsBulkUpdate($shash, "weekProfile", "$args[13]");
$shash->{internal}{weekProfile} = $args[13];
readingsEndUpdate($shash, 0);
} elsif($msgtype eq "Error") {