Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

improve level-repeat for blind and dimmer

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5395 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-04-01 10:18:46 +00:00
parent 3966518c4b
commit 2e7d78228c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
FHEM/10_CUL_HM.pm
View File

@ -1403,9 +1403,10 @@ sub CUL_HM_Parse($$) {#########################################################
my $action; #determine action my $action; #determine action
push @evtEt,[$shash,1,"timedOn:".(($err&0x40)?"running":"off")]; push @evtEt,[$shash,1,"timedOn:".(($err&0x40)?"running":"off")];
if ($shash->{helper}{dlvl} && defined $err #desired level? if ($shash->{helper}{dlvl} && defined $err){#are we waiting?
&& !($err&0x70)){ #stopped and not timedOn if ($mI[2] ne $shash->{helper}{dlvl} #level not met?
if ($mI[2] ne $shash->{helper}{dlvl}){#level not met, repeat && !($err&0x70)){ #and already stopped not timedOn
#level not met, repeat
Log3 $name,3,"CUL_HM $name repeat, level $mI[2] instead of $shash->{helper}{dlvl}"; Log3 $name,3,"CUL_HM $name repeat, level $mI[2] instead of $shash->{helper}{dlvl}";
if ($shash->{helper}{dlvlCmd}){# first try if ($shash->{helper}{dlvlCmd}){# first try
CUL_HM_PushCmdStack($shash,$shash->{helper}{dlvlCmd}); CUL_HM_PushCmdStack($shash,$shash->{helper}{dlvlCmd});
@ -1417,8 +1418,8 @@ sub CUL_HM_Parse($$) {#########################################################
delete $shash->{helper}{dlvl};# we only make one attempt delete $shash->{helper}{dlvl};# we only make one attempt
} }
} }
else{ else{# either level met, timed on or we are driving...
delete $shash->{helper}{dlvl};# we only make one attempt delete $shash->{helper}{dlvl};
} }
} }
if ($st ne "switch"){ if ($st ne "switch"){
@ -3209,7 +3210,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
# store desiredLevel in and its Cmd in case we have to repeat # store desiredLevel in and its Cmd in case we have to repeat
$plvl = sprintf("%02X",$plvl*2); $plvl = sprintf("%02X",$plvl*2);
if ($tval ne "FFFF"){ if ($tval && $tval ne "FFFF"){
delete $hash->{helper}{dlvl};#stop desiredLevel supervision delete $hash->{helper}{dlvl};#stop desiredLevel supervision
} }
else{ else{
@ -3722,7 +3723,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$pId = $dst.sprintf("%02X",(($vChn eq "off")?-1:0) + $chn*2); $pId = $dst.sprintf("%02X",(($vChn eq "off")?-1:0) + $chn*2);
} }
elsif($vChn){ elsif($vChn){
$pId = CUL_HM_name2Id($vChn).($a[3]?sprintf("%02X",$a[3]):"01"); $pId = CUL_HM_name2Id($vChn,$devHash).($a[3]?sprintf("%02X",$a[3]):"01");
} }
else{ else{
$pId = $dst.sprintf("%02X",$chn); $pId = $dst.sprintf("%02X",$chn);