FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

57_Calendar: calendar event anymore in modeAlarmed if started

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6655 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2014-10-02 18:05:46 +00:00
parent 8f7b4a0921
commit 029ea74fe3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 57_Calendar: calendar event anymore in modeAlarmed if started
- feature: 57_Calendar: deal with non-existent end times - feature: 57_Calendar: deal with non-existent end times
- bugfix: SOMFY: fix non-working on/off-for-timer methods - bugfix: SOMFY: fix non-working on/off-for-timer methods
made positioning attributes optional made positioning attributes optional

2
fhem/FHEM/57_Calendar.pm
View File

@ -615,7 +615,7 @@ sub isAlarmed {
my ($self,$t) = @_; my ($self,$t) = @_;
return 0 if($self->isDeleted()); return 0 if($self->isDeleted());
return $self->{alarm} ? return $self->{alarm} ?
(($self->{alarm}<= $t && $t<= $self->{start}) ? 1 : 0) : 0; (($self->{alarm}<= $t && $t< $self->{start}) ? 1 : 0) : 0;
} }
# return 1 if time is between start time and end time, else 0 # return 1 if time is between start time and end time, else 0