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

CUL_HM:SD2 alarm 2nd

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11486 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-05-21 14:25:54 +00:00
parent 375e804ef3
commit 3d70daf78f
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
FHEM/10_CUL_HM.pm
View File

@ -3287,15 +3287,15 @@ sub CUL_HM_parseSDteam(@){#handle SD team events
(!$dHash->{helper}{alarmNo} || $dHash->{helper}{alarmNo} ne $No)){ (!$dHash->{helper}{alarmNo} || $dHash->{helper}{alarmNo} ne $No)){
$dHash->{helper}{alarmNo} = $No; $dHash->{helper}{alarmNo} = $No;
} }
else{
return ();# duplicate alarm
}
my ($sVal,$sProsa,$smokeSrc) = (hex($state),"off","none"); my ($sVal,$sProsa,$smokeSrc) = (hex($state),"off","none");
if ($sVal > 1){ if ($sVal > 1){
$sProsa = "smoke-Alarm_".$No; $sProsa = "smoke-Alarm_".$No;
$smokeSrc = $dName; $smokeSrc = $dName;
push @evtEt,[$sHash,1,"recentAlarm:$smokeSrc"] if($sVal == 200);
} }
return if($sProsa eq ReadingsVal($sHash->{NAME},"state",""));
push @evtEt,[$sHash,1,"recentAlarm:$smokeSrc"] if($sVal == 200);
push @evtEt,[$sHash,1,"state:$sProsa"]; push @evtEt,[$sHash,1,"state:$sProsa"];
push @evtEt,[$sHash,1,'level:'.$sVal]; push @evtEt,[$sHash,1,'level:'.$sVal];
push @evtEt,[$sHash,1,"eventNo:".$No]; push @evtEt,[$sHash,1,"eventNo:".$No];
@ -5106,47 +5106,50 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
elsif($cmd eq "teamCall") { ################################################# elsif($cmd eq "teamCall") { #################################################
$state = ""; $state = "";
if ($fkt ne "sdLead2"){# $md eq "HM-CC-SCD") my $sId = $roleV ? $dst : $id; # ID of cmd-source must not be a physical
# device. It can cause trouble with
# subsequent alarming
if ($fkt ne "sdLead2"){# $md eq "HM-CC-SCD")
my $testnr = $hash->{TESTNR} ? ($hash->{TESTNR} +1) : 1; my $testnr = $hash->{TESTNR} ? ($hash->{TESTNR} +1) : 1;
$hash->{TESTNR} = $testnr; $hash->{TESTNR} = $testnr;
my $tstNo = sprintf("%02X",$testnr); my $tstNo = sprintf("%02X",$testnr);
my $msg = "++9440".$dst.$dst."00".$tstNo; CUL_HM_PushCmdStack($hash, "++9440".$dst.$sId."00".$tstNo);
CUL_HM_PushCmdStack($hash, $msg); CUL_HM_parseSDteam("40",$dst,$sId,"00".$tstNo);
CUL_HM_parseSDteam("40",$dst,$dst,"00".$tstNo);
} }
else {#if ($md eq "HM-SEC-SD-2"){ else {#if ($md eq "HM-SEC-SD-2"){
#1441 44E347 44E347 0102 960000 039190BDC8 #1441 44E347 44E347 0102 960000 039190BDC8
my $testnr = $hash->{TESTNR} ? ($hash->{TESTNR} +1) : 1; my $testnr = $hash->{TESTNR} ? ($hash->{TESTNR} +1) : 1;
$hash->{TESTNR} = $testnr; $hash->{TESTNR} = $testnr;
my $tstNo = sprintf("%02X",$testnr);
my $msg = "++1441$dst${dst}01${tstNo}9600"; # 96 switch on - other number is unknown # 96 switch on- others unknown
$msg = CUL_HM_generateCBCsignature($hash, $msg); my $msg = CUL_HM_generateCBCsignature($hash,
sprintf("++1441$dst${sId}01%02X9600",$testnr));
CUL_HM_PushCmdStack($hash, $msg) foreach (1..6); CUL_HM_PushCmdStack($hash, $msg) foreach (1..6);
CUL_HM_parseSDteam_2("41",$dst,$id,substr($msg, 18)); CUL_HM_parseSDteam_2("41",$dst,$sId,substr($msg, 18));
} }
} }
elsif($cmd =~ m/alarm(.*)/) { ############################################### elsif($cmd =~ m/alarm(.*)/) { ###############################################
$state = ""; $state = "";
my $sId = $roleV ? $dst : $id; # ID of cmd-source must not be a physical
# device. It can cause trouble with
# subsequent alarming
if ($fkt ne "sdLead2"){ if ($fkt ne "sdLead2"){
my $p = (($1 eq "On")?"0BC8":"0C01"); my $p = (($1 eq "On")?"0BC8":"0C01");
my $msg = "++9441".$dst.$dst."01".$p; my $msg = "++9441".$dst.$sId."01".$p;
CUL_HM_PushCmdStack($hash, $msg);# repeat non-ack messages 3 times CUL_HM_PushCmdStack($hash, $msg) foreach (1..3);# 3 reps fpr non-ack msg
CUL_HM_PushCmdStack($hash, $msg); CUL_HM_parseSDteam("41",$dst,$sId,"01".$p);
CUL_HM_PushCmdStack($hash, $msg);
CUL_HM_parseSDteam("41",$dst,$dst,"01".$p);
} }
else{ else{
# my $p = (($1 eq "On")?"C8":"01");
my $p = (($1 eq "On")?"C6":"00"); my $p = (($1 eq "On")?"C6":"00");
my $testnr = $hash->{TESTNR} ? ($hash->{TESTNR} +1) : 1; my $testnr = $hash->{TESTNR} ? ($hash->{TESTNR} +1) : 1;
$hash->{TESTNR} = $testnr; $hash->{TESTNR} = $testnr;
my $tstNo = sprintf("%02X",$testnr);
my $msg = "++1441$dst${dst}01$tstNo${p}00"; # 96 switch on - other number is unknown
$msg = CUL_HM_generateCBCsignature($hash, $msg); my $msg = CUL_HM_generateCBCsignature($hash,
sprintf("++1441$dst${sId}01%02X${p}00",$testnr));
CUL_HM_PushCmdStack($hash, $msg) foreach (1..6); CUL_HM_PushCmdStack($hash, $msg) foreach (1..6);
CUL_HM_parseSDteam_2("41",$dst,$id,substr($msg, 18)); CUL_HM_parseSDteam_2("41",$dst,$sId,substr($msg, 18));
} }
} }