FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 07:19:24 +00:00
Code Issues Releases Wiki Activity

10_CUL_HM:correct get regVal after implement of wds100 peer handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17139 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2018-08-14 19:17:27 +00:00
parent 6fcc832dfd
commit ef8232764e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/10_CUL_HM.pm
View File

@ -3816,7 +3816,7 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
return "undefined";
}
elsif($cmd =~ m/^(reg|regVal)$/) { #########################################
my (undef,undef,$regReq,$list,$peerId) = @a;
my (undef,undef,$regReq,$list,$peerId) = (@a,0,0);
return if(!defined $regReq);
if ($regReq eq 'all'){
my @regArr = CUL_HM_getRegN($st,$md,($roleD?"00":""),($roleC?$chn:""));
@ -3862,7 +3862,7 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
}
else{
my $regVal = CUL_HM_getRegFromStore($name,$regReq,$list,$peerId);
$regVal =~ s/ .*// if ($cmd eq "regVal");
$regVal =~ s/ .*// if ($cmd eq "regVal");
return ($regVal =~ m/^invalid/)? "Value not captured:$name - $regReq"
: $regVal;
}
@ -7873,8 +7873,8 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
if($addr<1 ||$addr>255);
}
return "invalid:no peer for this register" if(($reg->{p} eq "n" && $peerId ne "00000000")
||($reg->{p} eq "y" && $peerId eq "00000000"));
return "invalid:no peer for this register" if(($reg->{p} eq "n" && $peerId ne 0)
||($reg->{p} eq "y" && $peerId eq 0));
my $dst = substr(CUL_HM_name2Id($name),0,6);
if(!$regLN){
$regLN = ($hash->{helper}{expert}{raw}?"":".")