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

HMCCU: Bugfix for RPC server autostart

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12763 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
fhemzap 2016-12-13 18:27:48 +00:00
parent 833c2c30cd
commit 1f340c9227
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 88_HMCCU: Fixed RPC server autostart
- feature: 98_TRAFFIC: flexible update schedule, travelMode - feature: 98_TRAFFIC: flexible update schedule, travelMode
- bugfix: 88_HMCCU: Wrong CCUNum - bugfix: 88_HMCCU: Wrong CCUNum
- bugfix 73_GasCalculator: Corrected hidden power average power readings - bugfix 73_GasCalculator: Corrected hidden power average power readings

4
fhem/FHEM/88_HMCCU.pm
View File

@ -689,7 +689,7 @@ sub HMCCU_Notify ($$)
foreach my $event (@{$events}) { foreach my $event (@{$events}) {
if ($devname eq 'global') { if ($devname eq 'global') {
if ($event eq 'INITIALIZED') { if ($event eq 'INITIALIZED') {
return if ($rpcserver eq 'on'); return if ($rpcserver eq 'off');
my $delay = $HMCCU_INIT_INTERVAL0; my $delay = $HMCCU_INIT_INTERVAL0;
Log3 $name, 0, "HMCCU: Start of RPC server after FHEM initialization in $delay seconds"; Log3 $name, 0, "HMCCU: Start of RPC server after FHEM initialization in $delay seconds";
if ($ccuflags =~ /extrpc/) { if ($ccuflags =~ /extrpc/) {
@ -777,7 +777,7 @@ sub HMCCU_AggregateReadings ($$)
foreach my $r (keys %{$ch->{READINGS}}) { foreach my $r (keys %{$ch->{READINGS}}) {
next if ($r !~ /$fread/); next if ($r !~ /$fread/);
my $rv = $ch->{READINGS}{$r}{VAL}; my $rv = $ch->{READINGS}{$r}{VAL};
if (($fcond eq 'any' || $fcond eq 'all') && $rv eq $ftrue) { if (($fcond eq 'any' || $fcond eq 'all') && $rv =~ /$ftrue/) {
$mc++; $mc++;
$rl .= ($mc > 1 ? ",$fcoll" : $fcoll); $rl .= ($mc > 1 ? ",$fcoll" : $fcoll);
last; last;