Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ONKYO_AVR: fix XML caching

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@4495 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2013-12-29 04:03:47 +00:00
parent cec42e91e9
commit 7ac4bedf1c
1 changed files with 53 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
FHEM/70_ONKYO_AVR.pm
View File

@ -97,70 +97,18 @@ sub ONKYO_AVR_GetStatus($;$) {
InternalTimer( gettimeofday() + $interval, "ONKYO_AVR_GetStatus", $hash, 0 ) InternalTimer( gettimeofday() + $interval, "ONKYO_AVR_GetStatus", $hash, 0 )
unless ( $local == 1 ); unless ( $local == 1 );
# Read powerstate
#
my $powerstate = ONKYO_AVR_SendCommand( $hash, "power", "query" );
$state = "off";
if ( defined($powerstate) ) {
if ( $powerstate eq "on" ) {
$state = "on";
# Read other state information
$states->{mute} = ONKYO_AVR_SendCommand( $hash, "mute", "query" );
$states->{volume} =
ONKYO_AVR_SendCommand( $hash, "volume", "query" );
$states->{sleep} = ONKYO_AVR_SendCommand( $hash, "sleep", "query" )
if ( $zone eq "main" );
$states->{input} = ONKYO_AVR_SendCommand( $hash, "input", "query" );
$states->{video} =
ONKYO_AVR_SendCommand( $hash, "video-information", "query" )
if ( $zone eq "main" );
$states->{audio} =
ONKYO_AVR_SendCommand( $hash, "audio-information", "query" )
if ( $zone eq "main" );
}
}
else {
$state = "absent";
}
readingsBeginUpdate($hash);
# Set reading for power
#
my $readingPower = "off";
if ( $state eq "on" ) {
$readingPower = "on";
}
if ( !defined( $hash->{READINGS}{power}{VAL} )
|| $hash->{READINGS}{power}{VAL} ne $readingPower )
{
readingsBulkUpdate( $hash, "power", $readingPower );
}
# Set reading for state
#
if ( !defined( $hash->{READINGS}{state}{VAL} )
|| $hash->{READINGS}{state}{VAL} ne $state )
{
readingsBulkUpdate( $hash, "state", $state );
}
readingsEndUpdate( $hash, 1 );
# cache XML device information # cache XML device information
# #
# get device information if not available from helper # get device information if not available from helper
if ( !defined( $hash->{helper}{receiver} ) if ( !defined( $hash->{helper}{receiver} )
&& $protocol ne "pre2013" && $protocol ne "pre2013"
&& $state ne "absent" ) && $hash->{READINGS}{presence}{VAL} ne "absent" )
{ {
my $xml = my $xml =
ONKYO_AVR_SendCommand( $hash, "net-receiver-information", "query" ); ONKYO_AVR_SendCommand( $hash, "net-receiver-information", "query" );
if ( defined($xml) && $xml =~ /^<\?xml/ ) { if ( defined($xml) && $xml =~ /^<\?xml/ ) {
my $xml_parser = XML::Simple->new( my $xml_parser = XML::Simple->new(
NormaliseSpace => 2, NormaliseSpace => 2,
KeepRoot => 0, KeepRoot => 0,
@ -273,7 +221,7 @@ sub ONKYO_AVR_GetStatus($;$) {
if ( defined( $attr{$name}{inputs} ) ) { if ( defined( $attr{$name}{inputs} ) ) {
my @inputs = split( ':', $attr{$name}{inputs} ); my @inputs = split( ':', $attr{$name}{inputs} );
if ( ref(@inputs) eq "ARRAY" ) { if (@inputs) {
foreach (@inputs) { foreach (@inputs) {
if (m/[^,\s]+(,[^,\s]+)+/) { if (m/[^,\s]+(,[^,\s]+)+/) {
my @input_names = split( ',', $_ ); my @input_names = split( ',', $_ );
@ -287,12 +235,58 @@ sub ONKYO_AVR_GetStatus($;$) {
} }
} }
} }
# Read powerstate
#
my $powerstate = ONKYO_AVR_SendCommand( $hash, "power", "query" );
$state = "off";
if ( defined($powerstate) ) {
if ( $powerstate eq "on" ) {
$state = "on";
# Read other state information
$states->{mute} = ONKYO_AVR_SendCommand( $hash, "mute", "query" );
$states->{volume} =
ONKYO_AVR_SendCommand( $hash, "volume", "query" );
$states->{sleep} = ONKYO_AVR_SendCommand( $hash, "sleep", "query" )
if ( $zone eq "main" );
$states->{input} = ONKYO_AVR_SendCommand( $hash, "input", "query" );
$states->{video} =
ONKYO_AVR_SendCommand( $hash, "video-information", "query" )
if ( $zone eq "main" );
$states->{audio} =
ONKYO_AVR_SendCommand( $hash, "audio-information", "query" )
if ( $zone eq "main" );
}
}
else { else {
$hash->{helper}{receiver}{NRI} = 0; $state = "absent";
} }
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
# Set reading for power
#
my $readingPower = "off";
if ( $state eq "on" ) {
$readingPower = "on";
}
if ( !defined( $hash->{READINGS}{power}{VAL} )
|| $hash->{READINGS}{power}{VAL} ne $readingPower )
{
readingsBulkUpdate( $hash, "power", $readingPower );
}
# Set reading for state
#
if ( !defined( $hash->{READINGS}{state}{VAL} )
|| $hash->{READINGS}{state}{VAL} ne $state )
{
readingsBulkUpdate( $hash, "state", $state );
}
# Set general readings for all zones # Set general readings for all zones
# #
foreach ( "mute", "volume", "input" ) { foreach ( "mute", "volume", "input" ) {
@ -590,7 +584,7 @@ sub ONKYO_AVR_Set($@) {
my $state = $hash->{STATE}; my $state = $hash->{STATE};
my $return; my $return;
my $reading; my $reading;
my $inputs_txt; my $inputs_txt = "";
Log3 $name, 5, "ONKYO_AVR $name: called function ONKYO_AVR_Set()"; Log3 $name, 5, "ONKYO_AVR $name: called function ONKYO_AVR_Set()";
@ -682,9 +676,9 @@ sub ONKYO_AVR_Set($@) {
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
# statusRequest # statusRequest
if ( $a[1] eq "statusRequest" ) { if ( $a[1] eq "statusRequest" || $a[1] eq "statusrequest" ) {
Log3 $name, 2, "ONKYO_AVR set $name " . $a[1]; Log3 $name, 2, "ONKYO_AVR set $name " . $a[1];
$hash->{helper}{receiver} = undef; delete $hash->{helper}{receiver} if ( $state ne "absent" );
ONKYO_AVR_GetStatus( $hash, 1 ) if ( !defined( $a[2] ) ); ONKYO_AVR_GetStatus( $hash, 1 ) if ( !defined( $a[2] ) );
} }