Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ONKYO_AVR: implement volumeSteps and remove experimental::lexical_topic

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11836 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-07-24 11:47:15 +00:00
parent 3a78fb83fd
commit ff9ad5b1dd
2 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
FHEM/70_ONKYO_AVR.pm
View File

@ -40,7 +40,6 @@ use Data::Dumper;
$Data::Dumper::Sortkeys = 1; $Data::Dumper::Sortkeys = 1;
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
no if $] >= 5.017011, warnings => 'experimental::lexical_topic';
sub ONKYO_AVR_Set($$$); sub ONKYO_AVR_Set($$$);
sub ONKYO_AVR_Get($$$); sub ONKYO_AVR_Get($$$);
@ -335,13 +334,6 @@ sub ONKYO_AVR_Notify($$) {
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
} }
#####################################
sub ONKYO_AVR_Reopen($) {
my ($hash) = @_;
DevIo_CloseDev($hash);
DevIo_OpenDev( $hash, 1, undef );
}
################################### ###################################
sub ONKYO_AVR_Undefine($$) { sub ONKYO_AVR_Undefine($$) {
my ( $hash, $name ) = @_; my ( $hash, $name ) = @_;
@ -1532,9 +1524,20 @@ sub ONKYO_AVR_Read($) {
################################### ###################################
sub ONKYO_AVR_Ready($) { sub ONKYO_AVR_Ready($) {
my ($hash) = @_; my ($hash) = @_;
return DevIo_OpenDev( $hash, 1, undef ) my $name = $hash->{NAME};
if ( ReadingsVal( $hash->{NAME}, "state", "disconnected" ) eq
"disconnected" ); if ( ReadingsVal( $name, "state", "disconnected" ) eq "disconnected" ) {
DevIo_OpenDev(
$hash, 1, undef,
sub() {
my ( $hash, $err ) = @_;
Log3 $name, 2, "ONKYO_AVR $name: $err" if ($err);
}
);
return;
}
# This is relevant for windows/USB only # This is relevant for windows/USB only
my $po = $hash->{USBDev}; my $po = $hash->{USBDev};
@ -2482,14 +2485,13 @@ sub ONKYO_AVR_Set($$$) {
else { else {
Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2];
my $_ = @$a[2]; if ( @$a[2] eq "off" ) {
if ( $_ eq "off" ) {
$return = ONKYO_AVR_SendCommand( $hash, "sleep", "off" ); $return = ONKYO_AVR_SendCommand( $hash, "sleep", "off" );
} }
elsif ( m/^\d+$/ && $_ > 0 && $_ <= 90 ) { elsif ( @$a[2] =~ m/^\d+$/ && @$a[2] > 0 && @$a[2] <= 90 ) {
$return = $return =
ONKYO_AVR_SendCommand( $hash, "sleep", ONKYO_AVR_SendCommand( $hash, "sleep",
ONKYO_AVR_dec2hex($_) ); ONKYO_AVR_dec2hex( @$a[2] ) );
} }
else { else {
$return = $return =
@ -2535,11 +2537,10 @@ sub ONKYO_AVR_Set($$$) {
Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2];
if ( $state eq "on" ) { if ( $state eq "on" ) {
my $_ = @$a[2]; if ( @$a[2] =~ m/^\d+$/ && @$a[2] >= 0 && @$a[2] <= 100 ) {
if ( m/^\d+$/ && $_ >= 0 && $_ <= 100 ) {
$return = $return =
ONKYO_AVR_SendCommand( $hash, "volume", ONKYO_AVR_SendCommand( $hash, "volume",
ONKYO_AVR_dec2hex($_) ); ONKYO_AVR_dec2hex( @$a[2] ) );
} }
else { else {
$return = $return =
@ -2555,14 +2556,31 @@ sub ONKYO_AVR_Set($$$) {
# volumeUp/volumeDown # volumeUp/volumeDown
elsif ( lc( @$a[1] ) =~ /^(volumeup|volumedown)$/ ) { elsif ( lc( @$a[1] ) =~ /^(volumeup|volumedown)$/ ) {
Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1];
my $volumeSteps = AttrVal( $name, "volumeSteps", "1" );
my $volume = ReadingsVal( $name, "volume", "0" );
if ( $state eq "on" ) { if ( $state eq "on" ) {
if ( lc( @$a[1] ) eq "volumeup" ) { if ( lc( @$a[1] ) eq "volumeup" ) {
$return = ONKYO_AVR_SendCommand( $hash, "volume", "level-up" ); if ( $volumeSteps > 1 ) {
$return =
ONKYO_AVR_SendCommand( $hash, "volume",
ONKYO_AVR_dec2hex( $volume + $volumeSteps ) );
}
else {
$return =
ONKYO_AVR_SendCommand( $hash, "volume", "level-up" );
}
} }
else { else {
$return = if ( $volumeSteps > 1 ) {
ONKYO_AVR_SendCommand( $hash, "volume", "level-down" ); $return =
ONKYO_AVR_SendCommand( $hash, "volume",
ONKYO_AVR_dec2hex( $volume - $volumeSteps ) );
}
else {
$return =
ONKYO_AVR_SendCommand( $hash, "volume", "level-down" );
}
} }
} }
else { else {

31
FHEM/71_ONKYO_AVR_ZONE.pm
View File

@ -35,7 +35,6 @@ use Data::Dumper;
$Data::Dumper::Sortkeys = 1; $Data::Dumper::Sortkeys = 1;
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
no if $] >= 5.017011, warnings => 'experimental::lexical_topic';
sub ONKYO_AVR_ZONE_Set($$$); sub ONKYO_AVR_ZONE_Set($$$);
sub ONKYO_AVR_ZONE_Get($$$); sub ONKYO_AVR_ZONE_Get($$$);
@ -1223,11 +1222,10 @@ sub ONKYO_AVR_ZONE_Set($$$) {
Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1] . " " . @$a[2]; Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1] . " " . @$a[2];
if ( $state eq "on" ) { if ( $state eq "on" ) {
my $_ = @$a[2]; if ( @$a[2] =~ m/^\d+$/ && @$a[2] >= 0 && @$a[2] <= 100 ) {
if ( m/^\d+$/ && $_ >= 0 && $_ <= 100 ) {
$return = $return =
ONKYO_AVR_ZONE_SendCommand( $hash, "volume", ONKYO_AVR_ZONE_SendCommand( $hash, "volume",
ONKYO_AVR_dec2hex($_) ); ONKYO_AVR_dec2hex( @$a[2] ) );
} }
else { else {
$return = $return =
@ -1243,15 +1241,32 @@ sub ONKYO_AVR_ZONE_Set($$$) {
# volumeUp/volumeDown # volumeUp/volumeDown
elsif ( lc( @$a[1] ) =~ /^(volumeup|volumedown)$/ ) { elsif ( lc( @$a[1] ) =~ /^(volumeup|volumedown)$/ ) {
Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1];
my $volumeSteps = AttrVal( $name, "volumeSteps", "1" );
my $volume = ReadingsVal( $name, "volume", "0" );
if ( $state eq "on" ) { if ( $state eq "on" ) {
if ( lc( @$a[1] ) eq "volumeup" ) { if ( lc( @$a[1] ) eq "volumeup" ) {
$return = if ( $volumeSteps > 1 ) {
ONKYO_AVR_ZONE_SendCommand( $hash, "volume", "level-up" ); $return =
ONKYO_AVR_ZONE_SendCommand( $hash, "volume",
ONKYO_AVR_dec2hex( $volume + $volumeSteps ) );
}
else {
$return =
ONKYO_AVR_ZONE_SendCommand( $hash, "volume", "level-up" );
}
} }
else { else {
$return = if ( $volumeSteps > 1 ) {
ONKYO_AVR_ZONE_SendCommand( $hash, "volume", "level-down" ); $return =
ONKYO_AVR_ZONE_SendCommand( $hash, "volume",
ONKYO_AVR_dec2hex( $volume - $volumeSteps ) );
}
else {
$return =
ONKYO_AVR_ZONE_SendCommand( $hash, "volume",
"level-down" );
}
} }
} }
else { else {