Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_alarmclock.pm: fix Prealarm

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16981 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
FlorianZ 2018-07-14 09:35:07 +00:00
parent f90d3e8aad
commit c20d2192dd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FHEM/98_alarmclock.pm
View File

@ -350,7 +350,7 @@ sub alarmclock_Set($$)
if ($opt eq "stop") if ($opt eq "stop")
{ {
if (($value eq "Alarm") && ((ReadingsVal($hash->{NAME},"state",0)) =~ /^(Alarm is running|Snooze for.*)/)) if (($value eq "Alarm") && ((ReadingsVal($hash->{NAME},"state",0)) =~ /^(Alarm is running|PreAlarm is running|Snooze for.*)/))
{ {
alarmclock_alarmroutine_stop($hash); alarmclock_alarmroutine_stop($hash);
} }
@ -744,9 +744,8 @@ sub alarmclock_alarmroutine_stop($)
fhem("".AttrVal($hash->{NAME},"AlarmRoutineOff","")); fhem("".AttrVal($hash->{NAME},"AlarmRoutineOff",""));
readingsSingleUpdate( $hash,"state", "Alarm stopped", 1 ); readingsSingleUpdate( $hash,"state", "Alarm stopped", 1 );
Log3 $hash->{NAME}, 3, "alarmclock: $hash->{NAME} - alarmroutine stopped."; Log3 $hash->{NAME}, 3, "alarmclock: $hash->{NAME} - alarmroutine stopped.";
RemoveInternalTimer($hash, "alarmclock_hardalarmroutine_start"); RemoveInternalTimer($hash);
RemoveInternalTimer($hash, "alarmclock_alarmroutine_stop"); alarmclock_midnight_timer($hash);
alarmclock_createtimer($hash);
} }
@ -1335,7 +1334,7 @@ sub alarmclock_Notify($$)
### Notify Alarm off ### ### Notify Alarm off ###
if((ReadingsVal($hash->{NAME},"state",0)) =~ /^(Alarm is running|Snooze for.*)/) if((ReadingsVal($hash->{NAME},"state",0)) =~ /^(Alarm is running|PreAlarm is running|Snooze for.*)/)
{ {
if(my @AlarmOffDevice = split(/\|/, AttrVal($hash->{NAME},"EventForAlarmOff",""))) if(my @AlarmOffDevice = split(/\|/, AttrVal($hash->{NAME},"EventForAlarmOff","")))
{ {