FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 02:10:32 +00:00
Code Issues Releases Wiki Activity

update lacy config and peerXref

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6443 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-08-22 15:50:20 +00:00
parent 080fb0adaf
commit 4f5e7f9279
3 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fhem/FHEM/10_CUL_HM.pm
View File

@ -767,14 +767,16 @@ sub CUL_HM_hmInitMsg($){ #define device init msg for HMLAN
#message to be send to HMLAN/USB to define device communication defails #message to be send to HMLAN/USB to define device communication defails
#bit-usage is widely unknown. #bit-usage is widely unknown.
#p[1]: 00000001 = request AES #p[1]: 00000001 = request AES
#p[1]: 00000010 = data pending - autosend wakeup if device send data #p[1]: 00000010 = data pending - autosend wakeup and lazyConfig
# if device send data
#p[2]: is this the number of the AES key to be used?
my ($hash)=@_; my ($hash)=@_;
my $rxt = CUL_HM_getRxType($hash); my $rxt = CUL_HM_getRxType($hash);
my $id = CUL_HM_hash2Id($hash); my $id = CUL_HM_hash2Id($hash);
my @p; my @p;
if ($hash->{helper}{role}{vrt}){;} #virtual channels should not be assigned if ($hash->{helper}{role}{vrt}){;} #virtual channels should not be assigned
elsif(!($rxt & ~0x04)) {@p = ("$id","00","01","FE1F");}#config only elsif(!($rxt & ~0x04)) {@p = ("$id","00","01","FE1F");}#config only
elsif($rxt & 0x10) {@p = ("$id","00","01","1E"); }#lazyConfig elsif( $rxt & 0x10) {@p = ("$id","00","01","1E"); }#lazyConfig (01,00,1E also possible?)
else {@p = ("$id","00","01","00"); } else {@p = ("$id","00","01","00"); }
# else {@p = ("$id","00","01","1E"); } # else {@p = ("$id","00","01","1E"); }
if (AttrVal($hash->{NAME},"aesCommReq",0)){ if (AttrVal($hash->{NAME},"aesCommReq",0)){
@ -782,7 +784,7 @@ sub CUL_HM_hmInitMsg($){ #define device init msg for HMLAN
$p[3] = ($p[3]eq "")?"1E":$p[3]; $p[3] = ($p[3]eq "")?"1E":$p[3];
} }
$hash->{helper}{io}{newChn} = ""; $hash->{helper}{io}{newChn} = "";
$hash->{helper}{io}{rxt} = ($rxt & 0x08)?2:0; $hash->{helper}{io}{rxt} = ($rxt & 0x18)?2:0;#wakeup || #lazyConfig
$hash->{helper}{io}{p} = \@p; $hash->{helper}{io}{p} = \@p;
CUL_HM_hmInitMsgUpdt($hash); CUL_HM_hmInitMsgUpdt($hash);
} }
@ -910,6 +912,7 @@ sub CUL_HM_Parse($$) {#########################################################
return "" if ($msg =~ m/998112......000001/);# HMLAN internal message, consum return "" if ($msg =~ m/998112......000001/);# HMLAN internal message, consum
my $ccu =InternalVal($ioName,"owner_CCU",""); my $ccu =InternalVal($ioName,"owner_CCU","");
CUL_HM_DumpProtocol("RCV",$iohash,$len,$mNo,$mFlg,$mTp,$src,$dst,$p); CUL_HM_DumpProtocol("RCV",$iohash,$len,$mNo,$mFlg,$mTp,$src,$dst,$p);
if ($defs{$ccu}){# if ($defs{$ccu}){#
push @evtEt,[$defs{$ccu},0,"unknown_$src:received"];# do not trigger push @evtEt,[$defs{$ccu},0,"unknown_$src:received"];# do not trigger
return CUL_HM_pushEvnts(); return CUL_HM_pushEvnts();
@ -2313,7 +2316,6 @@ sub CUL_HM_parseCommon(@){#####################################################
my $paired = 0; #internal flag my $paired = 0; #internal flag
CUL_HM_infoUpdtDevData($shash->{NAME}, $shash,$p) CUL_HM_infoUpdtDevData($shash->{NAME}, $shash,$p)
if (!$modules{CUL_HM}{helper}{hmManualOper}); if (!$modules{CUL_HM}{helper}{hmManualOper});
my $ioN = $ioHash->{NAME}; my $ioN = $ioHash->{NAME};
# hmPair set in IOdev or eventually in ccu! # hmPair set in IOdev or eventually in ccu!
my $ioOwn = InternalVal($ioN,"owner_CCU",""); my $ioOwn = InternalVal($ioN,"owner_CCU","");
@ -3610,7 +3612,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
my @rPeer; my @rPeer;
@rPeer = split ",",$repPeers; @rPeer = split ",",$repPeers;
if ($eNo eq "setAll"){ if ($eNo eq "setAll"){
return " too many entries in repPeer" if (int(@rPeer) > 36); return " too many entries in repPeers" if (int(@rPeer) > 36);
return "setAll: attr repPeers undefined" if (!defined $repPeers); return "setAll: attr repPeers undefined" if (!defined $repPeers);
my $entry = 0; my $entry = 0;
foreach my $repData (@rPeer){ foreach my $repData (@rPeer){
@ -5462,7 +5464,8 @@ sub CUL_HM_protState($$){
Log3 $name,5,"CUL_HM $name protEvent:$state". Log3 $name,5,"CUL_HM $name protEvent:$state".
($hash->{cmdStack}?" pending:".scalar @{$hash->{cmdStack}}:""); ($hash->{cmdStack}?" pending:".scalar @{$hash->{cmdStack}}:"");
CUL_HM_hmInitMsgUpdt($hash) if ( $hash->{helper}{prt}{sProc} != $sProcIn CUL_HM_hmInitMsgUpdt($hash) if ( $hash->{helper}{prt}{sProc} != $sProcIn
&& $hash->{helper}{prt}{sProc} < 2); && ( $hash->{helper}{prt}{sProc} < 2
||($hash->{helper}{prt}{sProc} == 2 && $sProcIn == 0 )));
} }
###################-----------helper and shortcuts--------##################### ###################-----------helper and shortcuts--------#####################
@ -8016,17 +8019,19 @@ sub CUL_HM_tempListTmpl(@) { ##################################################
<br> <br>
short application: <br> short application: <br>
<code>setRepeat setAll 0 0 0<br></code> <code>setRepeat setAll 0 0 0<br></code>
will rewrite the complete list to the deivce. Data will be taken from attribut repPeer. <br> will rewrite the complete list to the deivce. Data will be taken from attribut repPeers. <br>
attribut repPeer is formated:<br> attribut repPeers is formated:<br>
src1:dst1:[y/n],src2:dst2:[y/n],src2:dst2:[y/n],...<br> src1:dst1:[y/n],src2:dst2:[y/n],src2:dst2:[y/n],...<br>
<br> <br>
Reading repPeer is formated:<br> Reading repPeer is formated:<br>
<ul>
Number src dst broadcast verify<br> Number src dst broadcast verify<br>
number: entry sequence number<br> number: entry sequence number<br>
src: message source device - read from repeater<br> src: message source device - read from repeater<br>
dst: message destination device - assembled from attributes<br> dst: message destination device - assembled from attributes<br>
broadcast: shall broadcast be repeated for this source - read from repeater<br> broadcast: shall broadcast be repeated for this source - read from repeater<br>
verify: do attributes and readings match?<br> verify: do attributes and readings match?<br>
</ul>
</li> </li>
</ul> </ul>
</li> </li>
@ -9264,17 +9269,19 @@ sub CUL_HM_tempListTmpl(@) { ##################################################
<br> <br>
Kurzanwendung: <br> Kurzanwendung: <br>
<code>setRepeat setAll 0 0 0<br></code> <code>setRepeat setAll 0 0 0<br></code>
schreibt die gesamte Liste der Ger&auml;te neu. Daten kommen vom Attribut repPeer. <br> schreibt die gesamte Liste der Ger&auml;te neu. Daten kommen vom Attribut repPeers. <br>
Das Attribut repPeer hat folgendes Format:<br> Das Attribut repPeers hat folgendes Format:<br>
src1:dst1:[y/n],src2:dst2:[y/n],src2:dst2:[y/n],...<br> src1:dst1:[y/n],src2:dst2:[y/n],src2:dst2:[y/n],...<br>
<br> <br>
Foramtierte Werte von repPeer:<br> Formatierte Werte von repPeer:<br>
<ul>
Number src dst broadcast verify<br> Number src dst broadcast verify<br>
number: Nummer des Eintrags in der Liste<br> number: Nummer des Eintrags in der Liste<br>
src: Ursprungsger&auml;t der Nachricht - aus Repeater ausgelesen<br> src: Ursprungsger&auml;t der Nachricht - aus Repeater ausgelesen<br>
dst: Zielger&auml;t der Nachricht - aus den Attributen abgeleitet<br> dst: Zielger&auml;t der Nachricht - aus den Attributen abgeleitet<br>
broadcast: sollen Broadcasts weitergeleitet werden - aus Repeater ausgelesen<br> broadcast: sollen Broadcasts weitergeleitet werden - aus Repeater ausgelesen<br>
verify: stimmen Attribute und ausgelesen Werte &uuml;berein?<br> verify: stimmen Attribute und ausgelesen Werte &uuml;berein?<br>
</ul>
</li> </li>
</ul> </ul>
</li> </li>

4
fhem/FHEM/98_HMinfo.pm
View File

@ -624,7 +624,6 @@ sub HMinfo_tempList(@) { ######################################################
else{ else{
$skip = 0; $skip = 0;
} }
Log 1,"General entity $eFound :$skip";
} }
push @oldList,$line if (!$skip); push @oldList,$line if (!$skip);
} }
@ -951,7 +950,7 @@ sub HMinfo_GetFn($@) {#########################################################
foreach my $dName (HMinfo_getEntities($opt,$filter)){ foreach my $dName (HMinfo_getEntities($opt,$filter)){
# search for irregular trigger # search for irregular trigger
my $peerIDs = AttrVal($dName,"peerIDs",undef); my $peerIDs = AttrVal($dName,"peerIDs",undef);
$peerIDs =~ s/00000000,//;
foreach (grep /^......$/, HMinfo_noDup(map {CUL_HM_name2Id(substr($_,8))} foreach (grep /^......$/, HMinfo_noDup(map {CUL_HM_name2Id(substr($_,8))}
grep /^trigDst_/, grep /^trigDst_/,
keys %{$defs{$dName}{READINGS}})){ keys %{$defs{$dName}{READINGS}})){
@ -965,7 +964,6 @@ sub HMinfo_GetFn($@) {#########################################################
my $dId = unpack 'A6',CUL_HM_name2Id($dName); my $dId = unpack 'A6',CUL_HM_name2Id($dName);
my @pl = (); my @pl = ();
foreach (split",",$peerIDs){ foreach (split",",$peerIDs){
next if ($_ eq "00000000");
my $pn = CUL_HM_peerChName($_,$dId); my $pn = CUL_HM_peerChName($_,$dId);
$pn =~ s/_chn:01//; $pn =~ s/_chn:01//;
push @pl,$pn; push @pl,$pn;

1
fhem/FHEM/HMConfig.pm
View File

@ -73,6 +73,7 @@ my $K_actDetID = '000000'; # id of actionDetector
# c: receive on config # c: receive on config
# w: receive in wakeup # w: receive in wakeup
# b: receive on burst # b: receive on burst
# f: receive on burst if enabled
#register list definition - identifies valid register lists #register list definition - identifies valid register lists
# 1,3,5:3p.4.5 => list 1 valid for all channel # 1,3,5:3p.4.5 => list 1 valid for all channel
# => list 3 for all channel # => list 3 for all channel