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

renew HMLAN setup device string

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5968 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-05-25 09:34:15 +00:00
parent 57b778d54c
commit ff672b1947
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_CUL_HM.pm
View File

@ -750,9 +750,6 @@ sub CUL_HM_hmInitMsgUpdt($){ #update device init msg for HMLAN
my $oldChn = $hash->{helper}{io}{newChn}; my $oldChn = $hash->{helper}{io}{newChn};
my @p = unpack 'A8A2A*',$oldChn; my @p = unpack 'A8A2A*',$oldChn;
#if($hash->{helper}{q}{qReqConf} ||
# $hash->{helper}{q}{qReqStat} ||
# $hash->{helper}{prt}{sProc}){
if($hash->{helper}{prt}{sProc}){ if($hash->{helper}{prt}{sProc}){
$p[1] |= 2; $p[1] |= 2;
} }
@ -5121,8 +5118,7 @@ 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} == 0 && $hash->{helper}{prt}{sProc} < 2);
||$hash->{helper}{prt}{sProc} == 2);
} }
###################-----------helper and shortcuts--------##################### ###################-----------helper and shortcuts--------#####################
@ -6499,7 +6495,6 @@ sub CUL_HM_qEntity($$){ # add to queue
my $wT = (@{$modules{CUL_HM}{helper}{qReqStat}})? my $wT = (@{$modules{CUL_HM}{helper}{qReqStat}})?
"1": "1":
$modules{CUL_HM}{hmAutoReadScan}; $modules{CUL_HM}{hmAutoReadScan};
CUL_HM_hmInitMsgUpdt($defs{$devN});
RemoveInternalTimer("CUL_HM_procQs"); RemoveInternalTimer("CUL_HM_procQs");
InternalTimer(gettimeofday()+ $wT,"CUL_HM_procQs","CUL_HM_procQs", 0); InternalTimer(gettimeofday()+ $wT,"CUL_HM_procQs","CUL_HM_procQs", 0);
} }

12
fhem/FHEM/98_HMinfo.pm
View File

@ -837,12 +837,12 @@ sub HMinfo_GetFn($@) {#########################################################
$ret .= "\n"; $ret .= "\n";
$ret .= "\n requests pending"; $ret .= "\n requests pending";
$ret .= "\n ----------------"; $ret .= "\n ----------------";
$ret .= "\n autoReadReg :".join(", ",@{$modules{CUL_HM}{helper}{qReqConf}}); $ret .= "\n autoReadReg : ".join(" ",@{$modules{CUL_HM}{helper}{qReqConf}});
$ret .= "\n recent :".($modules{CUL_HM}{helper}{autoRdActive}?$modules{CUL_HM}{helper}{autoRdActive}:"none"); $ret .= "\n recent : ".($modules{CUL_HM}{helper}{autoRdActive}?$modules{CUL_HM}{helper}{autoRdActive}:"none");
$ret .= "\n status request :".join(", ",@{$modules{CUL_HM}{helper}{qReqStat}}) ; $ret .= "\n status request : ".join(" ",@{$modules{CUL_HM}{helper}{qReqStat}}) ;
$ret .= "\n autoReadReg wakeup :".join(", ",@{$modules{CUL_HM}{helper}{qReqConfWu}}); $ret .= "\n autoReadReg wakeup : ".join(" ",@{$modules{CUL_HM}{helper}{qReqConfWu}});
$ret .= "\n status request wakeup:".join(", ",@{$modules{CUL_HM}{helper}{qReqStatWu}}); $ret .= "\n status request wakeup: ".join(" ",@{$modules{CUL_HM}{helper}{qReqStatWu}});
$ret .= "\n autoReadTest :".join(", ",@{$modules{CUL_HM}{helper}{confCheckArr}}); $ret .= "\n autoReadTest : ".join(" ",@{$modules{CUL_HM}{helper}{confCheckArr}});
$ret .= "\n"; $ret .= "\n";
@IOlist = HMinfo_noDup(@IOlist); @IOlist = HMinfo_noDup(@IOlist);
foreach(@IOlist){ foreach(@IOlist){