mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-22 20:24:36 +00:00
10_CUL_HM:improve expert view - bugs when change view
git-svn-id: https://svn.fhem.de/fhem/trunk@14610 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
f5fafcce86
commit
2d67a03bf0
@ -1180,9 +1180,6 @@ sub CUL_HM_Parse($$) {#########################################################
|
|||||||
return (CUL_HM_pushEvnts(),$mh{devN},@entities);
|
return (CUL_HM_pushEvnts(),$mh{devN},@entities);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#----------CUL aesCommReq handling---------
|
#----------CUL aesCommReq handling---------
|
||||||
if ( AttrVal($mh{devN},"aesCommReq",0) #aesCommReq enabled for device
|
if ( AttrVal($mh{devN},"aesCommReq",0) #aesCommReq enabled for device
|
||||||
&& $mh{devH}{IODev}{NAME} ne $mh{ioName} #message not received on assigned IO
|
&& $mh{devH}{IODev}{NAME} ne $mh{ioName} #message not received on assigned IO
|
||||||
@ -7770,7 +7767,7 @@ sub CUL_HM_chgExpLvl($){# update visibility and set internal values for expert
|
|||||||
my $reg = $rdEntry;
|
my $reg = $rdEntry;
|
||||||
my $p = "";
|
my $p = "";
|
||||||
$p = "-".$1 if($rdEntry =~m /R-(.*)-(lg|sh)/);
|
$p = "-".$1 if($rdEntry =~m /R-(.*)-(lg|sh)/);
|
||||||
$reg =~ s/\.?R-(.*?-)?//;
|
$reg =~ s/^\.?R-(.*?-)?//;
|
||||||
next if(!$culHmRegDefine->{$reg} || $culHmRegDefine->{$reg}{d} eq '0');
|
next if(!$culHmRegDefine->{$reg} || $culHmRegDefine->{$reg}{d} eq '0');
|
||||||
$tHash->{READINGS}{$nTag."R$p-".$reg} = $tHash->{READINGS}{$rdEntry};
|
$tHash->{READINGS}{$nTag."R$p-".$reg} = $tHash->{READINGS}{$rdEntry};
|
||||||
delete $tHash->{READINGS}{$rdEntry};
|
delete $tHash->{READINGS}{$rdEntry};
|
||||||
@ -7782,7 +7779,7 @@ sub CUL_HM_chgExpLvl($){# update visibility and set internal values for expert
|
|||||||
my $reg = $rdEntry;
|
my $reg = $rdEntry;
|
||||||
my $p = "";
|
my $p = "";
|
||||||
$p = "-".$1 if($rdEntry =~m /R-(.*)-(lg|sh)/);
|
$p = "-".$1 if($rdEntry =~m /R-(.*)-(lg|sh)/);
|
||||||
$reg =~ s/\.?R-(.*-)?//;
|
$reg =~ s/^\.?R-(.*-)?//;
|
||||||
next if(!$culHmRegDefine->{$reg} || $culHmRegDefine->{$reg}{d} eq '1');
|
next if(!$culHmRegDefine->{$reg} || $culHmRegDefine->{$reg}{d} eq '1');
|
||||||
$tHash->{READINGS}{$nTag."R$p-".$reg} = $tHash->{READINGS}{$rdEntry};
|
$tHash->{READINGS}{$nTag."R$p-".$reg} = $tHash->{READINGS}{$rdEntry};
|
||||||
delete $tHash->{READINGS}{$rdEntry};
|
delete $tHash->{READINGS}{$rdEntry};
|
||||||
@ -7792,7 +7789,7 @@ sub CUL_HM_chgExpLvl($){# update visibility and set internal values for expert
|
|||||||
else{ ($nTag,$grp) = (".","RegL_")}
|
else{ ($nTag,$grp) = (".","RegL_")}
|
||||||
foreach my $rdEntry (grep /^$grp/ ,keys %{$tHash->{READINGS}}){
|
foreach my $rdEntry (grep /^$grp/ ,keys %{$tHash->{READINGS}}){
|
||||||
my $reg = $rdEntry;
|
my $reg = $rdEntry;
|
||||||
$reg =~ s/\.//;
|
$reg =~ s/^\.//;
|
||||||
$tHash->{READINGS}{$nTag.$reg} = $tHash->{READINGS}{$rdEntry};
|
$tHash->{READINGS}{$nTag.$reg} = $tHash->{READINGS}{$rdEntry};
|
||||||
delete $tHash->{READINGS}{$rdEntry};
|
delete $tHash->{READINGS}{$rdEntry};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user