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

OWTEMP: bugfixing

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@512 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
m_fischer 2009-12-15 14:10:40 +00:00
parent e24aa7e852
commit 4baa19f9e7
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -554,5 +554,6 @@
- bugfix: HOWTO/Examples revisited for correctness - bugfix: HOWTO/Examples revisited for correctness
- bugfix: DEFINED & INITIALIZED triggers. - bugfix: DEFINED & INITIALIZED triggers.
- feature: 20_OWFS.pm support for passive Devices e.g. DS9097 (see commandref.html) - feature: 20_OWFS.pm support for passive Devices e.g. DS9097 (see commandref.html)
- bugfix: 20_OWFS.pm crash fhem with PGM2/3, xmllist
- bugfix: 21_OWTEMP.pm Defining a device now fail when no OWFS device was defined - bugfix: 21_OWTEMP.pm Defining a device now fail when no OWFS device was defined
- bugfix: 20_OWFS.pm crash fhem with PGM3 - bugfix: 21_OWTEMP.pm missing trigger fo notify/filelog

29
fhem/FHEM/21_OWTEMP.pm
View File

@ -90,7 +90,7 @@ OWTEMP_UpdateReading($$$$$)
$hash->{READINGS}{$reading}{VAL} = $value; $hash->{READINGS}{$reading}{VAL} = $value;
Log 4, "OWTEMP $hash->{NAME} $reading: $value"; Log 4, "OWTEMP $hash->{NAME} $reading: $value";
return 1; return $value;
} }
##################################### #####################################
@ -114,6 +114,8 @@ OWTEMP_GetUpdate($$)
my $now = TimeNow(); my $now = TimeNow();
my $scale = $attr{$hash->{IODev}->{NAME}}{"temp-scale"}; my $scale = $attr{$hash->{IODev}->{NAME}}{"temp-scale"};
my $value = ""; my $value = "";
my $ret = "";
my $count = 0;
$scale = "Celsius" if ($scale eq "C"); $scale = "Celsius" if ($scale eq "C");
$scale = "Fahrenheit" if ($scale eq "F"); $scale = "Fahrenheit" if ($scale eq "F");
@ -127,13 +129,17 @@ OWTEMP_GetUpdate($$)
foreach my $r (sort keys %gets) { foreach my $r (sort keys %gets) {
$value = OW::get("/uncached/$path/".$r); $value = OW::get("/uncached/$path/".$r);
$temp = $value if ($r eq "temperature"); $temp = $value if ($r eq "temperature");
OWTEMP_UpdateReading($hash,$r,$now,$scale,$value); $ret = OWTEMP_UpdateReading($hash,$r,$now,$scale,$value);
$hash->{CHANGED}[$count] = "$r: $ret";
$count++;
} }
} else { } else {
foreach my $r (sort keys %updates) { foreach my $r (sort keys %updates) {
$value = OW::get("/uncached/$path/".$r); $value = OW::get("/uncached/$path/".$r);
$temp = $value if ($r eq "temperature"); $temp = $value if ($r eq "temperature");
OWTEMP_UpdateReading($hash,$r,$now,$scale,$value); $ret = OWTEMP_UpdateReading($hash,$r,$now,$scale,$value);
$hash->{CHANGED}[$count] = "$r: $ret";
$count++;
} }
} }
@ -147,22 +153,25 @@ OWTEMP_GetUpdate($$)
if ($temp <= $hash->{READINGS}{templow}{VAL}) { if ($temp <= $hash->{READINGS}{templow}{VAL}) {
$warn = "templow"; $warn = "templow";
$hash->{ALARM} = "1"; $hash->{ALARM} = "1";
OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn); $ret = OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn);
$alarm = " Alarm: $warn"; $alarm = " A: ".$hash->{ALARM};
} elsif ($temp >= $hash->{READINGS}{temphigh}{VAL}) { } elsif ($temp >= $hash->{READINGS}{temphigh}{VAL}) {
$warn = "temphigh"; $warn = "temphigh";
$hash->{ALARM} = "1"; $hash->{ALARM} = "1";
OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn); $ret = OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn);
$alarm = " Alarm: $warn"; $alarm = " A: ".$hash->{ALARM};
} else { } else {
OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn); $ret = OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn);
$alarm = " A: ".$hash->{ALARM};
} }
$hash->{CHANGED}[$count] = "warnings: $warn";
$hash->{CHANGED}[$count+1] = "T: " . $temp . $alarm;
$hash->{STATE} = "T: " . $hash->{READINGS}{temperature}{VAL} . $alarm; $hash->{STATE} = "T: " . $hash->{READINGS}{temperature}{VAL} . $alarm;
} else { } else {
$value = OW::get("/uncached/$path/".$a); $value = OW::get("/uncached/$path/".$a);
foreach my $r (sort keys %gets) { foreach my $r (sort keys %gets) {
OWTEMP_UpdateReading($hash,$r,$now,$scale,$value) if($r eq $a); $ret = OWTEMP_UpdateReading($hash,$r,$now,$scale,$value) if($r eq $a);
} }
return $value; return $value;
} }
@ -189,7 +198,7 @@ OWTEMP_Get($@)
$value = OWTEMP_GetUpdate($hash,$a[1]); $value = OWTEMP_GetUpdate($hash,$a[1]);
delete $hash->{LOCAL}; delete $hash->{LOCAL};
my $reading= $a[1]; my $reading = $a[1];
if(defined($hash->{READINGS}{$reading})) { if(defined($hash->{READINGS}{$reading})) {
$value = $hash->{READINGS}{$reading}{VAL}; $value = $hash->{READINGS}{$reading}{VAL};