FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

MAX: update STATE

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2461 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2013-01-09 19:38:19 +00:00
parent b92e4b803e
commit 3039d88edd
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fhem/FHEM/10_MAX.pm
View File

@ -109,7 +109,6 @@ MAX_Define($$)
Log 5, "Max_define $type with addr $addr "; Log 5, "Max_define $type with addr $addr ";
$hash->{type} = $type; $hash->{type} = $type;
$hash->{addr} = $addr; $hash->{addr} = $addr;
$hash->{STATE} = "waiting for data";
$modules{MAX}{defptr}{$addr} = $hash; $modules{MAX}{defptr}{$addr} = $hash;
$hash->{internals}{interfaces} = $interfaces{$type}; $hash->{internals}{interfaces} = $interfaces{$type};
@ -366,6 +365,7 @@ MAX_Parse($$)
$shash->{backend} = $hash->{NAME}; #for user information $shash->{backend} = $hash->{NAME}; #for user information
} }
readingsBeginUpdate($shash);
if($msgtype eq "define"){ if($msgtype eq "define"){
my $devicetype = $args[0]; my $devicetype = $args[0];
Log 1, "Device changed type from $shash->{type} to $devicetype" if($shash->{type} ne $devicetype); Log 1, "Device changed type from $shash->{type} to $devicetype" if($shash->{type} ne $devicetype);
@ -413,7 +413,6 @@ MAX_Parse($$)
delete($shash->{until}); delete($shash->{until});
} }
readingsBeginUpdate($shash);
readingsBulkUpdate($shash, "mode", $ctrl_modes[$mode] ); readingsBulkUpdate($shash, "mode", $ctrl_modes[$mode] );
readingsBulkUpdate($shash, "battery", $batterylow ? "low" : "ok"); readingsBulkUpdate($shash, "battery", $batterylow ? "low" : "ok");
#This formatting must match with in MAX_Set:$templist #This formatting must match with in MAX_Set:$templist
@ -427,7 +426,6 @@ MAX_Parse($$)
if($measuredTemperature ne "") { if($measuredTemperature ne "") {
readingsBulkUpdate($shash, "temperature", $measuredTemperature); readingsBulkUpdate($shash, "temperature", $measuredTemperature);
} }
readingsEndUpdate($shash, 1);
}elsif($msgtype eq "ShutterContactState"){ }elsif($msgtype eq "ShutterContactState"){
my $bits = pack("H2",$args[0]); my $bits = pack("H2",$args[0]);
@ -439,10 +437,8 @@ MAX_Parse($$)
$shash->{rferror} = $rferror; $shash->{rferror} = $rferror;
readingsBeginUpdate($shash);
readingsBulkUpdate($shash, "battery", $batterylow ? "low" : "ok"); readingsBulkUpdate($shash, "battery", $batterylow ? "low" : "ok");
readingsBulkUpdate($shash,"onoff",$isopen); readingsBulkUpdate($shash,"onoff",$isopen);
readingsEndUpdate($shash, 1);
}elsif($msgtype eq "PushButtonState") { }elsif($msgtype eq "PushButtonState") {
my ($bits2, $onoff) = unpack("CC",pack("H*",$args[0])); my ($bits2, $onoff) = unpack("CC",pack("H*",$args[0]));
@ -450,10 +446,8 @@ MAX_Parse($$)
my $rferror = vec($bits2, 6, 1); #communication with link partner (what does that mean?) my $rferror = vec($bits2, 6, 1); #communication with link partner (what does that mean?)
my $batterylow = vec($bits2, 7, 1); #1 if battery is low my $batterylow = vec($bits2, 7, 1); #1 if battery is low
readingsBeginUpdate($shash);
readingsBulkUpdate($shash, "battery", $batterylow ? "low" : "ok"); readingsBulkUpdate($shash, "battery", $batterylow ? "low" : "ok");
readingsBulkUpdate($shash,"onoff",$onoff); readingsBulkUpdate($shash,"onoff",$onoff);
readingsEndUpdate($shash, 0);
}elsif($msgtype eq "CubeClockState"){ }elsif($msgtype eq "CubeClockState"){
my $clockset = $args[0]; my $clockset = $args[0];
@ -462,10 +456,9 @@ MAX_Parse($$)
}elsif($msgtype eq "CubeConnectionState"){ }elsif($msgtype eq "CubeConnectionState"){
my $connected = $args[0]; my $connected = $args[0];
readingsSingleUpdate($shash,"connection",$connected, 0); readingsBulkUpdate($shash, "connection", $connected);
} elsif($msgtype eq "ThermostatConfig") { } elsif($msgtype eq "ThermostatConfig") {
readingsBeginUpdate($shash);
readingsBulkUpdate($shash, "ecoTemperature", $args[0]); readingsBulkUpdate($shash, "ecoTemperature", $args[0]);
readingsBulkUpdate($shash, "comfortTemperature", $args[1]); readingsBulkUpdate($shash, "comfortTemperature", $args[1]);
readingsBulkUpdate($shash, "boostValveposition", $args[2]) if($shash->{type} eq "HeatingThermostat"); readingsBulkUpdate($shash, "boostValveposition", $args[2]) if($shash->{type} eq "HeatingThermostat");
@ -480,7 +473,6 @@ MAX_Parse($$)
readingsBulkUpdate($shash, "decalcification", "$decalcDays[$args[11]], $args[12]:00"); readingsBulkUpdate($shash, "decalcification", "$decalcDays[$args[11]], $args[12]:00");
#readingsBulkUpdate($shash, "weekProfile", "$args[13]"); #readingsBulkUpdate($shash, "weekProfile", "$args[13]");
$shash->{internal}{weekProfile} = $args[13]; $shash->{internal}{weekProfile} = $args[13];
readingsEndUpdate($shash, 1);
} elsif($msgtype eq "Error") { } elsif($msgtype eq "Error") {
if(@args == 0) { if(@args == 0) {
@ -509,22 +501,24 @@ MAX_Parse($$)
Log 1, "MAX_Parse: Unknown message $msgtype"; Log 1, "MAX_Parse: Unknown message $msgtype";
} }
#Build $shash->{STATE} #Build state READING
$shash->{STATE} = "waiting for data"; my $state = "waiting for data";
if(exists($shash->{READINGS})) { if(exists($shash->{READINGS})) {
$shash->{STATE} = $shash->{READINGS}{connection}{VAL} ? "connected" : "not connected" if(exists($shash->{READINGS}{connection})); $state = $shash->{READINGS}{connection}{VAL} ? "connected" : "not connected" if(exists($shash->{READINGS}{connection}));
$shash->{STATE} = "$shash->{READINGS}{desiredTemperature}{VAL} °C" if(exists($shash->{READINGS}{desiredTemperature})); $state = "$shash->{READINGS}{desiredTemperature}{VAL} °C" if(exists($shash->{READINGS}{desiredTemperature}));
$shash->{STATE} = $shash->{READINGS}{onoff}{VAL} ? "opened" : "closed" if(exists($shash->{READINGS}{onoff})); $state = $shash->{READINGS}{onoff}{VAL} ? "opened" : "closed" if(exists($shash->{READINGS}{onoff}));
} }
$shash->{STATE} .= " (clock not set)" if($shash->{clocknotset}); $state .= " (clock not set)" if($shash->{clocknotset});
$shash->{STATE} .= " (auto)" if(exists($shash->{mode}) and $shash->{mode} eq "auto"); $state .= " (auto)" if(exists($shash->{mode}) and $shash->{mode} eq "auto");
#Don't print this: it's the standard mode #Don't print this: it's the standard mode
#$shash->{STATE} .= " (manual)" if(exists($shash->{mode}) and $shash->{mode} eq "manual"); #$state .= " (manual)" if(exists($shash->{mode}) and $shash->{mode} eq "manual");
$shash->{STATE} .= " (until ".$shash->{until}.")" if(exists($shash->{mode}) and $shash->{mode} eq "temporary" ); $state .= " (until ".$shash->{until}.")" if(exists($shash->{mode}) and $shash->{mode} eq "temporary" );
$shash->{STATE} .= " (battery low)" if($shash->{batterylow}); $state .= " (battery low)" if($shash->{batterylow});
$shash->{STATE} .= " (rf error)" if($shash->{rferror}); $state .= " (rf error)" if($shash->{rferror});
readingsBulkUpdate($shash, "state", $state);
readingsEndUpdate($shash, 1);
return $shash->{NAME} return $shash->{NAME}
} }