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

HMCCU: Do not touch state during device definition

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20880 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
zap 2020-01-04 15:25:10 +00:00
parent d32d7fb9d1
commit b2db43c739
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 88_HMCCU: Do not touch state during device definition
- bugfix: 70_VIERA: correction of "Rolling Key" - bugfix: 70_VIERA: correction of "Rolling Key"
- feature: 70_VIERA: add. GetStatus after on_off command - feature: 70_VIERA: add. GetStatus after on_off command
- feature: 70_BRAVIA: new attribute wolBroadcast used as address for WOL packet - feature: 70_BRAVIA: new attribute wolBroadcast used as address for WOL packet

8
fhem/FHEM/88_HMCCUCHN.pm
View File

@ -4,9 +4,9 @@
# #
# $Id$ # $Id$
# #
# Version 4.3.009 # Version 4.3.010
# #
# (c) 2019 zap (zap01 <at> t-online <dot> de) # (c) 2020 zap (zap01 <at> t-online <dot> de)
# #
###################################################################### ######################################################################
# Client device for Homematic channels. # Client device for Homematic channels.
@ -116,7 +116,7 @@ sub HMCCUCHN_Define ($@)
# CCU not ready during FHEM start # CCU not ready during FHEM start
if (!defined ($hmccu_hash) || $hmccu_hash->{ccustate} ne 'active') { if (!defined ($hmccu_hash) || $hmccu_hash->{ccustate} ne 'active') {
Log3 $name, 2, "HMCCUCHN: [$devname] Cannot detect IO device, maybe CCU not ready. Trying later ..."; Log3 $name, 2, "HMCCUCHN: [$devname] Cannot detect IO device, maybe CCU not ready. Trying later ...";
readingsSingleUpdate ($hash, "state", "Pending", 1); # readingsSingleUpdate ($hash, "state", "Pending", 1);
$hash->{ccudevstate} = 'pending'; $hash->{ccudevstate} = 'pending';
return undef; return undef;
} }
@ -155,7 +155,7 @@ sub HMCCUCHN_InitDevice ($$) {
$dev_hash->{ccuname} = $dn; $dev_hash->{ccuname} = $dn;
$dev_hash->{ccutype} = $dt; $dev_hash->{ccutype} = $dt;
readingsSingleUpdate ($dev_hash, "state", "Initialized", 1); # readingsSingleUpdate ($dev_hash, "state", "Initialized", 1);
$dev_hash->{ccudevstate} = 'active'; $dev_hash->{ccudevstate} = 'active';
return 0; return 0;

8
fhem/FHEM/88_HMCCUDEV.pm
View File

@ -4,9 +4,9 @@
# #
# $Id$ # $Id$
# #
# Version 4.3.011 # Version 4.3.012
# #
# (c) 2019 zap (zap01 <at> t-online <dot> de) # (c) 2020 zap (zap01 <at> t-online <dot> de)
# #
###################################################################### ######################################################################
# Client device for Homematic devices. # Client device for Homematic devices.
@ -141,7 +141,7 @@ sub HMCCUDEV_Define ($@)
# CCU not ready during FHEM start # CCU not ready during FHEM start
if (!defined ($hmccu_hash) || $hmccu_hash->{ccustate} ne 'active') { if (!defined ($hmccu_hash) || $hmccu_hash->{ccustate} ne 'active') {
Log3 $name, 2, "HMCCUDEV: [$devname] Cannot detect IO device, maybe CCU not ready. Trying later ..."; Log3 $name, 2, "HMCCUDEV: [$devname] Cannot detect IO device, maybe CCU not ready. Trying later ...";
readingsSingleUpdate ($hash, "state", "Pending", 1); # readingsSingleUpdate ($hash, "state", "Pending", 1);
$hash->{ccudevstate} = 'pending'; $hash->{ccudevstate} = 'pending';
return undef; return undef;
} }
@ -275,7 +275,7 @@ sub HMCCUDEV_InitDevice ($$)
# Inform HMCCU device about client device # Inform HMCCU device about client device
return 2 if (!HMCCU_AssignIODevice ($dev_hash, $hmccu_hash->{NAME}, undef)); return 2 if (!HMCCU_AssignIODevice ($dev_hash, $hmccu_hash->{NAME}, undef));
readingsSingleUpdate ($dev_hash, "state", "Initialized", 1); # readingsSingleUpdate ($dev_hash, "state", "Initialized", 1);
$dev_hash->{ccudevstate} = 'active'; $dev_hash->{ccudevstate} = 'active';
return 0; return 0;