From 1b765d6c415d02ea7e8d5a60bc7445a784ab9a2d Mon Sep 17 00:00:00 2001 From: Risiko Date: Sun, 6 Oct 2019 15:14:44 +0000 Subject: [PATCH] 98_weekprofile: read weekprofile from HMCCUDEV|HM-TC-IT-WM-W-EU git-svn-id: https://svn.fhem.de/fhem/trunk@20320 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/98_weekprofile.pm | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 931069a14..c8fccdc5e 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 98_weekprofile: read weekprofile from HMCCUDEV|HM-TC-IT-WM-W-EU - change: 93_DbLog: change cache from %defs to %data, improved log infos with verbose 5 of SVG generation, bugfix check TIMESTAMP in attribute DbLogValueFn or attribute valueFn diff --git a/fhem/FHEM/98_weekprofile.pm b/fhem/FHEM/98_weekprofile.pm index ed82fdf04..5d13c3250 100644 --- a/fhem/FHEM/98_weekprofile.pm +++ b/fhem/FHEM/98_weekprofile.pm @@ -229,9 +229,18 @@ sub weekprofile_readDayProfile($@) $prfTime = ReadingsVal($device, "R-ENDTIME_$reading"."_$i", "") if (!$prfTime); $prfTemp = ReadingsVal($device, "R-TEMPERATURE_$reading"."_$i", "") if (!$prfTemp); + + $prfTime = ReadingsVal($device, "R-P1_ENDTIME_$reading"."_$i", "") if (!$prfTime); + $prfTemp = ReadingsVal($device, "R-P1_TEMPERATURE_$reading"."_$i", "") if (!$prfTemp); - Log3 $me, 5, "$me(readDayProfile): $reading"."_$i $prfTime $prfTemp"; - + if ($prfTime eq "" or $prfTemp eq ""){ + Log3 $me, 3, "$me(readDayProfile): unsupported readings"; + return (\@times, \@temps); + } + else{ + Log3 $me, 5, "$me(readDayProfile): $reading"."_$i $prfTime $prfTemp"; + } + $prfTime = weekprofile_minutesToTime($prfTime); if ($lastTime ne "24:00"){