From 3a79c22cc640a27692372a3fb82b6ba7ab66bb16 Mon Sep 17 00:00:00 2001 From: markusbloch <> Date: Tue, 31 Oct 2017 16:05:17 +0000 Subject: [PATCH] YAMAHA_AVR: more robust volume set commands git-svn-id: https://svn.fhem.de/fhem/trunk@15363 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/71_YAMAHA_AVR.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/71_YAMAHA_AVR.pm b/fhem/FHEM/71_YAMAHA_AVR.pm index 4ab90ab07..6650bedbf 100755 --- a/fhem/FHEM/71_YAMAHA_AVR.pm +++ b/fhem/FHEM/71_YAMAHA_AVR.pm @@ -463,13 +463,13 @@ YAMAHA_AVR_Set($@) } 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))) { - $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]; }