Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

MAX: fix temperatures above 25.5 degree

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@2988 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2013-03-26 04:48:38 +00:00
parent 3e070c4b2b
commit 3dee4a1dc2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FHEM/10_MAX.pm
View File

@ -617,16 +617,16 @@ MAX_Parse($$)
} }
}elsif($msgtype ~~ ["WallThermostatState", "WallThermostatControl" ]){ }elsif($msgtype ~~ ["WallThermostatState", "WallThermostatControl" ]){
my ($bits2,$displayActualTemperature,$desiredTemperature,$null1,$heaterTemperature,$null2,$temperature); my ($bits2,$displayActualTemperature,$desiredTemperatureRaw,$null1,$heaterTemperature,$null2,$temperature);
if( length($args[0]) == 4 ) { #WallThermostatControl if( length($args[0]) == 4 ) { #WallThermostatControl
#This is the message that WallMountedThermostats send to paired HeatingThermostats #This is the message that WallMountedThermostats send to paired HeatingThermostats
($desiredTemperature,$temperature) = unpack("CC",pack("H*",$args[0])); ($desiredTemperatureRaw,$temperature) = unpack("CC",pack("H*",$args[0]));
} elsif( length($args[0]) >= 6 and length($args[0]) <= 14) { #WallThermostatState } elsif( length($args[0]) >= 6 and length($args[0]) <= 14) { #WallThermostatState
#len=14: This is the message we get from the Cube over MAXLAN and which is probably send by WallMountedThermostats to the Cube #len=14: This is the message we get from the Cube over MAXLAN and which is probably send by WallMountedThermostats to the Cube
#len=12: Payload of an Ack message, last field "temperature" is missing #len=12: Payload of an Ack message, last field "temperature" is missing
#len=10: Received by MAX_CUL as WallThermostatState #len=10: Received by MAX_CUL as WallThermostatState
#len=6 : Payload of an Ack message, last four fields (especially $heaterTemperature and $temperature) are missing #len=6 : Payload of an Ack message, last four fields (especially $heaterTemperature and $temperature) are missing
($bits2,$displayActualTemperature,$desiredTemperature,$null1,$heaterTemperature,$null2,$temperature) = unpack("aCCCCCC",pack("H*",$args[0])); ($bits2,$displayActualTemperature,$desiredTemperatureRaw,$null1,$heaterTemperature,$null2,$temperature) = unpack("aCCCCCC",pack("H*",$args[0]));
#$heaterTemperature/10 is the temperature measured by a paired HeatingThermostat #$heaterTemperature/10 is the temperature measured by a paired HeatingThermostat
#we don't do anything with it here, because this value also appears as temperature in the HeatingThermostat's ThermostatState message #we don't do anything with it here, because this value also appears as temperature in the HeatingThermostat's ThermostatState message
my $mode = vec($bits2, 0, 2); # my $mode = vec($bits2, 0, 2); #
@ -651,9 +651,9 @@ MAX_Parse($$)
Log 2, "Invalid $msgtype packet" Log 2, "Invalid $msgtype packet"
} }
$desiredTemperature = ($desiredTemperature &0x7F)/2.0; #convert to degree celcius $desiredTemperature = ($desiredTemperatureRaw &0x7F)/2.0; #convert to degree celcius
if(defined($temperature)) { if(defined($temperature)) {
$temperature = ((($desiredTemperature &0x80)<<1) + $temperature)/10; # auch Temperaturen über 25.5 °C werden angezeigt ! $temperature = ((($desiredTemperatureRaw &0x80)<<1) + $temperature)/10; # auch Temperaturen über 25.5 °C werden angezeigt !
Log GetLogLevel($shash->{NAME}, 5), "desiredTemperature $desiredTemperature, temperature $temperature"; Log GetLogLevel($shash->{NAME}, 5), "desiredTemperature $desiredTemperature, temperature $temperature";
readingsBulkUpdate($shash, "temperature", sprintf("%2.1f",$temperature)); readingsBulkUpdate($shash, "temperature", sprintf("%2.1f",$temperature));
} else { } else {