FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

YAMAHA_AVR: more robust volume set commands

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15363 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2017-10-31 16:05:17 +00:00
parent 6cbce7fd7e
commit 3a79c22cc6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/71_YAMAHA_AVR.pm
View File

@ -463,13 +463,13 @@ YAMAHA_AVR_Set($@)
} }
elsif($what eq "volumeDown" and defined(ReadingsVal($name, "volume", undef))) elsif($what eq "volumeDown" and defined(ReadingsVal($name, "volume", undef)))
{ {
$target_volume = YAMAHA_AVR_volume_rel2abs(ReadingsVal($name, "volume", -45) - ((defined($a[2]) and $a[2] =~ /^\d+$/) ? $a[2] : AttrVal($hash->{NAME}, "volumeSteps",5))); $target_volume = YAMAHA_AVR_volume_rel2abs(ReadingsVal($name, "volume", -45) - ((defined($a[2]) and $a[2] =~ /^\d+(?:\.\d)?$/) ? int($a[2]) : AttrVal($hash->{NAME}, "volumeSteps",5)));
} }
elsif($what eq "volumeUp" and defined(ReadingsVal($name, "volume", undef))) elsif($what eq "volumeUp" and defined(ReadingsVal($name, "volume", undef)))
{ {
$target_volume = YAMAHA_AVR_volume_rel2abs(ReadingsVal($name, "volume", -45) + ((defined($a[2]) and $a[2] =~ /^\d+$/) ? $a[2] : AttrVal($hash->{NAME}, "volumeSteps",5))); $target_volume = YAMAHA_AVR_volume_rel2abs(ReadingsVal($name, "volume", -45) + ((defined($a[2]) and $a[2] =~ /^\d+(?:\.\d)?$/) ? int($a[2]) : AttrVal($hash->{NAME}, "volumeSteps",5)));
} }
elsif(defined($a[2]) and $a[2] =~ /^-?\d+(?:\.\d)?$/) elsif($what eq "volumeStraight" and defined($a[2]) and $a[2] =~ /^-?\d+(?:\.\d)?$/)
{ {
$target_volume = $a[2]; $target_volume = $a[2];
} }