Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

CUL_HM: minor bugs

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12014 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-08-20 12:27:09 +00:00
parent 856332073d
commit ffe08d208e
2 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/10_CUL_HM.pm
View File

@ -153,10 +153,6 @@ sub CUL_HM_Initialize($) {
."autoReadReg:0_off,1_restart,2_pon-restart,3_onChange,4_reqStatus,5_readMissing,8_stateOnly "
."burstAccess:0_off,1_auto "
."msgRepeat "
#General ."hmDstDly:slider,104,4,136 " # CUL destination answer delay
#General ."hmPairAddDly:slider,-16,8,440 " # CUL additional destination delay for pair request
#General ."SndThrRep:0,1 " # CUL force expectation of send through repeater
#General ."RepBstAddDly:slider,0,8,600 " # CUL additional first answer delay for burst devices using repeater to device, 552 is a good value for HM-LC-SW1-BA-PCB
."hmProtocolEvents:0_off,1_dump,2_dumpFull,3_dumpTrigger "
."aesKey:5,4,3,2,1,0 "
;
@ -3014,9 +3010,7 @@ sub CUL_HM_parseCommon(@){#####################################################
}
elsif($mhp->{mTp} eq "00"){######################################
Log 1,"General --------- start me";
if (InternalVal($mhp->{devN},"lastMsg",undef) =~ m/t:00/){# repeated
Log 1,"General --------- stop me###########";
if (InternalVal($mhp->{devN},"lastMsg","") =~ m/t:00/){# repeated
return "done"; # suppress handling of a repeated pair request
}
my $paired = 0; #internal flag
@ -3310,7 +3304,7 @@ sub CUL_HM_parseCommon(@){#####################################################
}
elsif($mhp->{mFlgH} & 2 # dst can be garbage - but not if answer request
&& ( !$mhp->{dstH}
|| $mhp->{dstH}{NAME} ne InternalVal($mhp->{devN},"IODev",""))
|| $mhp->{dst} ne CUL_HM_IoId($mhp->{dstH}))
){
my $pName = CUL_HM_id2Name($mhp->{dst});
push @evtEt,[$mhp->{cHash},1,"trigDst_$pName:noConfig"];

9
fhem/FHEM/HMConfig.pm
View File

@ -312,11 +312,12 @@ my $K_actDetID = '000000'; # id of actionDetector
,"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",}
,"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=>'00:10' ,rxt=>'c:w' ,lst=>'1' ,chn=>""}
,"00FD" => {name=>"HM-Sen-LI-O" ,st=>'senBright' ,cyc=>'02:50' ,rxt=>'c:w' ,lst=>'1' ,chn=>""}
,"0101" => {name=>"HM-LC-Sw2PBU-FM" ,alias=>"HM-LC-Sw2-FM-2"}
,"0102" => {name=>"HM-WDS30-OT2-SM-2" ,alias=>"HM-WDS30-OT2-SM" }
,"0103" => {name=>"HM-LC-Sw1-PCB" ,alias=>"HM-LC-Sw4-SM-2" }
,"0104" => {name=>"HM-LC-AO-SM" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Dim:1:1,Dim1_V:2:3"}
,"8001" => {name=>"PS-switch" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Sw:1:4",}
,"8002" => {name=>"PS-Th-Sens" ,st=>'THSensor' ,cyc=>'' ,rxt=>'' ,lst=>'1,4' ,chn=>"Sen:1:4",}
@ -646,6 +647,10 @@ foreach my $al (keys %culHmModel){ # duplicate entries for alias devices
txThrHiFrq =>{a=>135.0,s=>4 ,l=>1,min=>48.72,max=>51.27 ,c=>'' ,f=>'100' ,u=>'Hz' ,d=>1,t=>"threshold low frequency"},
txThrLoFrq =>{a=>139.0,s=>4 ,l=>1,min=>48.72,max=>51.27 ,c=>'' ,f=>'100' ,u=>'Hz' ,d=>1,t=>"threshold high frequency"},
voltage_0 =>{a=>173.0,s=>1 ,l=>1,min=>0 ,max=>0.2 ,c=>'' ,f=>'200' ,u=>'%' ,d=>1,t=>"lower Voltage"},
voltage_100 =>{a=>174.0,s=>1 ,l=>1,min=>0.3 ,max=>1.0 ,c=>'' ,f=>'200' ,u=>'%' ,d=>1,t=>"higher Voltage"},
relayDelay =>{a=>175.0,s=>1 ,l=>1,min=>0 ,max=>111600 ,c=>'fltCvT' ,f=>'' ,u=>'s' ,d=>1,t=>"relay off delay time"},
evtFltrPeriod =>{a=> 1.0,s=>0.4,l=>1,min=>0.5 ,max=>7.5 ,c=>'' ,f=>2 ,u=>'s' ,d=>1,t=>"event filter period"},
evtFltrNum =>{a=> 1.4,s=>0.4,l=>1,min=>1 ,max=>15 ,c=>'' ,f=>'' ,u=>'' ,d=>1,t=>"sensitivity - read each n-th puls"},
minInterval =>{a=> 2.0,s=>0.3,l=>1,min=>0 ,max=>4 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"interval in sec" ,lit=>{15=>0,30=>1,60=>2,120=>3,240=>4}},
@ -1084,6 +1089,8 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
,peerNeedsBurst =>1
}
,"HM-SEC-SD-2" =>{ devRepeatCntMax =>1}
,"HM-LC-AO-SM" =>{ voltage_0 =>1,voltage_100 =>1,relayDelay =>1}
);
#clones - - - - - - - - - - - - - - -