Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

94_PWM.pm : add readings for more readable tempRules

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@12290 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jamesgo 2016-10-07 06:16:32 +00:00
parent 08e27b6c37
commit d4b836f5be
1 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
FHEM/94_PWM.pm
View File

@ -18,6 +18,7 @@
# 29.06.16 GA add attribute valveProtectIdlePeriod # 29.06.16 GA add attribute valveProtectIdlePeriod
# 16.08.16 GA add event-min-interval # 16.08.16 GA add event-min-interval
# 23.09.16 GA fix set default for maxPulse to 1 (from 0.85) # 23.09.16 GA fix set default for maxPulse to 1 (from 0.85)
# 28.09.16 GA add "get timers" to collect a maximum of all timers from the rooms attached
############################################## ##############################################
# $Id$ # $Id$
@ -72,6 +73,7 @@ PWM_Initialize($)
$hash->{AttrFn} = "PWM_Attr"; $hash->{AttrFn} = "PWM_Attr";
$hash->{AttrList} = "event-on-change-reading event-min-interval valveProtectIdlePeriod"; $hash->{AttrList} = "event-on-change-reading event-min-interval valveProtectIdlePeriod";
#$hash->{GetList} = "status timers";
} }
@ -693,17 +695,76 @@ sub
PWM_Get($@) PWM_Get($@)
{ {
my ($hash, @a) = @_; my ($hash, @a) = @_;
my $name = $hash->{NAME};
return "argument is missing" if(int(@a) != 2); return "argument is missing" if(int(@a) != 2);
my $msg; my $msg;
if($a[1] ne "status") { if ($a[1] eq "status") {
return "Unknown argument $a[1], choose one of status"; return $hash->{STATE};
} elsif ($a[1] eq "timers") {
Log3 ($hash, 1, "in get timers");
my $cnt = 0;
my %tmpTimersFrom = ();
my %tmpTimersTo = ();
foreach my $d (sort keys %defs) {
if ( (defined ($defs{$d}{TYPE})) && $defs{$d}{TYPE} eq "PWMR" ) { # all PWMR objects
if (!defined ($attr{$d}{disable}) or $attr{$d}{disable} == 0) { # not disabled
if ($name eq $defs{$d}{IODev}->{NAME}) { # referencing to this fb
my $room = $defs{$d};
Log3 ($hash, 1, "PWM_Get $name collect $room->{NAME}");
foreach my $reading ("timer1_Mo", "timer2_Di", "timer3_Mi", "timer4_Do", "timer5_Fr", "timer6_Sa", "timer7_So") {
if (defined ($room->{READINGS}{$reading}) and $room->{READINGS}{$reading} ne "") {
$cnt++;
Log3 ($hash, 1, "PWM_Get $name collect $room->{NAME} $reading");
my (@timers) = split / /, $room->{READINGS}{$reading}{VAL};
my ($mintime, $minTempId, $minTemp ) = split /,/, $timers[0];
my ($maxtime, $maxTempId, $maxTemp ) = split /,/, $timers[$#timers];
my ($minfrom, $minto) = split /-/, $mintime;
my ($maxfrom, $maxto) = split /-/, $maxtime;
$tmpTimersFrom{$reading} = $minfrom unless defined($tmpTimersFrom{$reading});
$tmpTimersTo{$reading} = $maxto unless defined($tmpTimersTo{$reading});
$tmpTimersFrom{$reading} = $minfrom if ($tmpTimersFrom{$reading} > $minfrom);
$tmpTimersTo{$reading} = $maxto if ($tmpTimersTo{$reading} < $maxto);
}
}
}
}
}
}
if ($cnt == 0) {
foreach my $reading ("timer1_Mo", "timer2_Di", "timer3_Mi", "timer4_Do", "timer5_Fr", "timer6_Sa", "timer7_So") {
delete ($hash->{READINGS}{$reading});
}
} else {
readingsBeginUpdate ($hash);
foreach my $reading ("timer1_Mo", "timer2_Di", "timer3_Mi", "timer4_Do", "timer5_Fr", "timer6_Sa", "timer7_So") {
readingsBulkUpdate ($hash, "$reading", $tmpTimersFrom{$reading}."-".$tmpTimersTo{$reading});
}
readingsEndUpdate($hash, 1);
}
#return "$reading from $minfrom to $maxto";
return "";
} else {
return "Unknown argument $a[1], choose one of status timers";
} }
#return $hash->{READINGS}{STATE}{VAL}; #return $hash->{READINGS}{STATE}{VAL};
return $hash->{STATE}; #return $hash->{STATE};
} }
############################# #############################
@ -1014,6 +1075,11 @@ PWM_Attr(@)
<li>status<br> <li>status<br>
Retrieve content of variable <i>STATE</i>. Retrieve content of variable <i>STATE</i>.
</li><br> </li><br>
<li>timers<br>
Retrieve values from the readings "timer?_??" from the attached rooms..<br>
The readings define start and end times for different room temperatures.<br>
This funktion will retrieve the first start and the last end time. <i>STATE</i>.
</li><br>
</ul> </ul>
<br> <br>