From 9d3ebe44f39b4dda803d5c79e1a6b45d4d20c14f Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Fri, 21 Apr 2017 17:48:17 +0000 Subject: [PATCH] RESIDENTS: add NotifyOrderPrefix git-svn-id: https://svn.fhem.de/fhem/trunk@14060 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_RESIDENTS.pm | 1 + fhem/FHEM/20_GUEST.pm | 1 + fhem/FHEM/20_ROOMMATE.pm | 1 + fhem/FHEM/RESIDENTStk.pm | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm index 580dd35e1..df227a24e 100644 --- a/fhem/FHEM/10_RESIDENTS.pm +++ b/fhem/FHEM/10_RESIDENTS.pm @@ -18,6 +18,7 @@ sub RESIDENTS_Initialize($) { $hash->{AttrFn} = "RESIDENTStk_Attr"; $hash->{NotifyFn} = "RESIDENTStk_Notify"; + $hash->{NotifyOrderPrefix} = "45-"; $hash->{AttrList} = "disable:1,0 disabledForIntervals do_not_notify:1,0 " . "rgr_states:multiple-strict,home,gotosleep,asleep,awoken,absent,gone rgr_lang:EN,DE rgr_noDuration:0,1 rgr_showAllStates:0,1 rgr_wakeupDevice " diff --git a/fhem/FHEM/20_GUEST.pm b/fhem/FHEM/20_GUEST.pm index cdf94cffd..41946dc8d 100644 --- a/fhem/FHEM/20_GUEST.pm +++ b/fhem/FHEM/20_GUEST.pm @@ -19,6 +19,7 @@ sub GUEST_Initialize($) { $hash->{AttrFn} = "RESIDENTStk_Attr"; $hash->{NotifyFn} = "RESIDENTStk_Notify"; + $hash->{NotifyOrderPrefix} = "35-"; $hash->{AttrList} = "disable:1,0 disabledForIntervals do_not_notify:1,0 " . "rg_states:multiple-strict,home,gotosleep,asleep,awoken,absent,none " diff --git a/fhem/FHEM/20_ROOMMATE.pm b/fhem/FHEM/20_ROOMMATE.pm index 3649c6354..95eee153d 100644 --- a/fhem/FHEM/20_ROOMMATE.pm +++ b/fhem/FHEM/20_ROOMMATE.pm @@ -19,6 +19,7 @@ sub ROOMMATE_Initialize($) { $hash->{AttrFn} = "RESIDENTStk_Attr"; $hash->{NotifyFn} = "RESIDENTStk_Notify"; + $hash->{NotifyOrderPrefix} = "40-"; $hash->{AttrList} = "disable:1,0 disabledForIntervals do_not_notify:1,0 " . "rr_states:multiple-strict,home,gotosleep,asleep,awoken,absent,gone " diff --git a/fhem/FHEM/RESIDENTStk.pm b/fhem/FHEM/RESIDENTStk.pm index e43732bc1..2e0586ecb 100644 --- a/fhem/FHEM/RESIDENTStk.pm +++ b/fhem/FHEM/RESIDENTStk.pm @@ -1084,7 +1084,8 @@ sub RESIDENTStk_Notify($$) { # init RESIDENTS, ROOMMATE or GUEST devices after boot if ( $_ =~ - m/^INITIALIZED|REREADCFG|DEFINED.+|MODIFIED.+|DELETED.+$/ ) +m/^INITIALIZED|REREADCFG|DEFINED.+|MODIFIED.+|RENAMED.+|DELETED.+$/ + ) { RESIDENTStk_findResidentSlaves($hash) if ( $TYPE eq "RESIDENTS" );