FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

10_OWserver, 10_OWDevice: moved NOTIFYDEV from _Initialize to _Define

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11137 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2016-03-28 14:07:20 +00:00
parent 057f146345
commit f444a9f0c3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/10_OWServer.pm
View File

@ -107,7 +107,6 @@ OWServer_Initialize($)
# Consumer # Consumer
$hash->{DefFn} = "OWServer_Define"; $hash->{DefFn} = "OWServer_Define";
$hash->{NOTIFYDEV} = "global";
$hash->{NotifyFn}= "OWServer_Notify"; $hash->{NotifyFn}= "OWServer_Notify";
$hash->{NotifyOrderPrefix}= "50a-"; $hash->{NotifyOrderPrefix}= "50a-";
$hash->{UndefFn} = "OWServer_Undef"; $hash->{UndefFn} = "OWServer_Undef";
@ -135,6 +134,9 @@ OWServer_Define($$)
$hash->{fhem}{protocol}= $protocol; $hash->{fhem}{protocol}= $protocol;
$hash->{NOTIFYDEV} = "global";
if( $init_done ) { if( $init_done ) {
OWServer_OpenDev($hash); OWServer_OpenDev($hash);
} }

3
fhem/FHEM/11_OWDevice.pm
View File

@ -355,7 +355,6 @@ OWDevice_Initialize($)
$hash->{GetFn} = "OWDevice_Get"; $hash->{GetFn} = "OWDevice_Get";
$hash->{SetFn} = "OWDevice_Set"; $hash->{SetFn} = "OWDevice_Set";
$hash->{DefFn} = "OWDevice_Define"; $hash->{DefFn} = "OWDevice_Define";
$hash->{NOTIFYDEV} = "global";
$hash->{NotifyFn} = "OWDevice_Notify"; $hash->{NotifyFn} = "OWDevice_Notify";
$hash->{NotifyOrderPrefix}= "50b-"; $hash->{NotifyOrderPrefix}= "50b-";
$hash->{UndefFn} = "OWDevice_Undef"; $hash->{UndefFn} = "OWDevice_Undef";
@ -666,6 +665,8 @@ OWDevice_Define($$)
$hash->{fhem}{alerting}= $alerting; $hash->{fhem}{alerting}= $alerting;
Log3 $name, 5, "$name: alerting: $alerting"; Log3 $name, 5, "$name: alerting: $alerting";
$hash->{NOTIFYDEV} = "global";
if( $init_done ) { if( $init_done ) {
OWDevice_InitValues($hash); OWDevice_InitValues($hash);
OWDevice_UpdateValues($hash) if(defined($hash->{fhem}{interval})); OWDevice_UpdateValues($hash) if(defined($hash->{fhem}{interval}));