FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-05 02:19:31 +00:00
Code Issues Releases Wiki Activity

FHEMWEB FHT changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@616 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2010-04-02 16:26:58 +00:00
parent e25bc4ba8e
commit e7d61a9f97
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/fhem.pl
View File

@ -62,6 +62,7 @@ sub LoadModule($);
sub Log($$); sub Log($$);
sub OpenLogfile($); sub OpenLogfile($);
sub PrintHash($$); sub PrintHash($$);
sub ReadingsVal($$$);
sub ResolveDateWildcards($@); sub ResolveDateWildcards($@);
sub RemoveInternalTimer($); sub RemoveInternalTimer($);
sub SecondsTillTomorrow($); sub SecondsTillTomorrow($);
@ -160,7 +161,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool my $duplidx=0; # helper for the above pool
my $cvsid = '$Id: fhem.pl,v 1.104 2010-04-02 14:20:53 rudolfkoenig Exp $'; my $cvsid = '$Id: fhem.pl,v 1.105 2010-04-02 16:26:58 rudolfkoenig Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@ -2238,3 +2239,17 @@ SecondsTillTomorrow($) # 86400, if tomorrow is no DST change
return $stt_sec; return $stt_sec;
} }
sub
ReadingsVal($$$)
{
my ($d,$n,$default) = @_;
if(defined($defs{$d}) &&
defined($defs{$d}{READINGS}) &&
defined($defs{$d}{READINGS}{$n}) &&
defined($defs{$d}{READINGS}{$n}{VAL})) {
return $defs{$d}{READINGS}{$n}{VAL};
}
return $default;
}

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

@ -751,20 +751,21 @@ FW_showRoom()
} elsif($type eq "FHT") { } elsif($type eq "FHT") {
$v = $defs{$d}{READINGS}{"measured-temp"}{VAL}; $v = ReadingsVal($d, "measured-temp", "");
$v = "" if(!defined($v));
$v =~ s/ .*//; $v =~ s/ .*//;
pO "<td><a href=\"$__ME?detail=$d\">$d</a></td>"; pO "<td><a href=\"$__ME?detail=$d\">$d</a></td>";
pO "<td align=\"center\">$v&deg;</td>"; pO "<td align=\"center\">$v&deg;</td>";
$v = sprintf("%2.1f", int(2*$v)/2) if($v =~ m/[0-9.-]/); $v = sprintf("%2.1f", int(2*$v)/2) if($v =~ m/[0-9.-]/);
my @tv = map { ($_.".0", $_+0.5) } (10..29); my @tv = map { ($_.".0", $_+0.5) } (5..30);
shift(@tv); # 5.0 is not valid
$v = int($v*20)/$v if($v =~ m/^[0-9].$/); $v = int($v*20)/$v if($v =~ m/^[0-9].$/);
pO FW_hidden("arg.$d", "desired-temp"); pO FW_hidden("arg.$d", "desired-temp");
pO FW_hidden("dev.$d", $d); pO FW_hidden("dev.$d", $d);
pO "<td>" . pO "<td>" .
FW_select("val.$d",\@tv,$v) . FW_select("val.$d", \@tv, ReadingsVal($d, "desired-temp", $v)) .
FW_submit("cmd.$d", "set") . "</td>"; FW_submit("cmd.$d", "set") . "</td>";
} elsif($type eq "FileLog") { } elsif($type eq "FileLog") {