mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

70_VolumeLink: Fixed ampInputReading was ignored

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9199 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rapster
2015-09-03 19:31:59 +00:00
parent 83933e7863
commit 31c0d74bb8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/70_VolumeLink.pm
View File

@@ -1,5 +1,5 @@
############################################################################### ###############################################################################
# $Id: 70_VolumeLink.pm 2015-08-20 09:00 - rapster - rapster at x0e dot de $ # $Id$
package main; package main;
use strict; use strict;
@@ -89,7 +89,7 @@ sub VolumeLink_Undef($$) {
my ($hash,$arg) = @_; my ($hash,$arg) = @_;
$hash->{STARTED} = 0; $hash->{STARTED} = 0;
RemoveInternalTimer ($hash); RemoveInternalTimer($hash);
Log3 $hash->{NAME}, 3, "$hash->{NAME}: STOPPED"; Log3 $hash->{NAME}, 3, "$hash->{NAME}: STOPPED";
@@ -186,7 +186,7 @@ sub VolumeLink_Attr(@) {
sub VolumeLink_SendCommand($) { sub VolumeLink_SendCommand($) {
my ($hash) = @_; my ($hash) = @_;
Log3 $hash->{NAME}, 5, "$hash->{NAME}: SendCommand - executed with params: $hash->{httpParams}->{noshutdown}"; Log3 $hash->{NAME}, 5, "$hash->{NAME}: SendCommand - executed";
HttpUtils_NonblockingGet($hash->{httpParams}); HttpUtils_NonblockingGet($hash->{httpParams});
@@ -253,7 +253,7 @@ sub VolumeLink_ReceiveCommand($) {
return; return;
} }
if($ampTitle =~ /$param->{hash}->{ampInputReadingVal}/i || $param->{hash}->{ampInputReading} == 0) { if($ampTitle =~ /$param->{hash}->{ampInputReadingVal}/i || !$param->{hash}->{ampInputReading}) {
if($vol ne $ampVol) { if($vol ne $ampVol) {
Log3 $name, 5, "$name: Set Volume on ampDevice '$param->{hash}->{ampDevice}' - newVolume:'$vol' - oldVolume:'$ampVol'."; Log3 $name, 5, "$name: Set Volume on ampDevice '$param->{hash}->{ampDevice}' - newVolume:'$vol' - oldVolume:'$ampVol'.";
CommandSet(undef, $param->{hash}->{ampDevice}.' '.$param->{hash}->{ampVolumeCommand}.' '.$vol); CommandSet(undef, $param->{hash}->{ampDevice}.' '.$param->{hash}->{ampVolumeCommand}.' '.$vol);
@@ -370,7 +370,7 @@ VolumeLink links the volume-level & mute-state from a physical device (e.g.
If set to 1 the module will be stopped and no volume will be fetched from physical-device or transfer to the amplifier-device. <br> If set to 1 the module will be stopped and no volume will be fetched from physical-device or transfer to the amplifier-device. <br>
If set to 0 you can start the module again with: set &lt;name&gt; on.</li> If set to 0 you can start the module again with: set &lt;name&gt; on.</li>
<li>httpNoShutdown &lt;1|0&gt;<br> <li>httpNoShutdown &lt;1|0&gt;<br>
If set to 0 the module will tell the http-server to explicit close the connection.<br> If set to 0 VolumeLink will tell the http-server to explicit close the connection.<br>
<i>Default: 1</i> <i>Default: 1</i>
</li> </li>
<li>ampInputReading &lt;value&gt;<br> <li>ampInputReading &lt;value&gt;<br>