Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

22_HOMEMODE: v1.0.4 - fix UWZ Fn

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14217 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-05-08 09:15:36 +00:00
parent ab5f24a570
commit db530c230c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FHEM/22_HOMEMODE.pm
View File

@ -15,7 +15,7 @@ use POSIX;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
my $HOMEMODE_version = "1.0.3"; my $HOMEMODE_version = "1.0.4";
my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night"; my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night";
my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter"; my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter";
my $HOMEMODE_UserModes = "gotosleep,awoken,asleep"; my $HOMEMODE_UserModes = "gotosleep,awoken,asleep";
@ -2514,18 +2514,19 @@ sub HOMEMODE_UWZCommands($$)
{ {
my ($hash,$events) = @_; my ($hash,$events) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $prev = ReadingsVal($name,"uwz_warnCount",""); my $prev = ReadingsNum($name,"uwz_warnCount",-1);
my $uwz = $attr{$name}{HomeUWZ}; my $uwz = $attr{$name}{HomeUWZ};
my $count; my $count;
my $warning; my $warning;
foreach my $evt (@{$events}) foreach my $evt (@{$events})
{ {
$count = $evt if (grep /^WarnCount$/,$evt) next unless (grep /^WarnCount:\s[0-9]$/,$evt);
$count = $evt;
$count =~ s/^WarnCount:\s//;
} }
if (defined $count) if (defined $count)
{ {
$count =~ s/^WarnCount:\s//; if ($count != $prev)
if ($count ne $prev)
{ {
my $se = $count > 0 ? "begin" : "end"; my $se = $count > 0 ? "begin" : "end";
my @cmds; my @cmds;
@ -2534,7 +2535,7 @@ sub HOMEMODE_UWZCommands($$)
{ {
my $textShort; my $textShort;
my $textLong; my $textLong;
for (my $i = 0; $i <= $count; $i++) for (my $i = 0; $i < $count; $i++)
{ {
my $read = "Warn_$i"; my $read = "Warn_$i";
$textShort .= " " if ($i > 0); $textShort .= " " if ($i > 0);