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

10_EnOcean: changed the storage of IODev names

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24388 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2021-05-05 16:05:50 +00:00
parent 22a0b12e97
commit c7383f3f27
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/10_EnOcean.pm
View File

@ -905,6 +905,7 @@ sub EnOcean_Define($$) {
if (defined $ioDev) { if (defined $ioDev) {
AssignIoPort($hash, $ioDev); AssignIoPort($hash, $ioDev);
$hash->{IODev}{NAME} = $ioDev; $hash->{IODev}{NAME} = $ioDev;
$attr{$name}{IODev} = $ioDev;
} else { } else {
AssignIoPort($hash); AssignIoPort($hash);
# find IODev name # find IODev name
@ -912,6 +913,7 @@ sub EnOcean_Define($$) {
if ($iHash eq $hash->{IODev}) { if ($iHash eq $hash->{IODev}) {
$ioDev = $defs{$iName}{NAME}; $ioDev = $defs{$iName}{NAME};
$hash->{IODev}{NAME} = $defs{$iName}{NAME}; $hash->{IODev}{NAME} = $defs{$iName}{NAME};
$attr{$name}{IODev} = $defs{$iName}{NAME};
Log3 $name, 3, "EnOcean $name define defsName: $iName defsHash: $iHash IOHash: $hash->{IODev}"; Log3 $name, 3, "EnOcean $name define defsName: $iName defsHash: $iHash IOHash: $hash->{IODev}";
last; last;
} }
@ -960,6 +962,7 @@ sub EnOcean_Define($$) {
if (defined $ioDev) { if (defined $ioDev) {
AssignIoPort($hash, $ioDev); AssignIoPort($hash, $ioDev);
$hash->{IODev}{NAME} = $ioDev; $hash->{IODev}{NAME} = $ioDev;
$attr{$name}{IODev} = $ioDev;
} else { } else {
AssignIoPort($hash); AssignIoPort($hash);
# find IODev name # find IODev name
@ -967,6 +970,7 @@ sub EnOcean_Define($$) {
if ($iHash eq $hash->{IODev}) { if ($iHash eq $hash->{IODev}) {
$ioDev = $defs{$iName}{NAME}; $ioDev = $defs{$iName}{NAME};
$hash->{IODev}{NAME} = $defs{$iName}{NAME}; $hash->{IODev}{NAME} = $defs{$iName}{NAME};
$attr{$name}{IODev} = $defs{$iName}{NAME};
Log3 $name, 3, "EnOcean $name define defsName: $iName defsHash: $iHash IOHash: $hash->{IODev}"; Log3 $name, 3, "EnOcean $name define defsName: $iName defsHash: $iHash IOHash: $hash->{IODev}";
last; last;
} }
@ -1012,6 +1016,7 @@ sub EnOcean_Define($$) {
if (defined $ioDev) { if (defined $ioDev) {
AssignIoPort($hash, $ioDev); AssignIoPort($hash, $ioDev);
$hash->{IODev}{NAME} = $ioDev; $hash->{IODev}{NAME} = $ioDev;
$attr{$name}{IODev} = $ioDev;
} else { } else {
AssignIoPort($hash); AssignIoPort($hash);
# find IODev name # find IODev name
@ -1019,6 +1024,7 @@ sub EnOcean_Define($$) {
if ($iHash eq $hash->{IODev}) { if ($iHash eq $hash->{IODev}) {
$ioDev = $defs{$iName}{NAME}; $ioDev = $defs{$iName}{NAME};
$hash->{IODev}{NAME} = $defs{$iName}{NAME}; $hash->{IODev}{NAME} = $defs{$iName}{NAME};
$attr{$name}{IODev} = $defs{$iName}{NAME};
Log3 $name, 3, "EnOcean $name define defsName: $iName defsHash: $iHash IOHash: $hash->{IODev}"; Log3 $name, 3, "EnOcean $name define defsName: $iName defsHash: $iHash IOHash: $hash->{IODev}";
last; last;
} }
@ -1132,6 +1138,7 @@ sub EnOcean_Define($$) {
# no device infos # no device infos
if (!exists $hash->{IODev}) { if (!exists $hash->{IODev}) {
(defined $ioDev) ? AssignIoPort($hash, $ioDev) : AssignIoPort($hash); (defined $ioDev) ? AssignIoPort($hash, $ioDev) : AssignIoPort($hash);
$attr{$name}{IODev} = $hash->{IODev}{NAME};
} }
# assign defptr # assign defptr
if (exists $hash->{OLDDEF}) { if (exists $hash->{OLDDEF}) {
@ -1167,6 +1174,7 @@ sub EnOcean_Define($$) {
if (!exists $hash->{IODev}) { if (!exists $hash->{IODev}) {
(defined $ioDev) ? AssignIoPort($hash, $ioDev) : AssignIoPort($hash); (defined $ioDev) ? AssignIoPort($hash, $ioDev) : AssignIoPort($hash);
$attr{$name}{IODev} = $hash->{IODev}{NAME};
} }
if (exists($hash->{OLDDEF}) && $hash->{OLDDEF} =~ m/^[A-Fa-f0-9]{8}$/i) { if (exists($hash->{OLDDEF}) && $hash->{OLDDEF} =~ m/^[A-Fa-f0-9]{8}$/i) {
delete $modules{EnOcean}{defptr}{$hash->{OLDDEF}}; delete $modules{EnOcean}{defptr}{$hash->{OLDDEF}};