Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 2 bugs reported by MichaP (mesured-temp / on,off EventMap)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1532 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-05-04 07:06:02 +00:00
parent 6c8601bbbd
commit 07c0ecae69
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -987,10 +987,9 @@ FW_showRoom()
$firstIdx=1; $firstIdx=1;
my @tv = split(",", $values); my @tv = split(",", $values);
if($cmd eq "desired-temp") { if($cmd eq "desired-temp") {
$txt = ReadingsVal($d, "measured-temp", ""); $txt = ReadingsVal($d, "desired-temp", 20);
$txt =~ s/ .*//; # Cut off Celsius $txt =~ s/ .*//; # Cut off Celsius
$txt = sprintf("%2.1f", int(2*$txt)/2) if($txt =~ m/[0-9.-]/); $txt = sprintf("%2.1f", int(2*$txt)/2) if($txt =~ m/[0-9.-]/);
$txt = int($txt*20)/$txt if($txt =~ m/^[0-9].$/); # ???
} else { } else {
$txt = Value($d); $txt = Value($d);
$txt =~ s/$cmd //; $txt =~ s/$cmd //;
@ -2070,30 +2069,18 @@ FW_devState($$)
my ($hasOnOff, $cmdlist, $link); my ($hasOnOff, $cmdlist, $link);
my $webCmd = AttrVal($d, "webCmd", ""); my $webCmd = AttrVal($d, "webCmd", "");
my $allSets = " " . getAllSets($d) . " "; my $allSets = getAllSets($d);
my $state = $defs{$d}{STATE}; my $state = $defs{$d}{STATE};
$state = "" if(!defined($state)); $state = "" if(!defined($state));
if(!$webCmd) { $hasOnOff = (!$webCmd && $allSets =~ m/\bon\b/ && $allSets =~ m/\boff\b/);
$hasOnOff = ($allSets =~ m/ on / && $allSets =~ m/ off /);
my $em = AttrVal($d, "eventMap", "");
if($em) {
if(!$hasOnOff) {
$em .= " ";
$hasOnOff = ($em =~ m/:on\b/ && $em =~ m/:off\b/);
} else {
(undef, $state) = ReplaceEventMap($d,[$d, $state],0);
}
}
}
my $txt = $state; my $txt = $state;
if(defined(AttrVal($d, "showtime", undef))) { if(defined(AttrVal($d, "showtime", undef))) {
my $v = $defs{$d}{READINGS}{state}{TIME}; my $v = $defs{$d}{READINGS}{state}{TIME};
$txt = $v if(defined($v)); $txt = $v if(defined($v));
} elsif($allSets =~ m/ desired-temp:/) { } elsif($allSets =~ m/\bdesired-temp:/) {
$txt = ReadingsVal($d, "measured-temp", ""); $txt = ReadingsVal($d, "measured-temp", "");
$txt =~ s/ .*//; $txt =~ s/ .*//;
$txt .= "°C"; $txt .= "°C";
@ -2113,7 +2100,7 @@ FW_devState($$)
$link = "cmd.$d=set $d $a[0]"; $link = "cmd.$d=set $d $a[0]";
$cmdlist = $webCmd; $cmdlist = $webCmd;
} elsif($hasOnOff) { } elsif($hasOnOff && !$cmdlist) {
$link = "cmd.$d=set $d ".($state eq "on" ? "off":"on"); $link = "cmd.$d=set $d ".($state eq "on" ? "off":"on");
$cmdlist = "on:off"; $cmdlist = "on:off";