mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-01-31 06:39:11 +00:00
10_CUL_HM: integrate HMLGW fragments
git-svn-id: https://svn.fhem.de/fhem/trunk@11801 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
parent
ffc71c6aa6
commit
c8c8798b8a
@ -288,8 +288,14 @@ sub CUL_HM_updateConfig($){
|
||||
$hash->{helper}{role}{vrt} = 1;
|
||||
if($hash->{helper}{role}{dev}){
|
||||
CUL_HM_UpdtCentral($name); # first update, then keys
|
||||
if(eval "defined(&HMLAN_writeAesKey)"){
|
||||
HMLAN_writeAesKey($_) foreach (split ",",AttrVal($name,"IOList",""));
|
||||
foreach my $io (split ",",AttrVal($name,"IOList","")) {
|
||||
next if(!$defs{$io});
|
||||
if($defs{$io}->{TYPE} eq "HMLAN" && eval "defined(&HMLAN_writeAesKey)"){
|
||||
HMLAN_writeAesKey($io);
|
||||
}
|
||||
elsif ($defs{$io}->{TYPE} eq "HMUARTLGW") {
|
||||
CallFn($io,"WriteFn",$defs{$io},undef,"writeAesKey:${io}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -828,8 +834,14 @@ sub CUL_HM_Attr(@) {#################################
|
||||
delete $attr{$name}{$attrName};
|
||||
}
|
||||
if ($init_done){
|
||||
if(eval "defined(&HMLAN_writeAesKey)"){
|
||||
HMLAN_writeAesKey($_) foreach (split ",",AttrVal($name,"IOList",""));
|
||||
foreach my $io (split ",",AttrVal($name,"IOList","")) {
|
||||
next if(!$defs{$io});
|
||||
if($defs{$io}->{TYPE} eq "HMLAN" && eval "defined(&HMLAN_writeAesKey)"){
|
||||
HMLAN_writeAesKey($io);
|
||||
}
|
||||
elsif ($defs{$io}->{TYPE} eq "HMUARTLGW") {
|
||||
CallFn($io,"WriteFn",$defs{$io},undef,"writeAesKey:${io}");
|
||||
}
|
||||
}
|
||||
}
|
||||
return $retVal;
|
||||
@ -920,7 +932,7 @@ sub CUL_HM_hmInitMsgUpdt($){ #update device init msg for HMLAN
|
||||
if (( $hash->{helper}{io}{newChn} ne $oldChn)
|
||||
&& $hash->{IODev}
|
||||
&& $hash->{IODev}->{TYPE}
|
||||
&& $hash->{IODev}->{TYPE} eq "HMLAN"){
|
||||
&& $hash->{IODev}->{TYPE} =~ m/^(HMLAN|HMUARTLGW)$/){
|
||||
IOWrite($hash, "", "init:$p[0]");
|
||||
}
|
||||
}
|
||||
@ -1924,11 +1936,9 @@ sub CUL_HM_Parse($$) {#########################################################
|
||||
}
|
||||
}
|
||||
my $pVal = $val;# necessary for oper 'off', not logical off
|
||||
Log 1,"General $val-$lvlMin";
|
||||
$val = (($val-$lvlMin)<=0)
|
||||
? ($val?1:0)
|
||||
: int((($val-$lvlMin)*200)/($lvlMax - $lvlMin))/2;
|
||||
Log 1,"General $val-$lvlMin";
|
||||
|
||||
# blind option: reverse Level Meaning 0 = open, 100 = closed
|
||||
if (AttrVal($mh{cName}, "param", "") =~ m/levelInverse/){;
|
||||
@ -2795,7 +2805,7 @@ sub CUL_HM_parseCommon(@){#####################################################
|
||||
}
|
||||
if($rxt & 0x10 && $mhp->{devH}{helper}{prt}{sleeping}){ # lazy config
|
||||
if($mhp->{mFlgH} & 0x02 #wakeup device
|
||||
&& $defs{$mhp->{devH}{IODev}{NAME}}{TYPE} eq "HMLAN"){
|
||||
&& $defs{$mhp->{devH}{IODev}{NAME}}{TYPE} =~ m/^(HMLAN|HMUARTLGW)$/){
|
||||
$mhp->{devH}{helper}{io}{newCh} = 1 if ($mhp->{devH}{helper}{prt}{sProc} == 2);
|
||||
CUL_HM_appFromQ($mhp->{devN},"cf");# stack cmds if waiting
|
||||
$mhp->{devH}{helper}{prt}{sleeping} = 0;
|
||||
@ -4298,8 +4308,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
|
||||
my $curVal = CUL_HM_getRegFromStore($rName,$addr,$list,$peerId.$peerChn);
|
||||
if ($curVal !~ m/^(set_|)(\d+)$/){
|
||||
return "peer required for $regName" if ($curVal =~ m/peer/);
|
||||
return "cannot calculate value. Please issue set $name getConfig first - $curVal"
|
||||
if ($curVal !~ m/^(set_|)(\d+)$/);
|
||||
return "cannot calculate value. Please issue set $name getConfig first - $curVal";
|
||||
}
|
||||
$curVal = $2; # we expect one byte in int, strap 'set_' possibly
|
||||
$data = ($curVal & (~($mask<<$bit)))|($data<<$bit);
|
||||
@ -7289,19 +7298,20 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
|
||||
for (my $size2go = $size;$size2go>0;$size2go -=8){
|
||||
my $addrS = sprintf("%02X",$addr);
|
||||
my ($dReadS,$dReadR) = (undef,"");
|
||||
$dReadS = $1 if( $sRL =~ m/$addrS:(..)/);
|
||||
$dReadR = $1 if( $rRL =~ m/$addrS:(..)/);
|
||||
$dReadS = $1 if( $sRL =~ m/$addrS:(..)/);#shadowReg
|
||||
$dReadR = $1 if( $rRL =~ m/$addrS:(..)/);#realReg
|
||||
my $dRead = $dReadR;
|
||||
if (defined $dReadS){
|
||||
$convFlg = "set_" if ($dReadR ne $dReadS);
|
||||
$dRead = $dReadS;
|
||||
}
|
||||
else{
|
||||
if (grep /$regLN../,keys %{$hash->{READINGS}} &&
|
||||
!$peerId){
|
||||
return "invalid:peer missing";
|
||||
return "invalid:peer missing" if (grep /$regLN../,keys %{$hash->{READINGS}} &&
|
||||
!$peerId);
|
||||
if (!defined($dRead) || $dRead eq ""){
|
||||
return "invalid: not supported by FW version" if ($rRL =~ m/00:00/);#reglist is complete but still address cannot be found
|
||||
return "invalid";
|
||||
}
|
||||
return "invalid" if (!defined($dRead) || $dRead eq "");
|
||||
}
|
||||
|
||||
$data = ($data<< 8)+hex($dRead);
|
||||
@ -8287,7 +8297,7 @@ sub CUL_HM_UpdtCentral($){
|
||||
|
||||
foreach my $ioN(split",",AttrVal($name,"IOList","")){# set parameter in IO
|
||||
next if (!$defs{$ioN});
|
||||
if ( $defs{$ioN}{TYPE} eq "HMLAN"){;
|
||||
if ( $defs{$ioN}{TYPE} =~ m/^(HMLAN|HMUARTLGW)$/){;
|
||||
}
|
||||
elsif($defs{$ioN}{TYPE} eq "CUL"){
|
||||
CommandAttr(undef, "$ioN rfmode HomeMatic")
|
||||
@ -8383,7 +8393,7 @@ sub CUL_HM_assignIO($){ #check and assign IO
|
||||
if ( $hash->{IODev}
|
||||
&& $hash->{IODev} ne $defs{$iom}
|
||||
&& $hash->{IODev}->{TYPE}
|
||||
&& $hash->{IODev}->{TYPE} eq "HMLAN"){#if recent io is HMLAN and we have to remove the device from IO
|
||||
&& $hash->{IODev}->{TYPE} =~ m/^(HMLAN|HMUARTLGW)$/){#if recent io is HMLAN and we have to remove the device from IO
|
||||
IOWrite($hash, "", "remove:".CUL_HM_hash2Id($hash));
|
||||
}
|
||||
$hash->{IODev} = $defs{$iom};
|
||||
|
||||
@ -251,7 +251,7 @@ my $K_actDetID = '000000'; # id of actionDetector
|
||||
,"00B9" => {name=>"HM-LC-Dim1T-CV-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Sw:1:1,Sw1_V:2:3",}
|
||||
,"00BA" => {name=>"HM-LC-Dim1T-FM-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Sw:1:1,Sw1_V:2:3",}
|
||||
,"00BB" => {name=>"HM-LC-Dim2T-SM-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Sw:1:2,Sw1_V:3:4,Sw2_V:5:6",}#
|
||||
,"00BC" => {name=>"HM-WDS40-TH-I-2" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:f' ,lst=>'p' ,chn=>"",}, #:w todo should be wakeup, does not react
|
||||
,"00BC" => {name=>"HM-WDS40-TH-I-2" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:f' ,lst=>'p' ,chn=>"",} #:w todo should be wakeup, does not react
|
||||
,"00BD" => {name=>"HM-CC-RT-DN-BoM" ,alias=>"HM-CC-RT-DN"}
|
||||
,"00BE" => {name=>"HM-MOD-Re-8" ,st=>'switch' ,cyc=>'' ,rxt=>'b' ,lst=>'1,3' ,chn=>"Sw:1:8",}
|
||||
,"00BF" => {name=>"HM-PB-2-FM" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"Btn:1:2",}
|
||||
@ -846,16 +846,14 @@ foreach my $al (keys %culHmModel){ # duplicate entries for alias devices
|
||||
#'powerMeter'
|
||||
|
||||
%culHmRegGeneral = (
|
||||
pairCentral=>1,
|
||||
pairCentral =>1
|
||||
,sign =>1
|
||||
);
|
||||
%culHmRegType = (
|
||||
swi =>{ peerNeedsBurst =>1,expectAES =>1}
|
||||
,remote =>{ peerNeedsBurst =>1,expectAES =>1,dblPress =>1,longPress =>1
|
||||
,sign =>1
|
||||
}
|
||||
,remote =>{ peerNeedsBurst =>1,expectAES =>1,dblPress =>1,longPress =>1}
|
||||
,blindActuator =>{ intKeyVisib =>1
|
||||
,driveUp =>1,driveDown =>1,driveTurn =>1,refRunCounter =>1
|
||||
,sign =>1
|
||||
,confBtnTime =>1,localResDis =>1
|
||||
,transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1
|
||||
,MaxTimeF =>1
|
||||
@ -885,7 +883,7 @@ foreach my $al (keys %culHmModel){ # duplicate entries for alias devices
|
||||
,OffDlyStep =>1,OffDlyNewTime =>1,OffDlyOldTime =>1
|
||||
,lgMultiExec =>1,shMultiExec =>1
|
||||
}
|
||||
,switch =>{ intKeyVisib =>1,sign =>1
|
||||
,switch =>{ intKeyVisib =>1,
|
||||
,OnTime =>1,OffTime =>1,OnDly =>1,OffDly =>1
|
||||
,SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1
|
||||
,CtValLo =>1,CtValHi =>1
|
||||
@ -911,16 +909,14 @@ foreach my $al (keys %culHmModel){ # duplicate entries for alias devices
|
||||
###motionAndBtn#########################
|
||||
,threeStateSensor =>{ cyclicInfoMsg =>1, transmDevTryMax =>1
|
||||
, transmitTryMax =>1
|
||||
,sign =>1
|
||||
,peerNeedsBurst =>1,expectAES =>1
|
||||
}
|
||||
,sensRain =>{ transmDevTryMax =>1,localResDis =>1}
|
||||
,tipTronic =>{ cyclicInfoMsg =>1,cyclicInfoMsgDis=>1,localResDis =>1,RS485IdleTime =>1}
|
||||
,senBright =>{ cyclicInfoMsgDis=>1,localResDis =>1,transmDevTryMax =>1}
|
||||
,powerMeter =>{ intKeyVisib =>1,localResDis =>1
|
||||
,sign =>1
|
||||
,transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1}
|
||||
,outputUnit =>{ intKeyVisib =>1,sign =>1}
|
||||
,outputUnit =>{ intKeyVisib =>1}
|
||||
,powerSensor =>{ transmitTryMax =>1,transmDevTryMax =>1
|
||||
,mtrType =>1,mtrConstIr =>1,mtrConstGas =>1,mtrConstLed =>1
|
||||
,mtrSensIr =>1
|
||||
@ -952,7 +948,7 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
|
||||
,"HM-RC-19" =>{ backAtKey =>1, backAtMotion =>1, backOnTime =>1,backAtCharge =>1,language =>1}
|
||||
,"HM-RC-4-2" =>{ localResDis =>1}
|
||||
|
||||
,"HM-LC-Dim1L-Pl" =>{ confBtnTime =>1,loadAppearBehav =>1,loadErrCalib =>1},
|
||||
,"HM-LC-Dim1L-Pl" =>{ confBtnTime =>1,loadAppearBehav =>1,loadErrCalib =>1}
|
||||
,"HM-LC-Dim1L-CV-2" =>{ confBtnTime =>1,loadAppearBehav =>1,loadErrCalib =>1
|
||||
,logicCombination=>1
|
||||
,DimElsOffTimeMd =>1,DimElsOnTimeMd =>1
|
||||
@ -992,7 +988,6 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
|
||||
,"HM-CC-RT-DN" =>{ btnLock =>1,localResDis =>1,globalBtnLock =>1,modusBtnLock =>1
|
||||
,cyclicInfoMsg =>1,cyclicInfoMsgDis=>1
|
||||
,burstRx =>1,lowBatLimitRT =>1,backOnTime =>1
|
||||
,sign =>1
|
||||
}
|
||||
,"HM-MOD-Em-8" =>{ lowBatLimitBA2 =>1,transmDevTryMax =>1,localResDis =>1
|
||||
,ledMode =>1
|
||||
@ -1061,9 +1056,7 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
|
||||
,"HM-LC-SW1-BA-PCB" =>{ lowBatLimitBA =>1,ledMode =>1}
|
||||
,"HM-LC-SW4-BA-PCB" =>{ lowBatLimitBA =>1,ledMode =>1,localResDis =>1}
|
||||
,"HM-Sen-DB-PCB" =>{ ledMode =>1}
|
||||
,"HM-MOD-Re-8" =>{ lowBatLimitBA3 =>1,ledMode =>1
|
||||
,sign =>1
|
||||
},
|
||||
,"HM-MOD-Re-8" =>{ lowBatLimitBA3 =>1,ledMode =>1}
|
||||
,"HM-Sys-sRP-Pl" =>{ compMode =>1}
|
||||
,"KFM-Display" =>{ CtDlyOn =>1,CtDlyOff =>1
|
||||
,CtOn =>1,CtOff =>1,CtRampOn =>1,CtRampOff =>1
|
||||
@ -1085,8 +1078,7 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
|
||||
,"HM-WDS30-OT2-SM" =>{ burstRx =>1,cyclicInfoMsgDis=>1,localResDis =>1,paramSel =>1}
|
||||
,"HM-TC-IT-WM-W-EU" =>{ burstRx =>1,cyclicInfoMsgDis=>1,localResDis =>1,cyclicInfoMsg =>1
|
||||
,btnLock =>1,globalBtnLock =>1,modusBtnLock =>1,lowBatLimitRT =>1
|
||||
,sign =>1
|
||||
},
|
||||
}
|
||||
,"HM-SEN-EP" =>{ seqPulse1 =>1,seqPulse2 =>1,seqPulse3 =>1,seqPulse4 =>1
|
||||
,seqPulse5 =>1,seqTolerance =>1
|
||||
,peerNeedsBurst =>1
|
||||
@ -1272,7 +1264,6 @@ $culHmRegModel{"ROTO_ZEL-STG-RM-DWT-10"}= $culHmRegModel{"HM-PB-4DIS-WM"};
|
||||
}
|
||||
,"HM-Sen-MDIR-WM5500"=>{ intKeyVisib =>1,cyclicInfoMsg =>1,localResDis =>1,transmDevTryMax =>1}
|
||||
,"HM-Sen-MDIR-WM5501"=>{ peerNeedsBurst =>1,expectAES =>1,dblPress =>1,longPress =>1
|
||||
,sign =>1
|
||||
,ledOnTime =>1,transmitTryMax =>1,localResDis =>1
|
||||
}
|
||||
,"HM-LC-RGBW-WM01" =>{ OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1
|
||||
@ -1517,7 +1508,7 @@ $culHmRegChan{"HM-OU-CFM-TW02"}= $culHmRegChan{"HM-OU-CFM-PL02"};
|
||||
cmdList => "",
|
||||
);
|
||||
%culHmSubTypeGets = (
|
||||
none4Type =>{ "test"=>"" },
|
||||
none4Type =>{ "test"=>"" }
|
||||
);
|
||||
%culHmModelGets = (
|
||||
"CCU-FHEM" =>{ "listDevice"=>""}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user