HMCCUCHN: Fixed wrong CCU device name during device definition

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@10102 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
fhemzap
2015-12-05 19:00:40 +00:00
parent f2354863ab
commit b0c1517070

View File

@@ -79,14 +79,14 @@ sub HMCCUCHN_Define ($@)
# CCU Channel address with interface # CCU Channel address with interface
$hash->{ccuif} = $1; $hash->{ccuif} = $1;
$hash->{ccuaddr} = $2; $hash->{ccuaddr} = $2;
$hash->{ccuname} = HMCCU_GetDeviceName ($hash->{ccuaddr}, ''); $hash->{ccuname} = HMCCU_GetChannelName ($hash->{ccuaddr}, '');
return "CCU device name not found for channel address $devspec" if ($hash->{ccuname} eq ''); return "CCU device name not found for channel address $devspec" if ($hash->{ccuname} eq '');
} }
elsif ($devspec =~ /^[A-Z]{3,3}[0-9]{7,7}:[0-9]+$/) { elsif ($devspec =~ /^[A-Z]{3,3}[0-9]{7,7}:[0-9]+$/) {
# CCU Channel address # CCU Channel address
$hash->{ccuaddr} = $devspec; $hash->{ccuaddr} = $devspec;
$hash->{ccuif} = HMCCU_GetDeviceInterface ($hash->{ccuaddr}, 'BidCos-RF'); $hash->{ccuif} = HMCCU_GetDeviceInterface ($hash->{ccuaddr}, 'BidCos-RF');
$hash->{ccuname} = HMCCU_GetDeviceName ($devspec, ''); $hash->{ccuname} = HMCCU_GetChannelName ($devspec, '');
return "CCU device name not found for channel address $devspec" if ($hash->{ccuname} eq ''); return "CCU device name not found for channel address $devspec" if ($hash->{ccuname} eq '');
} }
else { else {