FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

94_PWM.pm : add attribute disable and fix OverallHeatingSwitch

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14830 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jamesgo 2017-08-01 14:05:15 +00:00
parent 82268328fc
commit ad0891b6c4
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/94_PWM.pm
View File

@ -23,6 +23,8 @@
# 16.11.16 GA add new attribute overallHeatingSwitchRef for threshold based configuration # 16.11.16 GA add new attribute overallHeatingSwitchRef for threshold based configuration
# 17.11.16 GA add internals for configuration parameters: p_interval, p_cycletime, p_minOnOffTime, # 17.11.16 GA add internals for configuration parameters: p_interval, p_cycletime, p_minOnOffTime,
# p_maxPulse, p_roomsMinOnOffThreshold and p_overallHeatingSwitch # p_maxPulse, p_roomsMinOnOffThreshold and p_overallHeatingSwitch
# 01.08.17 GA add attribute disable to stop calculations of PWM
# 01.08.17 GA fix OverallHeatingSwitch (without threshold) now independent from ValveProtection
############################################## ##############################################
# $Id$ # $Id$
@ -76,7 +78,7 @@ PWM_Initialize($)
$hash->{UndefFn} = "PWM_Undef"; $hash->{UndefFn} = "PWM_Undef";
$hash->{AttrFn} = "PWM_Attr"; $hash->{AttrFn} = "PWM_Attr";
$hash->{AttrList} = "event-on-change-reading event-min-interval valveProtectIdlePeriod overallHeatingSwitchRef:pulseMax,pulseSum,pulseAvg,pulseAvg2,pulseAvg3,avgPulseRoomsOn"; $hash->{AttrList} = "disable:1,0 event-on-change-reading event-min-interval valveProtectIdlePeriod overallHeatingSwitchRef:pulseMax,pulseSum,pulseAvg,pulseAvg2,pulseAvg3,avgPulseRoomsOn";
#$hash->{GetList} = "status timers"; #$hash->{GetList} = "status timers";
} }
@ -106,6 +108,13 @@ PWM_Calculate($)
InternalTimer(gettimeofday() + $hash->{INTERVAL}, "PWM_Calculate", $hash, 0); InternalTimer(gettimeofday() + $hash->{INTERVAL}, "PWM_Calculate", $hash, 0);
} }
if (defined($attr{$name}{disable}) and $attr{$name}{disable} == 1) {
Log3 ($hash, 3, "PWM_Calculate $name");
$hash->{STATE} = "disabled";
readingsSingleUpdate ($hash, "lastrun", "disabled", 0);
return;
}
Log3 ($hash, 3, "PWM_Calculate $name"); Log3 ($hash, 3, "PWM_Calculate $name");
readingsBeginUpdate ($hash); readingsBeginUpdate ($hash);
@ -123,8 +132,6 @@ PWM_Calculate($)
foreach my $d (sort keys %defs) { foreach my $d (sort keys %defs) {
if ( (defined ($defs{$d}{TYPE})) && $defs{$d}{TYPE} eq "PWMR" ) { # all PWMR objects 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 (!defined ($attr{$d}{disable}) or $attr{$d}{disable} == 0) { # not disabled
#if ($hash->{NAME} eq $defs{$d}{IODev}) { # referencing to this fb
#if ($hash->{NAME} eq $defs{$d}{IODev}{NAME}) { # referencing to this fb
if ($hash->{NAME} eq $defs{$d}{IODev}->{NAME}) { # referencing to this fb if ($hash->{NAME} eq $defs{$d}{IODev}->{NAME}) { # referencing to this fb
Log3 ($hash, 4, "PWM_Calculate calc $name, room $d"); Log3 ($hash, 4, "PWM_Calculate calc $name, room $d");
@ -406,6 +413,7 @@ PWM_Calculate($)
# #
my $cntRoomsOn = 0; my $cntRoomsOn = 0;
my $cntRoomsOnVP = 0;
my $cntRoomsOff = 0; my $cntRoomsOff = 0;
my $pulseRoomsOn = 0; my $pulseRoomsOn = 0;
my $pulseRoomsOff = 0; my $pulseRoomsOff = 0;
@ -456,6 +464,7 @@ PWM_Calculate($)
PWMR_SetRoom ($defs{$roomVP}, "on"); PWMR_SetRoom ($defs{$roomVP}, "on");
$cntRoomsOn++; $cntRoomsOn++;
$cntRoomsOnVP++;
$pulseRoomsOn += $RoomsPulses{$roomVP}; $pulseRoomsOn += $RoomsPulses{$roomVP};
} else { } else {
@ -525,7 +534,7 @@ PWM_Calculate($)
} else { } else {
# room based # room based
$newstateOHS = ($cntRoomsOn > 0) ? "on" : "off"; $newstateOHS = (($cntRoomsOn - $cntRoomsOnVP) > 0) ? "on" : "off";
} }
@ -1168,6 +1177,9 @@ PWM_Attr(@)
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<li>disable<br>
Set to 1 will disable all calculations and STATE will be set to "disabled".<br>
</li><br>
<li>valveProtectIdlePeriod<br> <li>valveProtectIdlePeriod<br>
Protect Valve by switching on actor for 300 seconds.<br> Protect Valve by switching on actor for 300 seconds.<br>
After <i>valveProtectIdlePeriod</i> number of days without switching the valve the actor is set to "on" for 300 seconds. After <i>valveProtectIdlePeriod</i> number of days without switching the valve the actor is set to "on" for 300 seconds.