FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

22_HOMEMODE: v1.0.7 - fix GUEST not set location to arrival after none, fix UWZ text counter

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14277 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-05-14 09:54:11 +00:00
parent 4d8c099a3a
commit cd04af9cd7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/22_HOMEMODE.pm
View File

@ -15,7 +15,7 @@ use POSIX;
use Time::HiRes qw(gettimeofday);
use HttpUtils;
my $HOMEMODE_version = "1.0.6";
my $HOMEMODE_version = "1.0.7";
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";
@ -926,7 +926,7 @@ sub HOMEMODE_RESIDENTS($;$)
CommandDefine(undef,"atTmp_awoken_".$dev."_$name at +$hours set $dev:FILTER=state=awoken state home");
}
}
if ($usermode eq "home" && ReadingsVal($dev,"lastState","") =~ /^(absent|gone)$/ && $attr{$name}{HomeAutoArrival})
if ($usermode eq "home" && ReadingsVal($dev,"lastState","") =~ /^(absent|[gn]one)$/ && $attr{$name}{HomeAutoArrival})
{
my $hours = HOMEMODE_hourMaker($attr{$name}{HomeAutoArrival});
AnalyzeCommandChain(undef,"sleep 0.1; set $dev:FILTER=location!=arrival location arrival");
@ -2541,10 +2541,11 @@ sub HOMEMODE_UWZCommands($$)
for (my $i = 0; $i < $count; $i++)
{
my $read = "Warn_$i";
my $ii = $i + 1;
$textShort .= " " if ($i > 0);
$textLong .= " " if ($i > 0);
$textShort .= $i + 1 . ". " if ($count > 1);
$textLong .= $i + 1 . ". " if ($count > 1);
$textShort .= $ii.". " if ($count > 1);
$textLong .= $ii.". " if ($count > 1);
$textShort .= ReadingsVal($uwz,$read."_ShortText","");
$textLong .= ReadingsVal($uwz,$read."_LongText","");
}