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: more fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2736 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2013-02-15 03:21:13 +00:00
parent ff55f799c9
commit 6f7c439a14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/10_MAX.pm
View File

@ -282,7 +282,7 @@ MAX_Set($@)
$h{maxValveSetting} = MAX_ReadingsVal($hash,"maxValveSetting"); $h{maxValveSetting} = MAX_ReadingsVal($hash,"maxValveSetting");
$h{valveOffset} = MAX_ReadingsVal($hash,"valveOffset"); $h{valveOffset} = MAX_ReadingsVal($hash,"valveOffset");
$h{$setting} = $val; $h{$setting} = MAX_ParseTemperature($val);
my ($decalcDay, $decalcHour) = ($h{decalcification} =~ /^(...) (\d{1,2}):00$/); my ($decalcDay, $decalcHour) = ($h{decalcification} =~ /^(...) (\d{1,2}):00$/);
my $decalc = ($decalcDaysInv{$decalcDay} << 5) | $decalcHour; my $decalc = ($decalcDaysInv{$decalcDay} << 5) | $decalcHour;
@ -314,7 +314,7 @@ MAX_Set($@)
$h{windowOpenDuration} = MAX_ReadingsVal($hash,"windowOpenDuration"); $h{windowOpenDuration} = MAX_ReadingsVal($hash,"windowOpenDuration");
$h{measurementOffset} = MAX_ReadingsVal($hash,"measurementOffset"); $h{measurementOffset} = MAX_ReadingsVal($hash,"measurementOffset");
$h{$setting} = $args[0]; $h{$setting} = MAX_ParseTemperature($args[0]);
my $comfort = int($h{comfortTemperature}*2); my $comfort = int($h{comfortTemperature}*2);
my $eco = int($h{ecoTemperature}*2); my $eco = int($h{ecoTemperature}*2);

2
fhem/FHEM/14_CUL_MAX.pm
View File

@ -118,7 +118,7 @@ CUL_MAX_Check($@)
#Looks like "V 1.49 CUL868" #Looks like "V 1.49 CUL868"
$version =~ m/V (.*)\.(.*) .*/; $version =~ m/V (.*)\.(.*) .*/;
my ($major_version,$minorversion) = ($1, $2); my ($major_version,$minorversion) = ($1, $2);
my $version = 100*$major_version + $minorversion; $version = 100*$major_version + $minorversion;
if($version < 153) { if($version < 153) {
Log 2, "You are using an old version of the CUL firmware, which has known bugs with respect to MAX! support. Please update."; Log 2, "You are using an old version of the CUL firmware, which has known bugs with respect to MAX! support. Please update.";
} }