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

add sec-sco

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@6343 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-08-02 07:35:08 +00:00
parent 4614d07a49
commit 03d0473f97
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FHEM/10_CUL_HM.pm
View File

@ -1308,7 +1308,7 @@ sub CUL_HM_Parse($$) {#########################################################
$setTemp = ($setTemp < 5 )?'off': $setTemp = ($setTemp < 5 )?'off':
($setTemp >30 )?'on' :sprintf("%.1f",$setTemp); ($setTemp >30 )?'on' :sprintf("%.1f",$setTemp);
if (defined $d[4]){# message with party mode if (defined $d[11]){# message with party mode
$pTemp =(($d[11] )& 0x3f)/2 if (defined $d[11]) ; $pTemp =(($d[11] )& 0x3f)/2 if (defined $d[11]) ;
my @p; my @p;
if ($mTp eq "10") {@p = @d[3..9]} if ($mTp eq "10") {@p = @d[3..9]}
@ -1949,7 +1949,7 @@ sub CUL_HM_Parse($$) {#########################################################
if($modules{CUL_HM}{defptr}{"$src$chn"}); if($modules{CUL_HM}{defptr}{"$src$chn"});
push @evtEt,[$shash,1,"alive:yes"]; push @evtEt,[$shash,1,"alive:yes"];
push @evtEt,[$shash,1,"battery:". (($err&0x80)?"low" :"ok" )]; push @evtEt,[$shash,1,"battery:". (($err&0x80)?"low" :"ok" )];
if ( $md eq "HM-SEC-SC" || if ( $md =~ m/^HM-SEC-SC/ ||
$md eq "HM-Sec-RHS"){push @evtEt,[$shash,1,"sabotageError:".(($err&0x0E)?"on" :"off")];} $md eq "HM-Sec-RHS"){push @evtEt,[$shash,1,"sabotageError:".(($err&0x0E)?"on" :"off")];}
elsif($md ne "HM-SEC-WDS"){push @evtEt,[$shash,1,"cover:" .(($err&0x0E)?"open" :"closed")];} elsif($md ne "HM-SEC-WDS"){push @evtEt,[$shash,1,"cover:" .(($err&0x0E)?"open" :"closed")];}
} }
@ -3164,9 +3164,12 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
if ($cmd eq "raw") { ##################################################### if ($cmd eq "raw") { #####################################################
return "Usage: set $a[0] $cmd data [data ...]" if(@a < 3); return "Usage: set $a[0] $cmd data [data ...]" if(@a < 3);
$state = ""; $state = "";
foreach (@a[2..$#a]) { my $msg = $a[2];
CUL_HM_PushCmdStack($hash, $_); foreach my $sub (@a[3..$#a]) {
last if ($sub !~ m/^[A-F0-9]*$/);
$msg .= $sub;
} }
CUL_HM_PushCmdStack($hash, $msg);
} }
elsif($cmd eq "clear") { #################################################### elsif($cmd eq "clear") { ####################################################
my (undef,undef,$sectIn) = @a; my (undef,undef,$sectIn) = @a;

6
FHEM/HMConfig.pm
View File

@ -258,6 +258,7 @@ my $K_actDetID = '000000'; # id of actionDetector
"00C0" => {name=>"HM-SEC-MDIR-2" ,st=>'motionDetector' ,cyc=>'00:20' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"",}, "00C0" => {name=>"HM-SEC-MDIR-2" ,st=>'motionDetector' ,cyc=>'00:20' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"",},
"00C1" => {name=>"HM-Sen-MDIR-O-2" ,st=>'motionDetector' ,cyc=>'00:10' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"",}, "00C1" => {name=>"HM-Sen-MDIR-O-2" ,st=>'motionDetector' ,cyc=>'00:10' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"",},
"00C2" => {name=>"HM-PB-2-WM55-2" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"Btn:1:2",}, "00C2" => {name=>"HM-PB-2-WM55-2" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"Btn:1:2",},
"00C7" => {name=>"HM-SEC-SCo" ,st=>'threeStateSensor' ,cyc=>'00:50' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"",},
"00C8" => {name=>"HM-LC-Sw1-Pl-3" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",}, "00C8" => {name=>"HM-LC-Sw1-Pl-3" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",},
"00C9" => {name=>"HM-LC-Sw1-SM-2" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",}, "00C9" => {name=>"HM-LC-Sw1-SM-2" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",},
"00CA" => {name=>"HM-LC-Sw1-FM-2" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",}, "00CA" => {name=>"HM-LC-Sw1-FM-2" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",},
@ -848,6 +849,9 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
"HM-SEC-SC" =>{ sabotageMsg =>1 "HM-SEC-SC" =>{ sabotageMsg =>1
,msgScPosA =>1,msgScPosB =>1 ,msgScPosA =>1,msgScPosB =>1
, ledOnTime =>1,eventDlyTime =>1}, , ledOnTime =>1,eventDlyTime =>1},
"HM-SEC-SCo" =>{ sabotageMsg =>1,localResDis =>1,
,msgScPosA =>1,msgScPosB =>1
, ledOnTime =>1,eventDlyTime =>1},
"HM-SCI-3-FM" =>{ msgScPosA =>1,msgScPosB =>1 "HM-SCI-3-FM" =>{ msgScPosA =>1,msgScPosB =>1
, eventDlyTime =>1}, , eventDlyTime =>1},
"HM-SEC-TIS" =>{ sabotageMsg =>1 "HM-SEC-TIS" =>{ sabotageMsg =>1
@ -1432,6 +1436,8 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"};
"HM-CC-RT-DN00" =>{ sysTime =>"" "HM-CC-RT-DN00" =>{ sysTime =>""
,fwUpdate =>"<filename> <bootTime> ..." ,fwUpdate =>"<filename> <bootTime> ..."
}, },
"HM-LC-Bl1PBU-FM" =>{ fwUpdate =>"<filename> <bootTime> ..."
},
"HM-CC-RT-DN04" =>{ controlMode =>"[auto|manual|boost|day|night]" "HM-CC-RT-DN04" =>{ controlMode =>"[auto|manual|boost|day|night]"
,controlManu =>"[on|off|5.0..30.0]" ,controlManu =>"[on|off|5.0..30.0]"
,controlParty =>"<temp> <startDate> <startTime> <enddate> <endTime>" ,controlParty =>"<temp> <startDate> <startTime> <enddate> <endTime>"