FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

10_CUL_HM: assign reserve io if overload

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8829 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-06-26 07:13:01 +00:00
parent 139a20e360
commit 8489800580
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/10_CUL_HM.pm
View File

@ -6967,12 +6967,13 @@ sub CUL_HM_repReadings($) { # parse repeater
my @readList; my @readList;
push @readList,"repPeer_".sprintf("%02d",$_+1).":undefined" for(0..35);#set default empty push @readList,"repPeer_".sprintf("%02d",$_+1).":undefined" for(0..35);#set default empty
my @retL; my @retL;
my @repAttr;
push @repAttr," " for(0..35);
foreach my$pId(sort keys %pCnt){ foreach my$pId(sort keys %pCnt){
my ($pdID,$bdcst,$no) = unpack('A6A2A2',$pId); my ($pdID,$bdcst,$no) = unpack('A6A2A2',$pId);
my $fNo = $no-1;#shorthand field number, often used my $fNo = $no-1;#shorthand field number, often used
my $sName = CUL_HM_id2Name($pdID); my $sName = CUL_HM_id2Name($pdID);
if ($sName eq $pdID && $pD[$fNo] && $defs{$pD[$fNo]}){
if ($sName eq $pdID && $pD[$fNo]){
$sName = $defs{$pD[$fNo]}->{IODev}{NAME} $sName = $defs{$pD[$fNo]}->{IODev}{NAME}
if($attr{$defs{$pD[$fNo]}->{IODev}{NAME}}{hmId} eq $pdID); if($attr{$defs{$pD[$fNo]}->{IODev}{NAME}}{hmId} eq $pdID);
} }
@ -6984,9 +6985,13 @@ sub CUL_HM_repReadings($) { # parse repeater
,($pB[$fNo] && ( ($bdcst eq "01" && $pB[$fNo] eq "y") ,($pB[$fNo] && ( ($bdcst eq "01" && $pB[$fNo] eq "y")
||($bdcst eq "00" && $pB[$fNo] eq "n")) ?"ok":"fail") ||($bdcst eq "00" && $pB[$fNo] eq "n")) ?"ok":"fail")
); );
$repAttr[$fNo] = "$sName:"
.((!$pS[$fNo] || $pS[$fNo] ne $sName)?"-":$pD[$fNo])
.":".($pB[$fNo]?$pB[$fNo]:"-");
push @retL,$eS; push @retL,$eS;
$readList[$fNo]="repPeer_".$eS; $readList[$fNo]="repPeer_".$eS;
} }
$attr{$hash->{NAME}}->{repPeers} = join",",@repAttr;
CUL_HM_UpdtReadBulk($hash,0,@readList); CUL_HM_UpdtReadBulk($hash,0,@readList);
return "No Source Dest Bcast\n". join"\n", sort @retL; return "No Source Dest Bcast\n". join"\n", sort @retL;
} }
@ -7464,7 +7469,7 @@ sub CUL_HM_assignIO($){ #check and assign IO
unshift @ios,@{$hash->{helper}{io}{prefIO}} if ($hash->{helper}{io}{prefIO});# set prefIO to first choice unshift @ios,@{$hash->{helper}{io}{prefIO}} if ($hash->{helper}{io}{prefIO});# set prefIO to first choice
foreach my $iom (@ios){ foreach my $iom (@ios){
if ( !$defs{$iom} if ( !$defs{$iom}
|| ReadingsVal($iom,"state","") eq "disconnected" || ReadingsVal($iom,"state","") =~ m/(disconnected|overload)/
|| InternalVal($iom,"XmitOpen",1) == 0){# HMLAN/HMUSB? || InternalVal($iom,"XmitOpen",1) == 0){# HMLAN/HMUSB?
next; next;
} }