mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
RESIDENTStk: improve wakeup macro template
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13844 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
968ef25815
commit
05907acd66
@ -215,12 +215,12 @@ if (\$EVTPART0 eq \"stop\") {\
|
|||||||
# An additional notify for user state 'awoken' may take further actions\
|
# An additional notify for user state 'awoken' may take further actions\
|
||||||
# and change to state 'home' afterwards.\
|
# and change to state 'home' afterwards.\
|
||||||
if (\$EVTPART3) {\
|
if (\$EVTPART3) {\
|
||||||
fhem \"define atTmp_9_\$NAME at +00:05:00 set \$EVTPART4:FILTERstate=asleep awoken\";;\
|
fhem \"define atTmp_9_\$NAME at +00:05:00 set \$EVTPART4:FILTER=state=asleep awoken\";;\
|
||||||
\
|
\
|
||||||
# Without enforced wake-up, be jentle and just set user state to 'home' after some\
|
# Without enforced wake-up, be jentle and just set user state to 'home' after some\
|
||||||
# additional long nap time\
|
# additional long nap time\
|
||||||
} else {\
|
} else {\
|
||||||
fhem \"define atTmp_9_\$NAME at +01:30:00 set \$EVTPART4:FILTERstate=asleep home\";;\
|
fhem \"define atTmp_9_\$NAME at +01:30:00 set \$EVTPART4:FILTER=state=asleep home\";;\
|
||||||
}\
|
}\
|
||||||
}\
|
}\
|
||||||
\
|
\
|
||||||
@ -851,9 +851,9 @@ if (\$EVTPART0 eq \"stop\") {\
|
|||||||
$nextWakeupDev = "none";
|
$nextWakeupDev = "none";
|
||||||
$nextWakeup = "OFF";
|
$nextWakeup = "OFF";
|
||||||
}
|
}
|
||||||
readingsBulkUpdate( $defs{$wakeupUserdevice},
|
readingsBulkUpdateIfChanged( $defs{$wakeupUserdevice},
|
||||||
"nextWakeupDev", $nextWakeupDev );
|
"nextWakeupDev", $nextWakeupDev );
|
||||||
readingsBulkUpdate( $defs{$wakeupUserdevice},
|
readingsBulkUpdateIfChanged( $defs{$wakeupUserdevice},
|
||||||
"nextWakeup", $nextWakeup );
|
"nextWakeup", $nextWakeup );
|
||||||
readingsEndUpdate( $defs{$wakeupUserdevice}, 1 );
|
readingsEndUpdate( $defs{$wakeupUserdevice}, 1 );
|
||||||
|
|
||||||
@ -1195,9 +1195,10 @@ sub RESIDENTStk_wakeupRun($;$) {
|
|||||||
$nextWakeupDev = "none";
|
$nextWakeupDev = "none";
|
||||||
$nextWakeup = "OFF";
|
$nextWakeup = "OFF";
|
||||||
}
|
}
|
||||||
readingsBulkUpdate( $defs{$wakeupUserdevice},
|
readingsBulkUpdateIfChanged( $defs{$wakeupUserdevice},
|
||||||
"nextWakeupDev", $nextWakeupDev );
|
"nextWakeupDev", $nextWakeupDev );
|
||||||
readingsBulkUpdate( $defs{$wakeupUserdevice}, "nextWakeup", $nextWakeup );
|
readingsBulkUpdateIfChanged( $defs{$wakeupUserdevice},
|
||||||
|
"nextWakeup", $nextWakeup );
|
||||||
readingsEndUpdate( $defs{$wakeupUserdevice}, 1 );
|
readingsEndUpdate( $defs{$wakeupUserdevice}, 1 );
|
||||||
|
|
||||||
if ( $running && $wakeupOffset > 0 ) {
|
if ( $running && $wakeupOffset > 0 ) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user