From cec133607bd8eaa9904f7995a87cd13045387d27 Mon Sep 17 00:00:00 2001 From: markusbloch Date: Tue, 29 Dec 2015 13:05:12 +0000 Subject: [PATCH] YAMAHA_AVR: fixing not working volumeStraight set command (Forum: #46344) git-svn-id: https://svn.fhem.de/fhem/trunk@10292 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/71_YAMAHA_AVR.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 88c0fe70e..e57f0b6b3 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: fixing not working volumeStraight set command - change: FB_CALLLIST: start call processing only when "event:" is triggered by corresponding FB_CALLMONITOR device. - change: FB_CALLMONITOR: default value for attr fritzbox-remote-phonebook-via diff --git a/fhem/FHEM/71_YAMAHA_AVR.pm b/fhem/FHEM/71_YAMAHA_AVR.pm index 382587e4f..bdfd69881 100755 --- a/fhem/FHEM/71_YAMAHA_AVR.pm +++ b/fhem/FHEM/71_YAMAHA_AVR.pm @@ -425,7 +425,7 @@ YAMAHA_AVR_Set($@) { my $target_volume; - if($what eq "volume" and defined($a[2]) and $a[2] >= 0 && $a[2] <= 100) + if($what eq "volume" and defined($a[2]) and $a[2] =~ /^\d{1,3}$/ and $a[2] >= 0 && $a[2] <= 100) { $target_volume = YAMAHA_AVR_volume_rel2abs($a[2]); } @@ -437,7 +437,7 @@ YAMAHA_AVR_Set($@) { $target_volume = YAMAHA_AVR_volume_rel2abs($hash->{READINGS}{volume}{VAL} + ((defined($a[2]) and $a[2] =~ /^\d+$/) ? $a[2] : AttrVal($hash->{NAME}, "volumeSteps",5))); } - elsif(defined($a[2]) and $a[2] =~ /^\d+(?:\.\d)?$/) + elsif(defined($a[2]) and $a[2] =~ /^-?\d+(?:\.\d)?$/) { $target_volume = $a[2]; }