diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 72141f41f..ef9e40c20 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1308,7 +1308,7 @@ sub CUL_HM_Parse($$) {######################################################### $setTemp = ($setTemp < 5 )?'off': ($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]) ; my @p; if ($mTp eq "10") {@p = @d[3..9]} @@ -1949,7 +1949,7 @@ sub CUL_HM_Parse($$) {######################################################### if($modules{CUL_HM}{defptr}{"$src$chn"}); push @evtEt,[$shash,1,"alive:yes"]; 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")];} 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") { ##################################################### return "Usage: set $a[0] $cmd data [data ...]" if(@a < 3); $state = ""; - foreach (@a[2..$#a]) { - CUL_HM_PushCmdStack($hash, $_); + my $msg = $a[2]; + foreach my $sub (@a[3..$#a]) { + last if ($sub !~ m/^[A-F0-9]*$/); + $msg .= $sub; } + CUL_HM_PushCmdStack($hash, $msg); } elsif($cmd eq "clear") { #################################################### my (undef,undef,$sectIn) = @a; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 1e2e5439c..956a4aceb 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -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=>"",}, "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",}, + "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=>"",}, "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=>"",}, @@ -848,6 +849,9 @@ $culHmRegType{pushButton} = $culHmRegType{remote}; "HM-SEC-SC" =>{ sabotageMsg =>1 ,msgScPosA =>1,msgScPosB =>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 , eventDlyTime =>1}, "HM-SEC-TIS" =>{ sabotageMsg =>1 @@ -1432,6 +1436,8 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"}; "HM-CC-RT-DN00" =>{ sysTime =>"" ,fwUpdate =>" ..." }, + "HM-LC-Bl1PBU-FM" =>{ fwUpdate =>" ..." + }, "HM-CC-RT-DN04" =>{ controlMode =>"[auto|manual|boost|day|night]" ,controlManu =>"[on|off|5.0..30.0]" ,controlParty =>" "