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

98_alarmclock.pm: new readings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14491 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
FlorianZ 2017-06-10 15:31:17 +00:00
parent e42f5dd7d9
commit ddeee003f8
1 changed files with 192 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
fhem/FHEM/98_alarmclock.pm
View File

@ -75,6 +75,7 @@ my %alarmday =
"0" => "AlarmTime7_Sunday", "0" => "AlarmTime7_Sunday",
"8" => "AlarmTime8_Holiday", "8" => "AlarmTime8_Holiday",
"9" => "AlarmTime9_Vacation" "9" => "AlarmTime9_Vacation"
); );
@ -172,6 +173,8 @@ sub alarmclock_Define($$)
$hash->{helper}{Repeat1} = 0; $hash->{helper}{Repeat1} = 0;
$hash->{helper}{Repeat2} = 0; $hash->{helper}{Repeat2} = 0;
$hash->{helper}{Repeat3} = 0; $hash->{helper}{Repeat3} = 0;
$hash->{helper}{Today} = 0;
$hash->{helper}{Tomorrow} = 0;
return undef; return undef;
@ -515,9 +518,19 @@ sub alarmclock_createtimer($)
my ($hash) = @_; my ($hash) = @_;
my ($SecNow, $MinNow, $HourNow, $DayNow, $MonthNow, $YearNow, $WDayNow, $YDNow, $SumTimeNow) = localtime(time); my ($SecNow, $MinNow, $HourNow, $DayNow, $MonthNow, $YearNow, $WDayNow, $YDNow, $SumTimeNow) = localtime(time);
my $alarmtimetoday = $alarmday{$WDayNow};
$hash->{helper}{Today} = $WDayNow;
if ($WDayNow =~ /^(0|1|2|3|4|5)/)
{
$hash->{helper}{Tomorrow} = $WDayNow + 1;
}
else
{
$hash->{helper}{Tomorrow} = 0;
}
my $HourinSec = $HourNow * 3600; my $HourinSec = $HourNow * 3600;
my $MininSec = $MinNow * 60; my $MininSec = $MinNow * 60;
my $NowinSec = $HourinSec + $MininSec + $SecNow; my $NowinSec = $HourinSec + $MininSec + $SecNow;
@ -529,16 +542,13 @@ if ((AttrVal($hash->{NAME}, "disable", 0 ) ne "1" ) && (ReadingsVal($hash->{NAME
### Vacation ### ### Vacation ###
if (alarmclock_vacation_check($hash)) alarmclock_vacation_check($hash);
{
$alarmtimetoday = $alarmday{9};
}
### Holiday ### ### Holiday ###
if (alarmclock_holiday_check($hash)) alarmclock_holiday_check($hash);
{
$alarmtimetoday = $alarmday{8}; my $alarmtimetoday = $alarmday{$hash->{helper}{Today}};
} my $alarmtimetommorow = $alarmday{$hash->{helper}{Tomorrow}};
if ((ReadingsVal($hash->{NAME},$alarmtimetoday,"NONE")) =~ /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/) if ((ReadingsVal($hash->{NAME},$alarmtimetoday,"NONE")) =~ /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/)
@ -645,12 +655,21 @@ if ((AttrVal($hash->{NAME}, "disable", 0 ) ne "1" ) && (ReadingsVal($hash->{NAME
### End OffDefaultTime ### ### End OffDefaultTime ###
else else
{ {
alarmclock_midnight_timer($hash); alarmclock_midnight_timer($hash);
Log3 $hash->{NAME}, 5, "alarmclock: $hash->{NAME} - no alarm today => midnight-timer started"; Log3 $hash->{NAME}, 5, "alarmclock: $hash->{NAME} - no alarm today => midnight-timer started";
} }
### Alarm Reading ###
my $AlarmToday = ReadingsVal($hash->{NAME},$alarmtimetoday," ");
my $AlarmTomorrow = ReadingsVal($hash->{NAME},$alarmtimetommorow," ");
readingsBeginUpdate($hash);
readingsBulkUpdate( $hash, "AlarmToday", $AlarmToday);
readingsBulkUpdate( $hash, "AlarmTomorrow", $AlarmTomorrow);
readingsEndUpdate($hash,1);
} }
} }
@ -1084,21 +1103,19 @@ sub alarmclock_holiday_check($)
my ($hash) = @_; my ($hash) = @_;
my ($SecNow, $MinNow, $HourNow, $DayNow, $MonthNow, $YearNow, $WDayNow, $YDNow, $SumTimeNow) = localtime(time); my ($SecNow, $MinNow, $HourNow, $DayNow, $MonthNow, $YearNow, $WDayNow, $YDNow, $SumTimeNow) = localtime(time);
my $WDayToday = $WDayNow;
if ($WDayNow == 0) my $WDayTomorrow = $WDayNow + 1;
if ($WDayToday == 0)
{ {
$WDayNow = 7; $WDayToday = 7;
} }
if ((AttrVal($hash->{NAME}, "HolidayDevice", "NONE" ) ne "NONE" ) && (AttrVal($hash->{NAME}, "HolidayCheck", "1" ) ne "0" )) if ((AttrVal($hash->{NAME}, "HolidayDevice", "NONE" ) ne "NONE" ) && (AttrVal($hash->{NAME}, "HolidayCheck", "1" ) ne "0" ))
{ {
my @HolidayDays = split(/\|/, AttrVal($hash->{NAME},"HolidayDays","1|2|3|4|5|6|7")); my @HolidayDays = split(/\|/, AttrVal($hash->{NAME},"HolidayDays","1|2|3|4|5|6|7"));
my $Day = grep {$_==$WDayNow;} @HolidayDays; my $DayToday = grep {$_==$WDayToday;} @HolidayDays;
my $DayTomorrow = grep {$_==$WDayTomorrow;} @HolidayDays;
if ($Day == 1)
{
my @Holiday = split(/\|/, AttrVal($hash->{NAME},"HolidayDevice","")); my @Holiday = split(/\|/, AttrVal($hash->{NAME},"HolidayDevice",""));
my $a = 0; my $a = 0;
my $b = scalar(@Holiday); my $b = scalar(@Holiday);
@ -1111,16 +1128,23 @@ sub alarmclock_holiday_check($)
if( IsDevice( $HolidayDevice[0], "holiday" )) if( IsDevice( $HolidayDevice[0], "holiday" ))
{ {
my $today = strftime("%2m-%2d", localtime(time)); my $today = strftime("%2m-%2d", localtime(time));
my $tomorrow = strftime("%2m-%2d", localtime(time+86400));
my $todayevent = holiday_refresh($HolidayDevice[0],$today); my $todayevent = holiday_refresh($HolidayDevice[0],$today);
if ($todayevent ne "none") if (($todayevent ne "none") && ($DayToday == 1))
{ {
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $todayevent"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $todayevent";
return 1; $hash->{helper}{Today} = 8;
}
my $tomorrowevent = holiday_refresh($HolidayDevice[0],$tomorrow);
if (($tomorrowevent ne "none") && ($DayTomorrow == 1))
{
$hash->{helper}{Tomorrow} = 8;
} }
} }
elsif( IsDevice($HolidayDevice[0], "Calendar" )) elsif( IsDevice($HolidayDevice[0], "Calendar" ))
{ {
my $stoday = strftime("%2d.%2m.%2y", localtime(time)); my $stoday = strftime("%2d.%2m.%2y", localtime(time));
my $stomorrow = strftime("%2d.%2m.%2y", localtime(time+86400));
my $line = Calendar_Get($defs{$HolidayDevice[0]},"get","text","mode=alarm|start|upcoming"); my $line = Calendar_Get($defs{$HolidayDevice[0]},"get","text","mode=alarm|start|upcoming");
if ($line) if ($line)
{ {
@ -1130,11 +1154,15 @@ sub alarmclock_holiday_check($)
{ {
chomp($line); chomp($line);
my $date = substr($line,0,8); my $date = substr($line,0,8);
if ($date eq $stoday) if (($date eq $stoday) && ($DayToday == 1))
{ {
my $todaydesc = substr($line,15); my $todaydesc = substr($line,15);
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $todaydesc"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $todaydesc";
return 1; $hash->{helper}{Today} = 8;
}
if (($date eq $stomorrow) && ($DayTomorrow == 1))
{
$hash->{helper}{Tomorrow} = 8;
} }
} }
} }
@ -1142,28 +1170,25 @@ sub alarmclock_holiday_check($)
} }
elsif (scalar(@HolidayDevice) eq "2") elsif (scalar(@HolidayDevice) eq "2")
{ {
if (ReadingsVal($HolidayDevice[0],"state","NONE") eq $HolidayDevice[1]) if ((ReadingsVal($HolidayDevice[0],"state","NONE") eq $HolidayDevice[1]) && ($DayToday == 1))
{ {
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $HolidayDevice[1]"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $HolidayDevice[1]";
return 1; $hash->{helper}{Today} = 8;
} }
} }
elsif (scalar(@HolidayDevice) eq "3") elsif (scalar(@HolidayDevice) eq "3")
{ {
my $HolidayEvent = $HolidayDevice[2]; my $HolidayEvent = $HolidayDevice[2];
$HolidayEvent =~ s/ //g; $HolidayEvent =~ s/ //g;
if (ReadingsVal($HolidayDevice[0],$HolidayDevice[1],"NONE") eq $HolidayEvent) if ((ReadingsVal($HolidayDevice[0],$HolidayDevice[1],"NONE") eq $HolidayEvent) && ($DayToday == 1))
{ {
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $HolidayDevice[1] - $HolidayEvent"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - holiday => $HolidayDevice[0] - $HolidayDevice[1] - $HolidayEvent";
return 1; $hash->{helper}{Today} = 8;
} }
} }
$a ++; $a ++;
} }
} }
}
return 0;
} }
@ -1178,22 +1203,20 @@ sub alarmclock_vacation_check($)
my ($hash) = @_; my ($hash) = @_;
my ($SecNow, $MinNow, $HourNow, $DayNow, $MonthNow, $YearNow, $WDayNow, $YDNow, $SumTimeNow) = localtime(time); my ($SecNow, $MinNow, $HourNow, $DayNow, $MonthNow, $YearNow, $WDayNow, $YDNow, $SumTimeNow) = localtime(time);
my $WDayToday = $WDayNow;
if ($WDayNow == 0) my $WDayTomorrow = $WDayNow + 1;
if ($WDayToday == 0)
{ {
$WDayNow = 7; $WDayToday = 7;
} }
if ((AttrVal($hash->{NAME}, "VacationDevice", "NONE" ) ne "NONE" ) && (AttrVal($hash->{NAME}, "VacationCheck", "1" ) ne "0" )) if ((AttrVal($hash->{NAME}, "VacationDevice", "NONE" ) ne "NONE" ) && (AttrVal($hash->{NAME}, "VacationCheck", "1" ) ne "0" ))
{ {
my @VacationDays = split(/\|/, AttrVal($hash->{NAME},"VacationDays","1|2|3|4|5|6|7")); my @VacationDays = split(/\|/, AttrVal($hash->{NAME},"VacationDays","1|2|3|4|5|6|7"));
my $Day = grep {$_==$WDayNow;} @VacationDays; my $DayToday = grep {$_==$WDayToday;} @VacationDays;
my $DayTomorrow = grep {$_==$WDayTomorrow;} @VacationDays;
if ($Day == 1)
{
my @Vacation = split(/\|/, AttrVal($hash->{NAME},"VacationDevice","")); my @Vacation = split(/\|/, AttrVal($hash->{NAME},"VacationDevice",""));
my $a = 0; my $a = 0;
my $b = scalar(@Vacation); my $b = scalar(@Vacation);
@ -1206,17 +1229,25 @@ sub alarmclock_vacation_check($)
if( IsDevice( $VacationDevice[0], "holiday" )) if( IsDevice( $VacationDevice[0], "holiday" ))
{ {
my $today = strftime("%2m-%2d", localtime(time)); my $today = strftime("%2m-%2d", localtime(time));
my $tomorrow = strftime("%2m-%2d", localtime(time+86400));
my $todayevent = holiday_refresh($VacationDevice[0],$today); my $todayevent = holiday_refresh($VacationDevice[0],$today);
if ($todayevent ne "none") if (($todayevent ne "none") && ($DayToday == 1))
{ {
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $todayevent"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $todayevent";
return 1; $hash->{helper}{Today} = 9;
}
my $tomorrowevent = holiday_refresh($VacationDevice[0],$tomorrow);
if (($tomorrowevent ne "none") && ($DayTomorrow == 1))
{
$hash->{helper}{Tomorrow} = 9;
} }
} }
elsif( IsDevice($VacationDevice[0], "Calendar" )) elsif( IsDevice($VacationDevice[0], "Calendar" ))
{ {
my $stoday = strftime("%2d.%2m.%2y", localtime(time)); my $stoday = strftime("%2d.%2m.%2y", localtime(time));
my $stomorrow = strftime("%2d.%2m.%2y", localtime(time+86400));
my @tday = split('\.',$stoday); my @tday = split('\.',$stoday);
my @tmor = split('\.',$stomorrow);
my $fline = Calendar_Get($defs{$VacationDevice[0]},"get","full","mode=alarm|start|upcoming"); my $fline = Calendar_Get($defs{$VacationDevice[0]},"get","full","mode=alarm|start|upcoming");
my @lines = split('\n',$fline); my @lines = split('\n',$fline);
foreach $fline (@lines) foreach $fline (@lines)
@ -1227,42 +1258,46 @@ sub alarmclock_vacation_check($)
my @eday = split('\.',substr($chunks[3],9,10)); my @eday = split('\.',substr($chunks[3],9,10));
my $rets = ($sday[2]-$tday[2]-2000)*365+($sday[1]-$tday[1])*31+($sday[0]-$tday[0]); my $rets = ($sday[2]-$tday[2]-2000)*365+($sday[1]-$tday[1])*31+($sday[0]-$tday[0]);
my $rete = ($eday[2]-$tday[2]-2000)*365+($eday[1]-$tday[1])*31+($eday[0]-$tday[0]); my $rete = ($eday[2]-$tday[2]-2000)*365+($eday[1]-$tday[1])*31+($eday[0]-$tday[0]);
if ( ($rete>=0) && ($rets<=0) ) if (($rete>=0) && ($rets<=0) && ($DayToday == 1))
{ {
my $todaydesc = $chunks[5]; my $todaydesc = $chunks[5];
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $todaydesc"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $todaydesc";
return 1; $hash->{helper}{Today} = 9;
}
$rets = ($sday[2]-$tmor[2]-2000)*365+($sday[1]-$tmor[1])*31+($sday[0]-$tmor[0]);
$rete = ($eday[2]-$tmor[2]-2000)*365+($eday[1]-$tmor[1])*31+($eday[0]-$tmor[0]);
if (($rete>=0) && ($rets<=0) && ($DayTomorrow == 1))
{
$hash->{helper}{Tomorrow} = 9;
} }
} }
} }
} }
elsif (scalar(@VacationDevice) eq "2") elsif (scalar(@VacationDevice) eq "2")
{ {
if (ReadingsVal($VacationDevice[0],"state","NONE") eq $VacationDevice[1]) if ((ReadingsVal($VacationDevice[0],"state","NONE") eq $VacationDevice[1]) && ($DayToday == 1))
{ {
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $VacationDevice[1]"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $VacationDevice[1]";
return 1; $hash->{helper}{Today} = 9;
} }
} }
elsif (scalar(@VacationDevice) eq "3") elsif (scalar(@VacationDevice) eq "3")
{ {
my $VacationEvent = $VacationDevice[2]; my $VacationEvent = $VacationDevice[2];
$VacationEvent =~ s/ //g; $VacationEvent =~ s/ //g;
if (ReadingsVal($VacationDevice[0],$VacationDevice[1],"NONE") eq $VacationEvent) if ((ReadingsVal($VacationDevice[0],$VacationDevice[1],"NONE") eq $VacationEvent)&& ($DayToday == 1))
{ {
Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $VacationDevice[1] - $VacationEvent"; Log3 $hash->{NAME}, 1, "alarmclock: $hash->{NAME} - vacation => $VacationDevice[0] - $VacationDevice[1] - $VacationEvent";
return 1; $hash->{helper}{Today} = 9;
} }
} }
$a ++; $a ++;
} }
} }
}
return 0;
} }
######################################################################################## ########################################################################################
# #
# skip # skip
@ -1308,28 +1343,36 @@ sub alarmclock_Notify($$)
if((ReadingsVal($hash->{NAME},"state",0)) =~ /^(Alarm is running|Snooze for.*)/) if((ReadingsVal($hash->{NAME},"state",0)) =~ /^(Alarm is running|Snooze for.*)/)
{ {
if(my @AlarmOffDevice = split(/:/, AttrVal($hash->{NAME},"EventForAlarmOff",""),2)) if(my @AlarmOffDevice = split(/\|/, AttrVal($hash->{NAME},"EventForAlarmOff","")))
{ {
if(($devName eq $AlarmOffDevice[0]) && (grep { $AlarmOffDevice[1] eq $_ } @{$events})) foreach my $AlarmOffDevice(@AlarmOffDevice)
{
my @AlarmOffDevicePart = split(/:/, $AlarmOffDevice,2);
if(($devName eq $AlarmOffDevicePart[0]) && (grep { $AlarmOffDevicePart[1] eq $_ } @{$events}))
{ {
alarmclock_alarmroutine_stop($hash); alarmclock_alarmroutine_stop($hash);
} }
} }
} }
}
### Notify Snooze ### ### Notify Snooze ###
if((ReadingsVal($hash->{NAME},"state",0)) eq "Alarm is running") if((ReadingsVal($hash->{NAME},"state",0)) eq "Alarm is running")
{ {
if(my @SnoozeDevice = split(/:/, AttrVal($hash->{NAME},"EventForSnooze",""),2)) if(my @SnoozeDevice = split(/\|/, AttrVal($hash->{NAME},"EventForSnooze","")))
{ {
if(($devName eq $SnoozeDevice[0]) && (grep { $SnoozeDevice[1] eq $_ } @{$events})) foreach my $SnoozeDevice(@SnoozeDevice)
{
my @SnoozeDevicePart = split(/:/, $SnoozeDevice,2);
if(($devName eq $SnoozeDevicePart[0]) && (grep { $SnoozeDevicePart[1] eq $_ } @{$events}))
{ {
alarmclock_snooze_start($hash); alarmclock_snooze_start($hash);
} }
} }
} }
}
} }