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

bug in presending secondary register

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6087 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-06-08 11:00:25 +00:00
parent c2554bbd38
commit 192163b368
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/FHEM/10_CUL_HM.pm
View File

@ -451,7 +451,6 @@ sub CUL_HM_Define($$) {##############################
$hash->{helper}{q}{qReqStat} = ""; # queue statusRequest for this device $hash->{helper}{q}{qReqStat} = ""; # queue statusRequest for this device
$hash->{helper}{mRssi}{mNo} = ""; $hash->{helper}{mRssi}{mNo} = "";
CUL_HM_prtInit ($hash); CUL_HM_prtInit ($hash);
CUL_HM_hmInitMsg($hash);
CUL_HM_assignIO($hash)if (!$init_done && $HMid ne "000000"); CUL_HM_assignIO($hash)if (!$init_done && $HMid ne "000000");
} }
$modules{CUL_HM}{defptr}{$HMid} = $hash; $modules{CUL_HM}{defptr}{$HMid} = $hash;
@ -649,7 +648,7 @@ sub CUL_HM_Attr(@) {#################################
CUL_HM_UpdtCentral($name); CUL_HM_UpdtCentral($name);
} }
else{ else{
CUL_HM_hmInitMsg($hash); CUL_HM_hmInitMsg($hash) if ($init_done);
} }
$attr{$name}{$attrName} = $attrVal if ($cmd eq "set"); $attr{$name}{$attrName} = $attrVal if ($cmd eq "set");
} }
@ -657,9 +656,10 @@ sub CUL_HM_Attr(@) {#################################
$updtReq = 1; $updtReq = 1;
} }
elsif($attrName eq "aesCommReq" ){ elsif($attrName eq "aesCommReq" ){
return "use $attrName only for device" if (!$hash->{helper}{role}{dev});
if ($cmd eq "set"){ if ($cmd eq "set"){
return "use $attrName only for device" if (!$hash->{helper}{role}{dev});
return "$attrName support 0 or 1 only" if ($attrVal !~ m/[01]/); return "$attrName support 0 or 1 only" if ($attrVal !~ m/[01]/);
return "$attrName invalid for virtal devices" if ($hash->{role}{vrt});
$attr{$name}{$attrName} = $attrVal; $attr{$name}{$attrName} = $attrVal;
} }
else{ else{
@ -745,7 +745,8 @@ sub CUL_HM_hmInitMsg($){ #define device init msg for HMLAN
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 (!($rxt & ~0x04)){@p = ("$id","00","01","FE1F");}#config only if ($hash->{helper}{role}{vrt}){;} #virtual channels should not be assigned
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
else {@p = ("$id","00","01","00"); } else {@p = ("$id","00","01","00"); }
# else {@p = ("$id","00","01","1E"); } # else {@p = ("$id","00","01","1E"); }
@ -760,7 +761,7 @@ sub CUL_HM_hmInitMsg($){ #define device init msg for HMLAN
} }
sub CUL_HM_hmInitMsgUpdt($){ #update device init msg for HMLAN sub CUL_HM_hmInitMsgUpdt($){ #update device init msg for HMLAN
my ($hash)=@_; my ($hash)=@_;
return if ($hash->{helper}{role}{vrt});
my $oldChn = $hash->{helper}{io}{newChn}; my $oldChn = $hash->{helper}{io}{newChn};
my @p = @{$hash->{helper}{io}{p}}; my @p = @{$hash->{helper}{io}{p}};
# General todo # General todo
@ -6033,7 +6034,16 @@ sub CUL_HM_TCtempReadings($) {# parse TC temperature readings
{ #update readings in device - oldfashioned style, copy from Readings { #update readings in device - oldfashioned style, copy from Readings
my @histVals; my @histVals;
foreach my $var ("displayMode","displayTemp","controlMode","decalcDay","displayTempUnit","day-temp","night-temp","party-temp"){ foreach my $var ("displayMode","displayTemp","controlMode","decalcDay","displayTempUnit","day-temp","night-temp","party-temp"){
push @histVals,$var.":".ReadingsVal($name,"R-".$var,"???"); my $varV = ReadingsVal($name,"R-".$var,"???");
foreach my $e( grep {${$_}[2] =~ m/$var/}# see if change is pending
grep {$hash eq ${$_}[0]}
grep {scalar(@{$_} == 3)}
@evtEt){
$varV = ${$e}[2];
$varV =~ s/^R-$var:// ;
}
push @histVals,"$var:$varV";
} }
CUL_HM_UpdtReadBulk(CUL_HM_getDeviceHash($hash),1,@histVals) if (@histVals); CUL_HM_UpdtReadBulk(CUL_HM_getDeviceHash($hash),1,@histVals) if (@histVals);
} }