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

59_HCS: Simplify the condition implementation for valve mode demand evaluation.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15883 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hjr 2018-01-14 09:53:48 +00:00
parent 687db48218
commit c9a121e662
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fhem/FHEM/59_HCS.pm
View File

@ -596,10 +596,9 @@ HCS_getValues($$) {
} }
my $lastState = ReadingsVal($name,$d,"idle"); my $lastState = ReadingsVal($name,$d,"idle");
my $act = $devs{$d}{actuator}; my $valve = $devs{$d}{actuator};
my $tm = $devs{$d}{tempMeasured}; my $tm = $devs{$d}{tempMeasured};
my $td = $devs{$d}{tempDesired}; my $td = $devs{$d}{tempDesired};
my $str;
if(!$hash->{helper}{device}{$d}{demand}) { if(!$hash->{helper}{device}{$d}{demand}) {
$hash->{helper}{device}{$d}{demand} = 0; $hash->{helper}{device}{$d}{demand} = 0;
@ -623,48 +622,31 @@ HCS_getValues($$) {
$sumIdle++ if($devState eq "idle"); $sumIdle++ if($devState eq "idle");
$sumDemand++ if($devState eq "demand"); $sumDemand++ if($devState eq "demand");
} }
$str = sprintf("desired: %4.1f measured: %4.1f d: %+5.1f open: %${lv}d%% state: %s",$td,$tm,$tm-$td,$act,$devState);
} elsif($mode eq "valve") { } elsif($mode eq "valve") {
my $vOn = AttrVal($name,"valveThresholdOn",$defaults{valveThresholdOn}); my $vThreshold = AttrVal($name,"valveThresholdOn",$defaults{valveThresholdOn});
my $vOff = AttrVal($name,"valveThresholdOff",$defaults{valveThresholdOff}); if ( $lastState eq "demand" ) {
my $valve = $devs{$d}{actuator}; $vThreshold = AttrVal($name,"valveThresholdOff",$defaults{valveThresholdOff});
}
if($valve >= $vOn) { if ( $valve > $vThreshold ) {
$devState = "demand"; $devState = "demand";
$hash->{helper}{device}{$d}{demand} = 1; $hash->{helper}{device}{$d}{demand} = 1;
$sumDemand++; $sumDemand++;
} else { } else {
$devState = "idle";
if($lastState eq "demand") { $hash->{helper}{device}{$d}{demand} = 0;
if($valve > $vOff) { $sumIdle++;
$devState = "demand";
$hash->{helper}{device}{$d}{demand} = 1;
$sumDemand++;
} else {
$devState = "idle";
$hash->{helper}{device}{$d}{demand} = 0;
$sumIdle++;
}
} else {
$devState = "idle";
$hash->{helper}{device}{$d}{demand} = 0;
$sumIdle++;
}
} }
$str = sprintf("desired: %4.1f measured: %4.1f delta: %+5.1f valve: %${lv}d%% state: %s",$td,$tm,$tm-$td,$valve,$devState);
} }
my $str = sprintf("desired: %4.1f measured: %4.1f delta: %+5.1f valve: %${lv}d%% state: %s",$td,$tm,$tm-$td,$valve,$devState);
Log3 $name, 4, "$type $name $d: $str"; Log3 $name, 4, "$type $name $d: $str";
readingsBulkUpdate($hash,$d,$devState); readingsBulkUpdate($hash,$d,$devState);
} }
readingsEndUpdate($hash,1); readingsEndUpdate($hash,1);
my $heatDemand = 0; my $heatDemand = ($sumDemand > 0)? 1:0;
foreach my $d (sort keys %{$hash->{helper}{device}}) {
$heatDemand = 1 if($hash->{helper}{device}{$d}{demand} && $hash->{helper}{device}{$d}{demand} == 1);
}
# eco mode # eco mode
my $eco = "no"; my $eco = "no";