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

98_weekprofile: reduce warning if master device has no default profile

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10426 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
risiko79 2016-01-09 11:41:45 +00:00
parent fadfbe1f88
commit 15704d9262
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fhem/FHEM/98_weekprofile.pm
View File

@ -149,16 +149,29 @@ sub weekprofile_readDevProfile(@)
return "" if (!defined ($type));
my $prf = {};
my $logDaysWarning="";
my $logDaysCnt=0;
foreach my $day (@shortDays){
my ($dayTimes, $dayTemps) = weekprofile_readDayProfile($device,$day,$type,$me);
if (scalar(@{$dayTemps})==0) {
push(@{$dayTimes}, "24:00");
push(@{$dayTemps}, "18.0");
Log3 $me, 3, "WARNING master device $device has no day profile for $day - create default";
$logDaysWarning .= "\n" if ($logDaysCnt>0);
$logDaysWarning .= "WARNING master device $device has no day profile for $day - create default";
$logDaysCnt++;
}
$prf->{$day}->{"temp"} = $dayTemps;
$prf->{$day}->{"time"} = $dayTimes;
}
if ( ($logDaysCnt>0) && ($logDaysCnt<(@shortDays)) ) {
Log3 $me, 3, $logDaysWarning;
} else {
if ($logDaysCnt == (@shortDays)) {
Log3 $me, 3, "WARNING master device $device has no week profile - create default";
}
}
return $prf;
}
##############################################
@ -205,7 +218,7 @@ sub weekprofile_sendDevProfile(@)
my $equal = 1;
for (my $i = 0; $i < $tmpCnt; $i++) {
if ( ($prf->{DATA}->{$day}->{"temp"}[$i] ne $devPrf->{$day}->{"temp"}[$i] ) ||
$prf->{DATA}->{$day}->{"time"}[$i] ne $devPrf->{$day}->{"time"}[$i] ) {
$prf->{DATA}->{$day}->{"time"}[$i] ne $devPrf->{$day}->{"time"}[$i] ) {
$equal = 0;
last;
}
@ -253,10 +266,14 @@ sub weekprofile_sendDevProfile(@)
$k++;
}
}
$cmd =~ s/^\s+|\s+$//g if ($cmd);
Log3 $me, 4, "$me(sendDevProfile): $cmd";
fhem($cmd);
return undef;
my $ret = undef;
if ($cmd) {
$cmd =~ s/^\s+|\s+$//g;
Log3 $me, 4, "$me(sendDevProfile): $cmd";
$ret = fhem($cmd);
}
return $ret;
}
##############################################