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

iodev improve

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6030 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-06-02 06:28:59 +00:00
parent b7152fb596
commit 39bea5a4ec
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/FHEM/10_CUL_HM.pm
View File

@ -2858,10 +2858,13 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
return "$cmd requires parameter: $h";
}
CUL_HM_assignIO($defs{$devName}) ;
my $id = CUL_HM_IoId($defs{$devName});
return "no IO device identified" if(length($id) != 6 );
if(length($id) != 6 ){# have to try to find an O
CUL_HM_assignIO($defs{$devName});
$id = CUL_HM_IoId($defs{$devName});
return "no IO device identified" if(length($id) != 6 );
}
#convert 'old' commands to current methodes like regSet and regBulk...
# Unify the interface
@ -6408,8 +6411,8 @@ sub CUL_HM_assignIO($){ #check and assign IO
&& defined $hash->{IODev} ){#don't change while send in process
return;
}
my $hn = $hash->{NAME};
my ($ioCCU,$prefIO) = split(":",AttrVal($hn,"IOgrp","_"),2);
my ($ioCCU,$prefIO) = split(":",AttrVal($hash->{NAME},"IOgrp","_"),2);
if (defined $defs{$ioCCU} && AttrVal($ioCCU,"model","") eq "CCU-FHEM"){
my @ios = sort {$hash->{helper}{mRssi}{io}{$b} <=>
$hash->{helper}{mRssi}{io}{$a} }
@ -6426,17 +6429,18 @@ sub CUL_HM_assignIO($){ #check and assign IO
&& $hash->{IODev} ne $defs{$iom}
&& $hash->{IODev}->{TYPE}
&& $hash->{IODev}->{TYPE} eq "HMLAN"){#if recent io is HMLAN and we have to remove the device from IO
my $id = CUL_HM_hash2Id($hash);
IOWrite($hash, "", "remove:$id");
IOWrite($hash, "", "remove:".CUL_HM_hash2Id($hash));
}
$hash->{IODev} = $defs{$iom};
return;
}
}
# not assigned thru CCU - try normal
my $dIo = AttrVal($hn,"IODev","");
if ($dIo && $defs{$dIo} && $dIo ne $hash->{IODev}->{NAME}){
$hash->{IODev} = $defs{$dIo};
my $dIo = AttrVal($hash->{NAME},"IODev","");
if ($defs{$dIo}){
if($dIo ne $hash->{IODev}->{NAME}){
$hash->{IODev} = $defs{$dIo};
}
}
else{
AssignIoPort($hash);#let kernal decide