Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_HMInfo: fix warnings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13168 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2017-01-21 11:57:16 +00:00
parent bd127b0e13
commit 38c38bbed9
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fhem/FHEM/98_HMinfo.pm
View File

@ -189,23 +189,26 @@ sub HMinfo_Attr(@) {###########################################################
} }
sub HMinfo_Notify(@){########################################################## sub HMinfo_Notify(@){##########################################################
my ($ntfy, $dev) = @_; my ($hash, $dev) = @_;
my $name = $hash->{NAME};
return "" if ($dev->{NAME} ne "global"); return "" if ($dev->{NAME} ne "global");
my $events = deviceEvents($dev, AttrVal($ntfy->{NAME}, "addStateEvent", 0)); my $events = deviceEvents($dev, AttrVal($name, "addStateEvent", 0));
return undef if(!$events); # Some previous notify deleted the array. return undef if(!$events); # Some previous notify deleted the array.
#we need to init the templist if HMInfo is in use #we need to init the templist if HMInfo is in use
my $cfgFn = AttrVal($ntfy->{NAME},"configTempFile","tempList.cfg"); my $cfgFn = AttrVal($name,"configTempFile","tempList.cfg");
HMinfo_listOfTempTemplates() if (grep /(FILEWRITE.*$cfgFn|INITIALIZED)/,@{$events}); HMinfo_listOfTempTemplates() if (grep /(FILEWRITE.*$cfgFn|INITIALIZED)/,@{$events});
return undef if (grep !/INITIALIZED/,@{$events}); if (grep /(SAVE|SHUTDOWN)/,@{$events}){# also save configuration
HMinfo_archConfig($hash,$name,"","");
HMinfo_SetFn($ntfy,$ntfy->{NAME},"loadConfig") }
if ( grep (/INITIALIZED/,@{$events}) if (grep /INITIALIZED/,@{$events}){
&& (substr(AttrVal($ntfy->{NAME}, "autoLoadArchive", 0),0,1) ne 0)); HMinfo_SetFn($hash,$name,"loadConfig")
if ( grep (/INITIALIZED/,@{$events})
#delete $modules{HMinfo}{NotifyFn}; && (substr(AttrVal($name, "autoLoadArchive", 0),0,1) ne 0));
}
return undef; return undef;
} }
sub HMinfo_status($){########################################################## sub HMinfo_status($){##########################################################
@ -436,7 +439,7 @@ sub HMinfo_regCheck(@) { ######################################################
|| !$ehash->{READINGS}{$rNm}{VAL}) {push @mReg, $rNm;} || !$ehash->{READINGS}{$rNm}{VAL}) {push @mReg, $rNm;}
elsif ( $ehash->{READINGS}{$rNm}{VAL} !~ m/00:00/){push @iReg, $rNm;} elsif ( $ehash->{READINGS}{$rNm}{VAL} !~ m/00:00/){push @iReg, $rNm;}
} }
if ($ehash->{helper}{shadowReg}){ if ($ehash->{helper}{shadowReg} && ref($ehash->{helper}{shadowReg}) eq 'HASH'){
foreach my $rl (keys %{$ehash->{helper}{shadowReg}}){ foreach my $rl (keys %{$ehash->{helper}{shadowReg}}){
my $pre = (CUL_HM_getAttrInt($eName,"expert") & 0x02)?"":".";#raw register on my $pre = (CUL_HM_getAttrInt($eName,"expert") & 0x02)?"":".";#raw register on