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

73_GasCalculator: Feature - Debug Log improved

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23682 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Sailor 2021-02-06 11:07:05 +00:00
parent 0181ef001d
commit 86e8a7f58c
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fhem/FHEM/73_GasCalculator.pm
View File

@ -232,8 +232,8 @@ sub GasCalculator_Get($@)
my @cList; my @cList;
### Create Log entries for debugging ### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. "_Get - reading : " . $reading; #Log3 $GasCalcName, 5, $GasCalcName. "_Get - reading : " . $reading;
Log3 $GasCalcName, 5, $GasCalcName. "_Get - value : " . $value; #Log3 $GasCalcName, 5, $GasCalcName. "_Get - value : " . $value;
if(defined($hash->{READINGS})) { if(defined($hash->{READINGS})) {
@ -245,7 +245,7 @@ sub GasCalculator_Get($@)
} }
### Create Log entries for debugging ### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - set list: " . join(" ", @cList); #Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - set list: " . join(" ", @cList);
return "Unknown argument $reading, choose one of " . join(" ", @cList) if $reading eq '?'; return "Unknown argument $reading, choose one of " . join(" ", @cList) if $reading eq '?';
@ -283,8 +283,8 @@ sub GasCalculator_Set($@)
my @cList; my @cList;
### Create Log entries for debugging ### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. "_Set - reading : " . $reading; #Log3 $GasCalcName, 5, $GasCalcName. "_Set - reading : " . $reading;
Log3 $GasCalcName, 5, $GasCalcName. "_Set - value : " . $value; #Log3 $GasCalcName, 5, $GasCalcName. "_Set - value : " . $value;
if(defined($hash->{READINGS})) { if(defined($hash->{READINGS})) {
@ -296,7 +296,7 @@ sub GasCalculator_Set($@)
} }
### Create Log entries for debugging ### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - set list: " . join(" ", @cList); #Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - set list: " . join(" ", @cList);
return "Unknown argument $reading, choose one of " . join(" ", @cList) if $reading eq '?'; return "Unknown argument $reading, choose one of " . join(" ", @cList) if $reading eq '?';
@ -374,13 +374,12 @@ sub GasCalculator_MidnightTimer($)
} }
} }
### Create Log entries for debugging purpose ### Create Log entries for debugging purpose
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer__________________________________________________________"; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer__________________________________________________________";
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer : MidnightTimer initiated"; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer : MidnightTimer initiated";
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - RegEx : " . $RegEx; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - RegEx : " . $RegEx;
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - GasCountName : " . $GasCountName; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - GasCountName : " . $GasCountName;
#Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - GasCountReadList: " . Dumper(@GasCountReadingNameListFiltered); Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - GasCountReadList: " . Dumper(@GasCountReadingNameListFiltered);
### Remove internal timer for GasCalculator_MidnightTimer ### Remove internal timer for GasCalculator_MidnightTimer
@ -444,7 +443,12 @@ sub GasCalculator_MidnightTimer($)
if ($GasCounterReadingValue ne "error") { if ($GasCounterReadingValue ne "error") {
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - Writing Counter : " . $GasCounterReadingValue; ### Create Log entries for debugging purpose
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - Writing Device : " . $GasCountDev->{NAME};
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - Writing Reading : " . $GasCountReadingName;
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_MidnightTimer - Writing Value : " . $GasCounterReadingValue;
### Writing Counter Value
readingsSingleUpdate($GasCountDev, $GasCountReadingName, $GasCounterReadingValue, 1); readingsSingleUpdate($GasCountDev, $GasCountReadingName, $GasCounterReadingValue, 1);
} }
else { else {
@ -484,6 +488,10 @@ sub GasCalculator_Notify($$)
my $NumberOfChangedEvents = int(@{$GasCountNameEvents}); my $NumberOfChangedEvents = int(@{$GasCountNameEvents});
my $RegEx = $GasCalcDev->{REGEXP}; my $RegEx = $GasCalcDev->{REGEXP};
### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator Begin_______________________________________________________________________________________________________________________________";
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - Notify - Trigger Dev Name : " . $GasCountDev->{NAME};
### Check whether the gas calculator has been disabled ### Check whether the gas calculator has been disabled
if(IsDisabled($GasCalcName)) if(IsDisabled($GasCalcName))
{ {
@ -657,10 +665,6 @@ sub GasCalculator_Notify($$)
###Get current Counter and transform in Volume (cubic) as read on mechanic gas meter ###Get current Counter and transform in Volume (cubic) as read on mechanic gas meter
$GasCountReadingValueCurrent = $1 * $attr{$GasCalcName}{GasCubicPerCounts} + $attr{$GasCalcName}{GasCounterOffset}; $GasCountReadingValueCurrent = $1 * $attr{$GasCalcName}{GasCubicPerCounts} + $attr{$GasCalcName}{GasCounterOffset};
my $GasCountReadingTimestampCurrent = ReadingsTimestamp($GasCountName,$GasCountReadingName,0); my $GasCountReadingTimestampCurrent = ReadingsTimestamp($GasCountName,$GasCountReadingName,0);
### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator Begin_______________________________________________________________________________________________________________________________";
### Create name and destination device for general reading prefix ### Create name and destination device for general reading prefix
my $GasCalcReadingPrefix; my $GasCalcReadingPrefix;
@ -709,6 +713,8 @@ sub GasCalculator_Notify($$)
my $GasCountReadingLastChangeDelta = time() - ReadingsVal($GasCalcReadingDestinationDeviceName, "." . $GasCalcReadingPrefix . "_LastUpdateTimestampUnix", undef); my $GasCountReadingLastChangeDelta = time() - ReadingsVal($GasCalcReadingDestinationDeviceName, "." . $GasCalcReadingPrefix . "_LastUpdateTimestampUnix", undef);
### Create Log entries for debugging ### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - LastUpdateTimestampUnix : " . ReadingsVal($GasCalcReadingDestinationDeviceName, "." . $GasCalcReadingPrefix . "_LastUpdateTimestampUnix", "No Value provided");
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCountReadingLastChangeDeltaSeconds : " . $GasCountReadingLastChangeDelta;
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCountReadingValuePrevious : " . $GasCountReadingValuePrevious; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCountReadingValuePrevious : " . $GasCountReadingValuePrevious;
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCalcReadingPrefix_PrevRead : " . $GasCalcReadingPrefix . "_PrevRead"; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCalcReadingPrefix_PrevRead : " . $GasCalcReadingPrefix . "_PrevRead";
@ -813,9 +819,10 @@ sub GasCalculator_Notify($$)
####### Check whether Initial readings needs to be written ####### Check whether Initial readings needs to be written
### Check whether the current value is the first one after change of day = First one after midnight ### Check whether the current value is the first one after change of day = First one after midnight
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_Notify GasCountReadTimeCurHour : " . $GasCountReadingTimestampCurrentHour; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCountReadTimeCurHour : " . $GasCountReadingTimestampCurrentHour;
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_Notify GasCountReadTimePrevHour : " . $GasCountReadingTimestampPreviousHour; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCountReadTimePrevHour : " . $GasCountReadingTimestampPreviousHour;
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator_Notify GasCountReadTimeRelDelta : " . $GasCountReadingLastChangeDelta; Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - LastUpdateTimestampUnix : " . ReadingsVal($GasCalcReadingDestinationDeviceName, "." . $GasCalcReadingPrefix . "_LastUpdateTimestampUnix", undef);
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - GasCountReadTimeRelDelta : " . $GasCountReadingLastChangeDelta;
if (($GasCountReadingTimestampCurrentHour < $GasCountReadingTimestampPreviousHour) || ($GasCountReadingLastChangeDelta > 86400)) if (($GasCountReadingTimestampCurrentHour < $GasCountReadingTimestampPreviousHour) || ($GasCountReadingLastChangeDelta > 86400))
{ {
@ -1081,7 +1088,7 @@ sub GasCalculator_Notify($$)
%GasCalculator_sets = %{$GasCalcDev->{READINGS}}; %GasCalculator_sets = %{$GasCalcDev->{READINGS}};
### Create Log entries for debugging ### Create Log entries for debugging
Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - notify x_sets list: " . join(" ", (keys %GasCalculator_sets)); #Log3 $GasCalcName, 5, $GasCalcName. " : GasCalculator - notify x_sets list: " . join(" ", (keys %GasCalculator_sets));
} }
return undef; return undef;