FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 00:26:03 +00:00
Code Issues Releases Wiki Activity

another update to levelRange

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5316 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-03-24 10:04:44 +00:00
parent 040a262153
commit 10e677ad0a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/10_CUL_HM.pm
View File

@ -1358,13 +1358,15 @@ sub CUL_HM_Parse($$) {#########################################################
my $vl = ReadingsVal($vh->{NAME},"level","???"); my $vl = ReadingsVal($vh->{NAME},"level","???");
my $vs = ($vl eq "100"?"on":($vl eq "0"?"off":"$vl")); my $vs = ($vl eq "100"?"on":($vl eq "0"?"off":"$vl"));
my($clvlMin,$clvlMax)=split",",AttrVal($vh->{NAME}, "levelRange", "0,100"); my($clvlMin,$clvlMax)=split",",AttrVal($vh->{NAME}, "levelRange", "0,100");
my $plc = int(($pl-$clvlMin)/($clvlMax - $clvlMin)*200+.99)/2; my $plc = int(($pl-$clvlMin)/($clvlMax - $clvlMin)*200)/2;
$plc = 1 if ($pl && $plc <= 0);
$vs = ($plc ne $vl)?"chn:$vs phys:$plc":$vs; $vs = ($plc ne $vl)?"chn:$vs phys:$plc":$vs;
push @evtEt,[$vh,1,"state:$vs"]; push @evtEt,[$vh,1,"state:$vs"];
push @evtEt,[$vh,1,"phyLevel:$plc"]; push @evtEt,[$vh,1,"phyLevel:$plc"];
} }
$pl = (($pl-$lvlMin)<=0 && $pl)
$pl = int(($pl-$lvlMin)/($lvlMax - $lvlMin)*200+.99)/2; ? 1
: int(($pl-$lvlMin)/($lvlMax - $lvlMin)*200)/2;
push @evtEt,[$shash,1,"phyLevel:$pl"]; #phys level push @evtEt,[$shash,1,"phyLevel:$pl"]; #phys level
$physLvl = $pl; $physLvl = $pl;
} }
@ -1375,7 +1377,9 @@ sub CUL_HM_Parse($$) {#########################################################
} }
} }
my $pVal = $val;# necessary for roper 'off', not logical off my $pVal = $val;# necessary for roper 'off', not logical off
$val = int((($val-$lvlMin)/($lvlMax - $lvlMin))*200+.99)/2; $val = (($val-$lvlMin)<=0 && $val)
? 1
: int((($val-$lvlMin)/($lvlMax - $lvlMin))*200)/2;
$physLvl = ReadingsVal($name,"phyLevel",$val) $physLvl = ReadingsVal($name,"phyLevel",$val)
if(!defined $physLvl); #not updated? use old or ignore if(!defined $physLvl); #not updated? use old or ignore
my $vs = ($val==100 ? "on":($pVal==0 ? "off":"$val")); # user string... my $vs = ($val==100 ? "on":($pVal==0 ? "off":"$val")); # user string...