Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct 4dis text display

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3614 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-08-08 08:21:58 +00:00
parent 506e7c5e96
commit bb6ebdbcea
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FHEM/10_CUL_HM.pm
View File

@ -2191,7 +2191,7 @@ sub CUL_HM_Set($@) {
} }
elsif($cmd eq "regSet") { ############################################### reg elsif($cmd eq "regSet") { ############################################### reg
#set <name> regSet <regName> <value> [<peerChn>] [prep] #set <name> regSet <regName> <value> [<peerChn>] [prep]
#prep is internal use only. It allowes to prepare shadowreg only but supress #prep is internal use only. It allowes to prepare shadowReg only but supress
#writing. Application necessarily needs to execute writing subsequent. #writing. Application necessarily needs to execute writing subsequent.
my (undef,undef,$regName,$data,$peerChnIn,$prep) = @a; my (undef,undef,$regName,$data,$peerChnIn,$prep) = @a;
$state = ""; $state = "";
@ -3239,7 +3239,7 @@ sub CUL_HM_pushConfig($$$$$$$$@) {#generate messages to config data to register
} }
} }
$chnhash->{helper}{shadowReg}{$regLN} = $regs; $chnhash->{helper}{shadowReg}{$regLN} = $regs;
return if ($prep);#prepare shadowreg only. More data to come. return if ($prep);#prepare shadowReg only. More data to come.
#Application takes care about execution #Application takes care about execution
CUL_HM_updtRegDisp($hash,$list,$peerAddr.$peerChn); CUL_HM_updtRegDisp($hash,$list,$peerAddr.$peerChn);
CUL_HM_PushCmdStack($hash, "++".$flag.'01'.$src.$dst.$chn.'05'. CUL_HM_PushCmdStack($hash, "++".$flag.'01'.$src.$dst.$chn.'05'.
@ -3766,6 +3766,11 @@ sub CUL_HM_4DisText($) {# convert text for 4dis
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $regLN = ((CUL_HM_getAttrInt($name,"expert") == 2)?"":".")."RegL_"; my $regLN = ((CUL_HM_getAttrInt($name,"expert") == 2)?"":".")."RegL_";
my $reg1 = ReadingsVal($name,$regLN."01:" ,""); my $reg1 = ReadingsVal($name,$regLN."01:" ,"");
my $pref = "";
if ($hash->{helper}{shadowReg}{$regLN."01:"}){
$pref = "set_";
$reg1 = $hash->{helper}{shadowReg}{$regLN."01:"};
}
my %txt; my %txt;
foreach my $sAddr (54,70){ foreach my $sAddr (54,70){
my $txtHex = $reg1; #one row my $txtHex = $reg1; #one row
@ -3778,8 +3783,8 @@ sub CUL_HM_4DisText($) {# convert text for 4dis
my @ch = split(",",$txtHex,12); my @ch = split(",",$txtHex,12);
foreach (@ch){$txt{$sAddr}.=chr(hex($_))}; foreach (@ch){$txt{$sAddr}.=chr(hex($_))};
} }
CUL_HM_UpdtReadBulk($hash,1,"text1:".$txt{54}, CUL_HM_UpdtReadBulk($hash,1,"text1:".$pref.$txt{54},
"text2:".$txt{70}); "text2:".$pref.$txt{70});
return "text1:".$txt{54}."\n". return "text1:".$txt{54}."\n".
"text2:".$txt{70}."\n"; "text2:".$txt{70}."\n";
} }