From db530c230c91f8fb7cf51312f4ac15d85d2a53df Mon Sep 17 00:00:00 2001 From: deespe Date: Mon, 8 May 2017 09:15:36 +0000 Subject: [PATCH] 22_HOMEMODE: v1.0.4 - fix UWZ Fn git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14217 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/22_HOMEMODE.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/FHEM/22_HOMEMODE.pm b/FHEM/22_HOMEMODE.pm index 00a3ffd79..e6a09b293 100644 --- a/FHEM/22_HOMEMODE.pm +++ b/FHEM/22_HOMEMODE.pm @@ -15,7 +15,7 @@ use POSIX; use Time::HiRes qw(gettimeofday); 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_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter"; my $HOMEMODE_UserModes = "gotosleep,awoken,asleep"; @@ -2514,18 +2514,19 @@ sub HOMEMODE_UWZCommands($$) { my ($hash,$events) = @_; my $name = $hash->{NAME}; - my $prev = ReadingsVal($name,"uwz_warnCount",""); + my $prev = ReadingsNum($name,"uwz_warnCount",-1); my $uwz = $attr{$name}{HomeUWZ}; my $count; my $warning; 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) { - $count =~ s/^WarnCount:\s//; - if ($count ne $prev) + if ($count != $prev) { my $se = $count > 0 ? "begin" : "end"; my @cmds; @@ -2534,7 +2535,7 @@ sub HOMEMODE_UWZCommands($$) { my $textShort; my $textLong; - for (my $i = 0; $i <= $count; $i++) + for (my $i = 0; $i < $count; $i++) { my $read = "Warn_$i"; $textShort .= " " if ($i > 0);