From 2802adcc4315977c8cc3550eaa523df2d8e980d0 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sun, 16 Oct 2016 18:18:00 +0000 Subject: [PATCH] 00_CUL_HM: minor bugs git-svn-id: https://svn.fhem.de/fhem/trunk@12351 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_HMLAN.pm | 8 +++++--- fhem/FHEM/10_CUL_HM.pm | 17 +++++++++++++++-- fhem/FHEM/HMConfig.pm | 17 ++++++++++------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/fhem/FHEM/00_HMLAN.pm b/fhem/FHEM/00_HMLAN.pm index 6575ab4fb..05cd593ce 100755 --- a/fhem/FHEM/00_HMLAN.pm +++ b/fhem/FHEM/00_HMLAN.pm @@ -80,7 +80,7 @@ sub HMLAN_Initialize($) { "loadLevel ". "hmLanQlen:1_min,2_low,3_normal,4_high,5_critical ". "wdTimer:5,10,15,20,25 ". - "logIDs:multiple,sys,all ". + "logIDs:multiple,sys,all,broadcast ". $readingFnAttributes; } sub HMLAN_Define($$) {######################################################### @@ -269,10 +269,12 @@ sub HMLAN_Attr(@) {############################################################ } else{ $defs{$name}{helper}{log}{all}=0; + for (@ids) {s/broadcast/000000/g}; $_=substr(CUL_HM_name2Id($_),0,6) foreach(grep !/^$/,@ids); $_="" foreach(grep !/^[A-F0-9]{6}$/,@ids); @ids = HMLAN_noDup(@ids); push @idName,CUL_HM_id2Name($_) foreach(@ids); + for (@idName) {s/000000/broadcast/g}; } $attr{$name}{$aName} = join(",",@idName); @{$defs{$name}{helper}{log}{ids}}=grep !/^(sys|all)$/,@ids; @@ -353,8 +355,8 @@ sub HMLAN_Attr(@) {############################################################ sub HMLAN_UpdtLogId() {#################################################### $modules{HMLAN}{AttrList} =~ s/logIDs:.*? //; $modules{HMLAN}{AttrList} =~ s/logIDs:.*?$//; - $modules{HMLAN}{AttrList} .= " logIDs:multiple,sys,all," - .join(",",(devspec2array("TYPE=CUL_HM:FILTER=DEF=......:FILTER=subType!=virtual"))); + $modules{HMLAN}{AttrList} .= " logIDs:multiple,sys,all,broadcast," + .join(",",(devspec2array("TYPE=CUL_HM:FILTER=DEF=......:FILTER=model!=ActionDetector"))); return; } diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 4595034c3..df4687620 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -2106,7 +2106,7 @@ sub CUL_HM_Parse($$) {######################################################### } } } - elsif($mh{st} =~ m /^(remote|pushButton|swi)$/ + elsif($mh{st} =~ m /^(remote|pushButton|swi|display)$/ ||$mh{md} eq "HM-SEN-EP") { ############################################# if($mh{mTp} eq "40") { my $bat = ($mh{chnraw} & 0x80)?"low":"ok"; @@ -4953,7 +4953,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ ($pause < 1 ?1 : ($pause >160 ?160: $pause))); - + if($msg eq 'help'){ # display command info return "command options:" ."\n line1,icon1:line2,icon2:line3,icon3 sound repeat pause signal" @@ -4965,6 +4965,19 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ ."\n signal: ".join(" ",keys(%disp_signals)) ."\n " ."\n check for param reWriteDisplayxx: " + ."\n translate chars: " + ."\n [ => Ä" + ."\n # => Ö" + ."\n $ => Ü" + ."\n { => ä" + ."\n | => ö" + ."\n } => ü" + ."\n _ => ß" + ."\n ] => &" + ."\n ' => =" + ."\n @ => ∨" + ."\n > => ∧" + ."\n ; => Sandwatch" ; } my $snd = '020A'; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 1e04e2b74..6e3689053 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -274,7 +274,7 @@ my $K_actDetID = '000000'; # id of actionDetector ,"00D1" => {name=>"HM-LC-Bl1-SM-2" ,st=>'blindActuator' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",} # radio-controlled blind actuator 1-channel (flush-mount) ,"00D2" => {name=>"HM-LC-Bl1-FM-2" ,st=>'blindActuator' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",} # radio-controlled blind actuator 1-channel (flush-mount) # check config modess,"00D3" => {name=>"HM-Dis-WM55" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c:w:l' ,lst=>'1' ,chn=>"Dis:1:10",} - ,"00D3" => {name=>"HM-Dis-WM55" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c' ,lst=>'1,p' ,chn=>"Dis:1:10",} + ,"00D3" => {name=>"HM-Dis-WM55" ,st=>'display' ,cyc=>'' ,rxt=>'c' ,lst=>'1,p' ,chn=>"Dis:1:10",} ,"00D4" => {name=>"HM-RC-4-3" ,st=>'remote' ,cyc=>'' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"Btn:1:4",} ,"00D5" => {name=>"HM-RC-Sec4-3" ,st=>'remote' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"armInt:1:1,armExt:2:2,light:3:3,disarm:4:4",} ,"00D6" => {name=>"HM-RC-Key4-3" ,st=>'remote' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"unlock:1:1,lock:2:2,light:3:3,open:4:4",} @@ -311,7 +311,7 @@ my $K_actDetID = '000000'; # id of actionDetector ,"00F8" => {name=>"HM-RC-4-3-D" ,st=>'remote' ,cyc=>'' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"Btn:1:4",} ,"00F9" => {name=>"HM-Sec-Sir-WM" ,st=>'siren' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,3' ,chn=>"Sen:1:2,Panic:3:3,Arm:4:4",} ,"00FA" => {name=>"HM-OU-CFM-TW" ,st=>'outputUnit' ,cyc=>'' ,rxt=>'c:b' ,lst=>'3' ,chn=>"Led:1:1,Mp3:2:2",} - ,"00FB" => {name=>"HM-Dis-EP-WM55" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,3:1p.2p' ,chn=>"Btn:1:2,Dis:3:3,Key:4:8",} + ,"00FB" => {name=>"HM-Dis-EP-WM55" ,st=>'display' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,4:1p.2p' ,chn=>"Btn:1:2,Dis:3:3,Key:4:8",} ,"00FC" => {name=>"OLIGO-smart-iq-HM" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Dim:1:2,Dim1_V:3:4,Dim2_V:5:6",} ,"00FD" => {name=>"HM-Sen-LI-O" ,st=>'senBright' ,cyc=>'02:50' ,rxt=>'c:w' ,lst=>'1' ,chn=>""} @@ -1290,14 +1290,14 @@ $culHmRegModel{"HM-OU-CFM-TW"} = $culHmRegModel{"HM-OU-CFM-PL"}; ,wat1_hour =>1,wat1_min =>1, ,wat2_hour =>1,wat2_min =>1, } - ,"HM-Dis-EP-WM5501" =>{ transmitTryMax =>1} + ,"HM-Dis-EP-WM5501" =>{ transmitTryMax =>1,peerNeedsBurst =>1,expectAES =>1} + ,"HM-Dis-EP-WM5503" =>{ transmitTryMax =>1} ); #clones - - - - - - - - - - - - - - - -$culHmRegChan{"HM-Dis-EP-WM5502"} = -$culHmRegChan{"HM-Dis-EP-WM5503"} = $culHmRegChan{"HM-Dis-EP-WM5501"}; +$culHmRegChan{"HM-Dis-EP-WM5502"} = $culHmRegChan{"HM-Dis-EP-WM5501"}; $culHmRegChan{"HM-Sec-Sir-WM02"} = $culHmRegChan{"HM-Sec-Sir-WM03"} = $culHmRegChan{"HM-Sec-Sir-WM01"}; @@ -1761,7 +1761,6 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"}; ,tempTmplSet =>"[[-file-:]templateName] ..." ,peerChan =>"-btnNumber- -actChn- ... single [set|unset] [actor|remote|both]" } - ,"HM-TC-IT-WM-W-EU07" =>{ peerChan =>"-btnNumber- -actChn- ... single [set|unset] [actor|remote|both]"} ,"HM-ES-PMSw1-Pl01" =>{ "on-for-timer" =>"-sec-" ,"on-till" =>"-time-" ,on =>"" @@ -1774,7 +1773,8 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"}; ,"HM-ES-PMSw1-Pl00" =>{ getSerial => "" ,getDevInfo => "" } - ,"HM-Dis-WM5501" =>{ displayWM =>"[long|short|help] -lineX- -textNo1- -color1- -icon1- [-textNo2- -color2- -icon2-] ...[-textNo6- -color6- -icon6-] "} + ,"HM-Dis-WM5501" =>{ displayWM =>"[long|short|help] -lineX- -textNo1- -color1- -icon1- [-textNo2- -color2- -icon2-] ...[-textNo6- -color6- -icon6-] " + ,peerChan =>"-btnNumber- -actChn- ... single [set|unset] [actor|remote|both]"} ,"CCU-FHEM00" =>{ update =>"" ,hmPairForSec =>"-sec- ..." ,hmPairSerial =>"-serial-" @@ -1841,6 +1841,9 @@ $culHmChanSets{"ROTO_ZEL-STG-RM-FWT02"} = $culHmChanSets{"HM-CC-TC02"}; $culHmChanSets{"HM-LC-Sw1PBU-FM00"} = $culHmChanSets{"HM-LC-Bl1PBU-FM00"}; $culHmChanSets{"HM-CC-RD-O00"} = $culHmChanSets{"HM-LC-Bl1PBU-FM00"}; #$culHmChanSets{"HM-ES-PMSw1-Pl00"} = $culHmChanSets{"HM-LC-Bl1PBU-FM00"}; +$culHmChanSets{"HM-TC-IT-WM-W-EU07"} = +$culHmChanSets{"HM-Dis-EP-WM5501"} = +$culHmChanSets{"HM-Dis-EP-WM5502"} = $culHmChanSets{"HM-TC-IT-WM-W-EU01"}; %culHmFunctSets = (# command depending on function sdLead1 =>{ alarmOn =>""