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

OWCOUNT: Bugfix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9506 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
pahenning 2015-10-18 08:26:41 +00:00
parent a334634996
commit 800bd871c8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/21_OWCOUNT.pm
View File

@ -43,7 +43,7 @@
# #
# attr <name> LogM <string> = device name (not file name) of monthly log file # attr <name> LogM <string> = device name (not file name) of monthly log file
# attr <name> LogY <string> = device name (not file name) of yearly log file # attr <name> LogY <string> = device name (not file name) of yearly log file
# attr <name> nomemory = 1|0 (when set to 1, disabels use of internal memory) # attr <name> nomemory = 1|0 (when set to 1, disables use of internal memory)
# attr <name> <channel>Name <string>[|<string>] = name for the channel [|name used in state reading] # attr <name> <channel>Name <string>[|<string>] = name for the channel [|name used in state reading]
# attr <name> <channel>Unit <string>[|<string>] = unit of measurement for this channel [|unit used in state reading] # attr <name> <channel>Unit <string>[|<string>] = unit of measurement for this channel [|unit used in state reading]
# attr <name> <channel>Rate <string>[|<string>] = name for the channel rate [|name used in state reading] # attr <name> <channel>Rate <string>[|<string>] = name for the channel rate [|name used in state reading]
@ -99,7 +99,7 @@ no warnings 'deprecated';
sub Log3($$$); sub Log3($$$);
my $owx_version="5.31"; my $owx_version="5.33";
#-- fixed raw channel name, flexible channel name #-- fixed raw channel name, flexible channel name
my @owg_fixed = ("A","B"); my @owg_fixed = ("A","B");
my @owg_channel = ("A","B"); my @owg_channel = ("A","B");
@ -590,7 +590,7 @@ sub OWCOUNT_FormatValues($) {
$dvalue = sprintf($dvalue,$total0,$total1); $dvalue = sprintf($dvalue,$total0,$total1);
readingsBulkUpdate($hash,"day",$dvalue); readingsBulkUpdate($hash,"day",$dvalue);
}else{ }else{
Log3 $name,3,"OWCOUNT: No monthly summary possible, ".$monthv[0]; Log3 $name,3,"OWCOUNT: No monthly summary possible, ".$monthv[0]." for device $name";
$total0 = 0; $total0 = 0;
$total1 = 0; $total1 = 0;
}; };
@ -604,7 +604,7 @@ sub OWCOUNT_FormatValues($) {
readingsBulkUpdate($hash,"month",$mvalue); readingsBulkUpdate($hash,"month",$mvalue);
} }
}else{ }else{
Log3 $name,3,"OWCOUNT: No yearly summary possible, ".$yearv[0]; Log3 $name,3,"OWCOUNT: No yearly summary possible, ".$yearv[0]." for device $name";
$total2 = 0; $total2 = 0;
$total3 = 0; $total3 = 0;
}; };
@ -1529,9 +1529,9 @@ sub OWFSCOUNT_GetPage($$$) {
my $nomemory = defined($attr{$name}{"nomemory"}) ? $attr{$name}{"nomemory"} : 0; my $nomemory = defined($attr{$name}{"nomemory"}) ? $attr{$name}{"nomemory"} : 0;
#-- get values - or shoud we rather get the uncached ones ? #-- get values - or shoud we rather get the uncached ones ?
if( $page == 14 || $page == 15 ) { if( $page == 14 || $page == 15 ) {
$vval = OWServer_Read($master,"/$owx_add/counters.$owg_channel[$page-14]"); $vval = OWServer_Read($master,"/$owx_add/counters.$owg_fixed[$page-14]");
return "no return from OWServer for counter.$owg_channel[$page-14]" unless defined $vval; return "no return from OWServer for counter.$owg_fixed[$page-14]" unless defined $vval;
return "empty return from OWServer for counter.$owg_channel[$page-14]" if($vval eq ""); return "empty return from OWServer for counter.$owg_fixed[$page-14]" if($vval eq "");
if ($nomemory == 0) { if ($nomemory == 0) {
$strval = OWServer_Read($master,"/$owx_add/pages/page.$page"); $strval = OWServer_Read($master,"/$owx_add/pages/page.$page");
return "no return from OWServer for page.$page" unless defined $strval; return "no return from OWServer for page.$page" unless defined $strval;