mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
70_DENON_AVR: fixed multizone bug (thx timmib)
git-svn-id: https://svn.fhem.de/fhem/trunk@23027 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
6306cfd01c
commit
f79391d3c2
@ -1,5 +1,6 @@
|
|||||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
# 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.
|
# Do not insert empty lines here, update check depends on it.
|
||||||
|
- bugfix: 70_DENON_AVR: fixed multizone bug (thx timmib)
|
||||||
- feature: 49_Arlo: Added 2-factor authentication
|
- feature: 49_Arlo: Added 2-factor authentication
|
||||||
- bugfix: 73_AutoShuttersControl: fix IsDay Fn for weekend condition
|
- bugfix: 73_AutoShuttersControl: fix IsDay Fn for weekend condition
|
||||||
- fix detected IsDay for Brightness
|
- fix detected IsDay for Brightness
|
||||||
|
@ -31,6 +31,7 @@ package main;
|
|||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
use DevIo;
|
||||||
use Time::HiRes qw(gettimeofday);
|
use Time::HiRes qw(gettimeofday);
|
||||||
use HttpUtils;
|
use HttpUtils;
|
||||||
|
|
||||||
@ -1079,8 +1080,6 @@ DENON_AVR_Initialize($)
|
|||||||
|
|
||||||
Log 5, "DENON_AVR_Initialize: Entering";
|
Log 5, "DENON_AVR_Initialize: Entering";
|
||||||
|
|
||||||
require "$attr{global}{modpath}/FHEM/DevIo.pm";
|
|
||||||
|
|
||||||
# Provider
|
# Provider
|
||||||
$hash->{ReadFn} = "DENON_AVR_Read";
|
$hash->{ReadFn} = "DENON_AVR_Read";
|
||||||
$hash->{WriteFn} = "DENON_AVR_Write";
|
$hash->{WriteFn} = "DENON_AVR_Write";
|
||||||
@ -2368,7 +2367,7 @@ DENON_AVR_Get($@)
|
|||||||
}
|
}
|
||||||
elsif ($a[1] eq "zone")
|
elsif ($a[1] eq "zone")
|
||||||
{
|
{
|
||||||
my $return = DENON_AVR_Make_Zone($name."_Zone_".$a[2], $a[2]);
|
my $return = DENON_AVR_Make_Zone($name, $name."_Zone_".$a[2], $a[2]);
|
||||||
DENON_AVR_Command_StatusRequest($hash);
|
DENON_AVR_Command_StatusRequest($hash);
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
@ -3720,11 +3719,11 @@ DENON_AVR_SetUsedInputs($$) {
|
|||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
sub
|
sub
|
||||||
DENON_AVR_Make_Zone($$) {
|
DENON_AVR_Make_Zone($$$) {
|
||||||
my ( $name, $zone ) = @_;
|
my ( $ioname, $name, $zone ) = @_;
|
||||||
if(!defined($defs{$name}))
|
if(!defined($defs{$name}))
|
||||||
{
|
{
|
||||||
fhem("define $name Denon_AVR_ZONE $zone");
|
fhem("define $name Denon_AVR_ZONE $zone $ioname");
|
||||||
}
|
}
|
||||||
|
|
||||||
Log3 $name, 3, "DENON_AVR $name: create Denon_AVR_ZONE $zone.";
|
Log3 $name, 3, "DENON_AVR $name: create Denon_AVR_ZONE $zone.";
|
||||||
|
@ -318,9 +318,9 @@ DENON_AVR_ZONE_Define($$$)
|
|||||||
{
|
{
|
||||||
my ($hash, $a, $h) = @_;
|
my ($hash, $a, $h) = @_;
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
return "Usage: define <name> DENON_AVR_ZONE <zone> ... wrong paramter count: ".int(@$a) if(int(@$a) != 3);
|
return "Usage: define <name> DENON_AVR_ZONE <zone> <iodev> ... wrong paramter count: ".int(@$a) if(int(@$a) != 4);
|
||||||
|
|
||||||
AssignIoPort($hash);
|
AssignIoPort($hash, @$a[3]);
|
||||||
|
|
||||||
my $IOhash = $hash->{IODev};
|
my $IOhash = $hash->{IODev};
|
||||||
my $IOname = $IOhash->{NAME};
|
my $IOname = $IOhash->{NAME};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user