FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 07:56:03 +00:00
Code Issues Releases Wiki Activity

22_HOMEMODE: new reading alarmState, add homebridgeMapping for current alarms

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14643 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-07-04 18:08:13 +00:00
parent b55109e5b6
commit 3468239487
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/22_HOMEMODE.pm
View File

@ -16,7 +16,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use vars qw{%attr %defs %modules}; use vars qw{%attr %defs %modules};
my $HOMEMODE_version = "1.1.3"; my $HOMEMODE_version = "1.1.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";
@ -880,6 +880,7 @@ sub HOMEMODE_set_modeAlarm($$$)
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash,"prevModeAlarm",$amode); readingsBulkUpdate($hash,"prevModeAlarm",$amode);
readingsBulkUpdate($hash,"modeAlarm",$option); readingsBulkUpdate($hash,"modeAlarm",$option);
readingsBulkUpdateIfChanged($hash,"alarmState",$option);
readingsEndUpdate($hash,1); readingsEndUpdate($hash,1);
HOMEMODE_TriggerState($hash) if ($hash->{SENSORSCONTACT} || $hash->{SENSORSMOTION}); HOMEMODE_TriggerState($hash) if ($hash->{SENSORSCONTACT} || $hash->{SENSORSMOTION});
HOMEMODE_execCMDs($hash,HOMEMODE_serializeCMD($hash,@commands),$resident) if (@commands); HOMEMODE_execCMDs($hash,HOMEMODE_serializeCMD($hash,@commands),$resident) if (@commands);
@ -908,12 +909,14 @@ sub HOMEMODE_alarmTriggered($@)
push @commands,$attr{$name}{"HomeCMDalarmTriggered-on"} if ($attr{$name}{"HomeCMDalarmTriggered-on"}); push @commands,$attr{$name}{"HomeCMDalarmTriggered-on"} if ($attr{$name}{"HomeCMDalarmTriggered-on"});
readingsBulkUpdateIfChanged($hash,"alarmTriggered",join ",",@triggers); readingsBulkUpdateIfChanged($hash,"alarmTriggered",join ",",@triggers);
readingsBulkUpdateIfChanged($hash,"alarmTriggered_hr",$text); readingsBulkUpdateIfChanged($hash,"alarmTriggered_hr",$text);
readingsBulkUpdateIfChanged($hash,"alarmState","alarm");
} }
else else
{ {
push @commands,$attr{$name}{"HomeCMDalarmTriggered-off"} if ($attr{$name}{"HomeCMDalarmTriggered-off"} && ReadingsVal($name,"alarmTriggered","")); push @commands,$attr{$name}{"HomeCMDalarmTriggered-off"} if ($attr{$name}{"HomeCMDalarmTriggered-off"} && ReadingsVal($name,"alarmTriggered",""));
readingsBulkUpdateIfChanged($hash,"alarmTriggered",""); readingsBulkUpdateIfChanged($hash,"alarmTriggered","");
readingsBulkUpdateIfChanged($hash,"alarmTriggered_hr",""); readingsBulkUpdateIfChanged($hash,"alarmTriggered_hr","");
readingsBulkUpdateIfChanged($hash,"alarmState",ReadingsVal($name,"modeAlarm","disarm"));
} }
readingsEndUpdate($hash,1); readingsEndUpdate($hash,1);
HOMEMODE_execCMDs($hash,HOMEMODE_serializeCMD($hash,@commands)) if (@commands && ReadingsAge($name,"modeAlarm","") > 5); HOMEMODE_execCMDs($hash,HOMEMODE_serializeCMD($hash,@commands)) if (@commands && ReadingsAge($name,"modeAlarm","") > 5);
@ -2723,8 +2726,8 @@ sub HOMEMODE_HomebridgeMapping($)
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $mapping; my $mapping;
$mapping .= "SecuritySystemCurrentState=modeAlarm,values=armhome:0;armaway:1;armnight:2;disarm:3"; $mapping .= "SecuritySystemCurrentState=alarmState,values=armhome:0;armaway:1;armnight:2;disarm:3;alarm:4";
$mapping .= "\nSecuritySystemTargetState=SecuritySystemCurrentState,cmds=0:modeAlarm+armhome;1:modeAlarm+armaway;2:modeAlarm+armnight;3:modeAlarm+disarm,delay=1"; $mapping .= "\nSecuritySystemTargetState=modeAlarm,values=armhome:0;armaway:1;armnight:2;disarm:3,cmds=0:modeAlarm+armhome;1:modeAlarm+armaway;2:modeAlarm+armnight;3:modeAlarm+disarm,delay=1";
$mapping .= "\nSecuritySystemAlarmType=alarmTriggered_ct,values=0:0;/.*/:1"; $mapping .= "\nSecuritySystemAlarmType=alarmTriggered_ct,values=0:0;/.*/:1";
$mapping .= "\nOccupancyDetected=presence,values=present:1;absent:0"; $mapping .= "\nOccupancyDetected=presence,values=present:1;absent:0";
$mapping .= "\nMute=dnd,valueOn=on,cmds=1:dnd+on;0:dnd+off"; $mapping .= "\nMute=dnd,valueOn=on,cmds=1:dnd+on;0:dnd+off";
@ -3721,6 +3724,10 @@ sub HOMEMODE_Details($$$)
<a name="HOMEMODE_read"></a> <a name="HOMEMODE_read"></a>
<p><b>Readings</b></p> <p><b>Readings</b></p>
<ul> <ul>
<li>
<b><i>alarmState</i></b><br>
current state of alarm system (includes current alarms - for homebridgeMapping)
</li>
<li> <li>
<b><i>alarmTriggered</i></b><br> <b><i>alarmTriggered</i></b><br>
list of triggered alarm sensors (contact/motion sensors) list of triggered alarm sensors (contact/motion sensors)
@ -3942,7 +3949,7 @@ sub HOMEMODE_Details($$$)
</li> </li>
<li> <li>
<b><i>modeAlarm</i></b><br> <b><i>modeAlarm</i></b><br>
current alarm mode current mode of alarm system
</li> </li>
<li> <li>
<b><i>motionsInside</i></b><br> <b><i>motionsInside</i></b><br>