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

RESIDENTS: allow 'zuhause' or 'anwesend'

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13882 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-04-02 14:49:12 +00:00
parent 0ea4bb772c
commit 46001270e0
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/10_RESIDENTS.pm
View File

@ -137,11 +137,11 @@ sub RESIDENTS_Attr(@) {
if ( !defined( $attr{$name}{group} ) if ( !defined( $attr{$name}{group} )
|| $attr{$name}{group} eq "Home State" ); || $attr{$name}{group} eq "Home State" );
$attr{$name}{devStateIcon} = $attr{$name}{devStateIcon} =
'.*anwesend:status_available:absent .*abwesend:status_away_1:home .*verreist:status_standby:home .*keine:control_building_empty .*bettfertig:status_night:asleep .*schläft:status_night:awoken .*aufgestanden:status_available:home .*:user_unknown:home'; '.*zuhause:status_available:absent .*anwesend:status_available:absent .*abwesend:status_away_1:home .*verreist:status_standby:home .*keine:control_building_empty .*bettfertig:status_night:asleep .*schlaeft:status_night:awoken .*schläft:status_night:awoken .*aufgestanden:status_available:home .*:user_unknown:home';
$attr{$name}{eventMap} = $attr{$name}{eventMap} =
"home:anwesend absent:abwesend gone:verreist none:keine gotosleep:bettfertig asleep:schläft awoken:aufgestanden"; "home:zuhause absent:abwesend gone:verreist none:keine gotosleep:bettfertig asleep:schläft awoken:aufgestanden";
$attr{$name}{widgetOverride} = $attr{$name}{widgetOverride} =
"state:anwesend,bettfertig,schläft,abwesend,verreist"; "state:zuhause,bettfertig,schläft,aufgestanden,abwesend,verreist";
} }
elsif ( $lang eq "EN" ) { elsif ( $lang eq "EN" ) {
$attr{$name}{alias} = "Residents" $attr{$name}{alias} = "Residents"

6
fhem/FHEM/20_GUEST.pm
View File

@ -177,11 +177,11 @@ sub GUEST_Attr(@) {
if ( $lang eq "DE" ) { if ( $lang eq "DE" ) {
$attr{$name}{devStateIcon} = $attr{$name}{devStateIcon} =
'.*anwesend:user_available:absent .*abwesend:user_away:home .*keiner:control_building_empty:home .*bettfertig:scene_toilet:asleep .*schläft:scene_sleeping:awoken .*aufgestanden:scene_sleeping_alternat:home .*:user_unknown:home'; '.*zuhause:user_available:absent .*anwesend:user_available:absent .*abwesend:user_away:home .*keiner:control_building_empty:home .*bettfertig:scene_toilet:asleep .*schlaeft:scene_sleeping:awoken .*schläft:scene_sleeping:awoken .*aufgestanden:scene_sleeping_alternat:home .*:user_unknown:home';
$attr{$name}{eventMap} = $attr{$name}{eventMap} =
"home:anwesend absent:abwesend none:keiner gotosleep:bettfertig asleep:schläft awoken:aufgestanden"; "home:zuhause absent:abwesend none:keiner gotosleep:bettfertig asleep:schläft awoken:aufgestanden";
$attr{$name}{widgetOverride} = $attr{$name}{widgetOverride} =
"state:anwesend,bettfertig,schläft,abwesend,keiner"; "state:zuhause,bettfertig,schläft,aufgestanden,abwesend,keiner";
} }
elsif ( $lang eq "EN" ) { elsif ( $lang eq "EN" ) {
$attr{$name}{devStateIcon} = $attr{$name}{devStateIcon} =

6
fhem/FHEM/20_ROOMMATE.pm
View File

@ -180,11 +180,11 @@ sub ROOMMATE_Attr(@) {
if ( $lang eq "DE" ) { if ( $lang eq "DE" ) {
$attr{$name}{devStateIcon} = $attr{$name}{devStateIcon} =
'.*anwesend:user_available:absent .*abwesend:user_away:home .*verreist:user_ext_away:home .*bettfertig:scene_toilet:asleep .*schläft:scene_sleeping:awoken .*aufgestanden:scene_sleeping_alternat:home .*:user_unknown:home'; '.*zuhause:user_available:absent .*anwesend:user_available:absent .*abwesend:user_away:home .*verreist:user_ext_away:home .*bettfertig:scene_toilet:asleep .*schlaeft:scene_sleeping:awoken .*schläft:scene_sleeping:awoken .*aufgestanden:scene_sleeping_alternat:home .*:user_unknown:home';
$attr{$name}{eventMap} = $attr{$name}{eventMap} =
"home:anwesend absent:abwesend gone:verreist gotosleep:bettfertig asleep:schläft awoken:aufgestanden"; "home:zuhause absent:abwesend gone:verreist gotosleep:bettfertig asleep:schläft awoken:aufgestanden";
$attr{$name}{widgetOverride} = $attr{$name}{widgetOverride} =
"state:anwesend,bettfertig,schläft,abwesend,verreist"; "state:zuhause,bettfertig,schläft,aufgestanden,abwesend,verreist";
} }
elsif ( $lang eq "EN" ) { elsif ( $lang eq "EN" ) {
$attr{$name}{devStateIcon} = $attr{$name}{devStateIcon} =

12
fhem/FHEM/RESIDENTStk.pm
View File

@ -330,7 +330,7 @@ return;;\
Log3 $NAME, 3, Log3 $NAME, 3,
"RESIDENTStk $NAME: new watchdog device $wdNameGotosleep created"; "RESIDENTStk $NAME: new watchdog device $wdNameGotosleep created";
fhem fhem
"define $wdNameGotosleep watchdog $wakeupUserdevice:(gotosleep|bettfertig) 00:00:04 $wakeupUserdevice:(home|anwesend|absent|abwesend|gone|verreist|asleep|schlaeft|schläft|awoken|aufgestanden) trigger $macroNameGotosleep"; "define $wdNameGotosleep watchdog $wakeupUserdevice:(gotosleep|bettfertig) 00:00:04 $wakeupUserdevice:(home|anwesend|zuhause|absent|abwesend|gone|verreist|asleep|schlaeft|schläft|awoken|aufgestanden) trigger $macroNameGotosleep";
fhem "attr $wdNameGotosleep autoRestart 1"; fhem "attr $wdNameGotosleep autoRestart 1";
fhem fhem
"attr $wdNameGotosleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state gotosleep"; "attr $wdNameGotosleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state gotosleep";
@ -405,7 +405,7 @@ return;;\
Log3 $NAME, 3, Log3 $NAME, 3,
"RESIDENTStk $NAME: new watchdog device $wdNameAsleep created"; "RESIDENTStk $NAME: new watchdog device $wdNameAsleep created";
fhem fhem
"define $wdNameAsleep watchdog $wakeupUserdevice:(asleep|schlaeft|schläft) 00:00:04 $wakeupUserdevice:(home|anwesend|absent|abwesend|gone|verreist|gotosleep|bettfertig|awoken|aufgestanden) trigger $macroNameAsleep"; "define $wdNameAsleep watchdog $wakeupUserdevice:(asleep|schlaeft|schläft) 00:00:04 $wakeupUserdevice:(home|anwesend|zuhause|absent|abwesend|gone|verreist|gotosleep|bettfertig|awoken|aufgestanden) trigger $macroNameAsleep";
fhem "attr $wdNameAsleep autoRestart 1"; fhem "attr $wdNameAsleep autoRestart 1";
fhem fhem
"attr $wdNameAsleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state asleep"; "attr $wdNameAsleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state asleep";
@ -476,7 +476,7 @@ return;;\
Log3 $NAME, 3, Log3 $NAME, 3,
"RESIDENTStk $NAME: new watchdog device $wdNameAwoken created"; "RESIDENTStk $NAME: new watchdog device $wdNameAwoken created";
fhem fhem
"define $wdNameAwoken watchdog $wakeupUserdevice:(awoken|aufgestanden) 00:00:04 $wakeupUserdevice:(home|anwesend|absent|abwesend|gone|verreist|gotosleep|bettfertig|asleep|schlaeft|schläft) trigger $macroNameAwoken"; "define $wdNameAwoken watchdog $wakeupUserdevice:(awoken|aufgestanden) 00:00:04 $wakeupUserdevice:(home|anwesend|zuhause|absent|abwesend|gone|verreist|gotosleep|bettfertig|asleep|schlaeft|schläft) trigger $macroNameAwoken";
fhem "attr $wdNameAwoken autoRestart 1"; fhem "attr $wdNameAwoken autoRestart 1";
fhem fhem
"attr $wdNameAwoken comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state awoken"; "attr $wdNameAwoken comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state awoken";
@ -558,7 +558,7 @@ return;;\
Log3 $NAME, 3, Log3 $NAME, 3,
"RESIDENTStk $NAME: new watchdog device $wdRNameGotosleep created"; "RESIDENTStk $NAME: new watchdog device $wdRNameGotosleep created";
fhem fhem
"define $wdRNameGotosleep watchdog $deviceName:(gotosleep|bettfertig) 00:00:03 $deviceName:(home|anwesend|absent|abwesend|gone|verreist|asleep|schlaeft|schläft|awoken|aufgestanden) trigger $macroRNameGotosleep"; "define $wdRNameGotosleep watchdog $deviceName:(gotosleep|bettfertig) 00:00:03 $deviceName:(home|anwesend|zuhause|absent|abwesend|gone|verreist|asleep|schlaeft|schläft|awoken|aufgestanden) trigger $macroRNameGotosleep";
fhem "attr $wdRNameGotosleep autoRestart 1"; fhem "attr $wdRNameGotosleep autoRestart 1";
fhem fhem
"attr $wdRNameGotosleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state gotosleep"; "attr $wdRNameGotosleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state gotosleep";
@ -617,7 +617,7 @@ return;;\
Log3 $NAME, 3, Log3 $NAME, 3,
"RESIDENTStk $NAME: new watchdog device $wdNameAsleep created"; "RESIDENTStk $NAME: new watchdog device $wdNameAsleep created";
fhem fhem
"define $wdRNameAsleep watchdog $deviceName:(asleep|schlaeft|schläft) 00:00:03 $deviceName:(home|anwesend|absent|abwesend|gone|verreist|gotosleep|bettfertig|awoken|aufgestanden) trigger $macroRNameAsleep"; "define $wdRNameAsleep watchdog $deviceName:(asleep|schlaeft|schläft) 00:00:03 $deviceName:(home|anwesend|zuhause|absent|abwesend|gone|verreist|gotosleep|bettfertig|awoken|aufgestanden) trigger $macroRNameAsleep";
fhem "attr $wdRNameAsleep autoRestart 1"; fhem "attr $wdRNameAsleep autoRestart 1";
fhem fhem
"attr $wdRNameAsleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state asleep"; "attr $wdRNameAsleep comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state asleep";
@ -679,7 +679,7 @@ return;;\
Log3 $NAME, 3, Log3 $NAME, 3,
"RESIDENTStk $NAME: new watchdog device $wdNameAwoken created"; "RESIDENTStk $NAME: new watchdog device $wdNameAwoken created";
fhem fhem
"define $wdRNameAwoken watchdog $deviceName:(awoken|aufgestanden) 00:00:04 $deviceName:(home|anwesend|absent|abwesend|gone|verreist|gotosleep|bettfertig|asleep|schlaeft|schläft) trigger $macroRNameAwoken"; "define $wdRNameAwoken watchdog $deviceName:(awoken|aufgestanden) 00:00:04 $deviceName:(home|anwesend|zuhause|absent|abwesend|gone|verreist|gotosleep|bettfertig|asleep|schlaeft|schläft) trigger $macroRNameAwoken";
fhem "attr $wdRNameAwoken autoRestart 1"; fhem "attr $wdRNameAwoken autoRestart 1";
fhem fhem
"attr $wdRNameAwoken comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state awoken"; "attr $wdRNameAwoken comment Auto-created by RESIDENTS Toolkit: trigger macro after going to state awoken";