From c404eacdafcb76d39e51423333ea3f35ce61ed5f Mon Sep 17 00:00:00 2001
From: m_fischer <m_fischer@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 15 Dec 2009 14:10:40 +0000
Subject: [PATCH] OWTEMP: bugfixing

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@512 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED           |  3 ++-
 fhem/FHEM/21_OWTEMP.pm | 29 +++++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 6a04e7f7b..54abc2b57 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -554,5 +554,6 @@
   - bugfix:  HOWTO/Examples revisited for correctness
   - bugfix:  DEFINED & INITIALIZED triggers.
   - 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:  20_OWFS.pm crash fhem with PGM3
+  - bugfix:  21_OWTEMP.pm missing trigger fo notify/filelog
diff --git a/fhem/FHEM/21_OWTEMP.pm b/fhem/FHEM/21_OWTEMP.pm
index 8676ba6bf..f79c60185 100644
--- a/fhem/FHEM/21_OWTEMP.pm
+++ b/fhem/FHEM/21_OWTEMP.pm
@@ -90,7 +90,7 @@ OWTEMP_UpdateReading($$$$$)
   $hash->{READINGS}{$reading}{VAL}  = $value;
   Log 4, "OWTEMP $hash->{NAME} $reading: $value";
 
-  return 1;
+  return $value;
 }
 
 #####################################
@@ -114,6 +114,8 @@ OWTEMP_GetUpdate($$)
   my $now   = TimeNow();
   my $scale = $attr{$hash->{IODev}->{NAME}}{"temp-scale"};
   my $value = "";
+  my $ret   = "";
+  my $count = 0;
 
   $scale = "Celsius"    if ($scale eq "C");
   $scale = "Fahrenheit" if ($scale eq "F");
@@ -127,13 +129,17 @@ OWTEMP_GetUpdate($$)
       foreach my $r (sort keys %gets) {
         $value = OW::get("/uncached/$path/".$r);
         $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 {
       foreach my $r (sort keys %updates) {
         $value = OW::get("/uncached/$path/".$r);
         $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}) {
       $warn = "templow";
       $hash->{ALARM} = "1";
-      OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn);
-      $alarm = "  Alarm: $warn";
+      $ret = OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn);
+      $alarm = "  A: ".$hash->{ALARM};
     } elsif ($temp >= $hash->{READINGS}{temphigh}{VAL}) {
       $warn = "temphigh";
       $hash->{ALARM} = "1";
-      OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn);
-      $alarm = "  Alarm: $warn";
+      $ret = OWTEMP_UpdateReading($hash,"warnings",$now,"",$warn);
+      $alarm = "  A: ".$hash->{ALARM};
     } 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;
   } else {
     $value = OW::get("/uncached/$path/".$a);
     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;
   }
@@ -189,7 +198,7 @@ OWTEMP_Get($@)
   $value = OWTEMP_GetUpdate($hash,$a[1]);
   delete $hash->{LOCAL};
 
-  my $reading= $a[1];
+  my $reading = $a[1];
 
   if(defined($hash->{READINGS}{$reading})) {
     $value = $hash->{READINGS}{$reading}{VAL};