mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-22 20:24:36 +00:00
70_PIONEERAVR: input alias names are available even after a reboot
git-svn-id: https://svn.fhem.de/fhem/trunk@17776 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
9ebbc777ae
commit
50a399e682
@ -155,16 +155,13 @@ sub PIONEERAVR_Initialize($) {
|
|||||||
sub PIONEERAVR_Define($$) {
|
sub PIONEERAVR_Define($$) {
|
||||||
my ( $hash, $a, $h ) = @_;
|
my ( $hash, $a, $h ) = @_;
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
Log3 $name, 5, "PIONEERAVR $name: called function PIONEERAVR_Define()";
|
|
||||||
|
|
||||||
my $protocol = @$a[2];
|
my $protocol = @$a[2];
|
||||||
|
|
||||||
Log3 $name, 5, "PIONEERAVR $name: called function PIONEERAVR_Define()";
|
Log3 $name, 5, "PIONEERAVR $name: called function PIONEERAVR_Define()";
|
||||||
|
|
||||||
if( int(@$a) != 4 || (($protocol ne "telnet") && ($protocol ne "serial"))) {
|
if( int(@$a) != 4 || (($protocol ne "telnet") && ($protocol ne "serial"))) {
|
||||||
my $msg = "Wrong syntax: define <name> PIONEERAVR telnet <ipaddress[:port]> or define <name> PIONEERAVR serial <devicename[\@baudrate]>";
|
my $msg = "Wrong syntax: define <name> PIONEERAVR telnet <ipaddress[:port]> or define <name> PIONEERAVR serial <devicename[\@baudrate]>";
|
||||||
Log3 $name, 3, "PIONEERAVR $name: " . $msg;
|
Log3 $name, 4, "PIONEERAVR $name: " . $msg;
|
||||||
return $msg;
|
return $msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -219,8 +216,8 @@ sub PIONEERAVR_Define($$) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# $hash->{helper}{INPUTNAMES} lists the default input names and their inputNr as provided by Pioneer.
|
# $hash->{helper}{INPUTNAMES} lists the default input names and their inputNr as provided by Pioneer.
|
||||||
# This module tries to read those names and the alias names from the AVR receiver and tries to check if this input is enabled or disabled
|
# This module can read those names and the alias names from the AVR receiver and can try to check if this input is enabled or disabled
|
||||||
# So this list is just a fall back if the module can't read the names ...
|
# So this list is a fall back, if the module can't read the names or the reading of the names takes too long (for the user)...
|
||||||
# InputNr with player functions (play,pause,...) ("13","17","18","26","27","33","38","41","44","45","48","49","53");
|
# InputNr with player functions (play,pause,...) ("13","17","18","26","27","33","38","41","44","45","48","49","53");
|
||||||
# Input number for usbDac, ipodUsb, xmRadio, homeMediaGallery, sirius, adapterPort, internetRadio, pandora, mediaServer, Favorites, mhl, spotify
|
# Input number for usbDac, ipodUsb, xmRadio, homeMediaGallery, sirius, adapterPort, internetRadio, pandora, mediaServer, Favorites, mhl, spotify
|
||||||
# Additionally this module tries to get information from the Pioneer AVR
|
# Additionally this module tries to get information from the Pioneer AVR
|
||||||
@ -268,6 +265,27 @@ sub PIONEERAVR_Define($$) {
|
|||||||
"49" => {"name" => "game", "aliasName" => "", "enabled" => "1", "playerCommands" => "1"},
|
"49" => {"name" => "game", "aliasName" => "", "enabled" => "1", "playerCommands" => "1"},
|
||||||
"53" => {"name" => "spotify", "aliasName" => "", "enabled" => "1", "playerCommands" => "1"}
|
"53" => {"name" => "spotify", "aliasName" => "", "enabled" => "1", "playerCommands" => "1"}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Input Name aliases and which inputs are enabled/disabled should be available after a restart -> setKeyValue/getKeyValue are used to store those values to a file or database.
|
||||||
|
# Here we restore those values after a rebstart
|
||||||
|
my $inputindex = undef;
|
||||||
|
my $inputNr = undef;
|
||||||
|
for ( my $i=0; $i<60; $i++ ) {
|
||||||
|
$inputNr = sprintf '%02d', $i;
|
||||||
|
$inputindex = "PIONEERAVR_InputAlias_".$inputNr;
|
||||||
|
my ($err, $data) = getKeyValue($inputindex);
|
||||||
|
if (!defined $err) {
|
||||||
|
$hash->{helper}{INPUTNAMES}->{$inputNr}{aliasName} = $data;
|
||||||
|
};
|
||||||
|
$inputindex = "PIONEERAVR_InputEnabled_".$inputNr;
|
||||||
|
my ($err, $data) = getKeyValue($inputindex);
|
||||||
|
if (!defined $err) {
|
||||||
|
$hash->{helper}{INPUTNAMES}->{$inputNr}{enabled} = $data;
|
||||||
|
};
|
||||||
|
undef $err;
|
||||||
|
undef $data;
|
||||||
|
};
|
||||||
|
|
||||||
# ----------------Human Readable command mapping table for "set" commands-----------------------
|
# ----------------Human Readable command mapping table for "set" commands-----------------------
|
||||||
$hash->{helper}{SETS} = {
|
$hash->{helper}{SETS} = {
|
||||||
'main' => {
|
'main' => {
|
||||||
@ -2290,6 +2308,10 @@ sub PIONEERAVR_Read($)
|
|||||||
# lc first
|
# lc first
|
||||||
if ( $isAlias ) {
|
if ( $isAlias ) {
|
||||||
$hash->{helper}{INPUTNAMES}->{$inputNr}{aliasName} = lcfirst( substr( $line,6 ) );
|
$hash->{helper}{INPUTNAMES}->{$inputNr}{aliasName} = lcfirst( substr( $line,6 ) );
|
||||||
|
# input name aliases should be available after a restart of FHEM -> setKeyValue
|
||||||
|
my $inputindex = "PIONEERAVR_InputAlias_".$inputNr;
|
||||||
|
setKeyValue($inputindex, lcfirst( substr( $line,6 ) ));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$hash->{helper}{INPUTNAMES}->{$inputNr}{name} = lcfirst( substr( $line,6 ) );
|
$hash->{helper}{INPUTNAMES}->{$inputNr}{name} = lcfirst( substr( $line,6 ) );
|
||||||
}
|
}
|
||||||
@ -2381,19 +2403,21 @@ sub PIONEERAVR_Read($)
|
|||||||
# input enabled
|
# input enabled
|
||||||
} elsif ( $line=~ m/^SSC(\d\d)030(1|0)$/ ) {
|
} elsif ( $line=~ m/^SSC(\d\d)030(1|0)$/ ) {
|
||||||
|
|
||||||
# select(undef, undef, undef, 0.001);
|
|
||||||
# check for input skip information
|
# check for input skip information
|
||||||
# format: ?SSC<2 digit input function nr>03
|
# format: ?SSC<2 digit input function nr>03
|
||||||
# response: SSC<2 digit input function nr>0300: use
|
# response: SSC<2 digit input function nr>0300: use
|
||||||
# response: SSC<2 digit input function nr>0301: skip
|
# response: SSC<2 digit input function nr>0301: skip
|
||||||
# response: E06: inappropriate parameter (input function nr not available on that device)
|
# response: E06: inappropriate parameter (input function nr not available on that device)
|
||||||
# we can not trust "E06" as it is not sure that it is the reply for the current input nr
|
# we can not trust "E06" as it is not sure that it is the reply for the current input nr
|
||||||
|
# the information, which inputs are enabled/disabled should be available after a restart of FHEM -> setKeyValue
|
||||||
|
my $inputindex = "PIONEERAVR_InputEnabled_".$1;
|
||||||
if ( $2 == 1 ) {
|
if ( $2 == 1 ) {
|
||||||
$hash->{helper}{INPUTNAMES}->{$1}{enabled} = 0;
|
$hash->{helper}{INPUTNAMES}->{$1}{enabled} = 0;
|
||||||
|
setKeyValue($inputindex, 0);
|
||||||
Log3 $hash, 5, "PIONEERAVR $name: ".dq( $line ) ." interpreted as: InputNr: $1 is disabled";
|
Log3 $hash, 5, "PIONEERAVR $name: ".dq( $line ) ." interpreted as: InputNr: $1 is disabled";
|
||||||
} elsif ( $2 == 0) {
|
} elsif ( $2 == 0) {
|
||||||
$hash->{helper}{INPUTNAMES}->{$1}{enabled} = 1;
|
$hash->{helper}{INPUTNAMES}->{$1}{enabled} = 1;
|
||||||
|
setKeyValue($inputindex, 1);
|
||||||
Log3 $hash, 5, "PIONEERAVR $name: ".dq( $line ) ." interpreted as: InputNr: $1 is enabled";
|
Log3 $hash, 5, "PIONEERAVR $name: ".dq( $line ) ." interpreted as: InputNr: $1 is enabled";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user