From 2daa8cc08911fe1e7ec2764bb2b94be95dfa5bc8 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Mon, 6 Jun 2016 06:59:23 +0000 Subject: [PATCH] 70_ONKYO_AVR,71_ONKYO_AVR_ZONE: refactoring of setter and getter functions git-svn-id: https://svn.fhem.de/fhem/trunk@11625 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/70_ONKYO_AVR.pm | 452 ++++++++++++++++---------------- fhem/FHEM/71_ONKYO_AVR_ZONE.pm | 461 ++++++++++++++++++--------------- 2 files changed, 484 insertions(+), 429 deletions(-) diff --git a/fhem/FHEM/70_ONKYO_AVR.pm b/fhem/FHEM/70_ONKYO_AVR.pm index 3857a8224..d9c46e096 100644 --- a/fhem/FHEM/70_ONKYO_AVR.pm +++ b/fhem/FHEM/70_ONKYO_AVR.pm @@ -107,7 +107,7 @@ sub ONKYO_AVR_Define($$$) { if ( int(@$a) < 3 ) { my $msg = -"Wrong syntax: define ONKYO_AVR []"; +"Wrong syntax: define ONKYO_AVR { | } []"; Log3 $name, 4, $msg; return $msg; } @@ -141,12 +141,18 @@ sub ONKYO_AVR_Define($$$) { # set default settings on first define if ($init_done) { - fhem 'attr ' . $name . ' stateFormat stateAV'; - fhem 'attr ' . $name - . ' cmdIcon muteT:rc_MUTE previous:rc_PREVIOUS next:rc_NEXT play:rc_PLAY pause:rc_PAUSE stop:rc_STOP shuffleT:rc_SHUFFLE repeatT:rc_REPEAT'; - fhem 'attr ' . $name . ' webCmd volume:muteT:input:previous:next'; - fhem 'attr ' . $name - . ' devStateIcon on:rc_GREEN@green:off off:rc_STOP:on absent:rc_RED playing:rc_PLAY@green:pause paused:rc_PAUSE@green:play muted:rc_MUTE@green:muteT fast-rewind:rc_REW@green:play fast-forward:rc_FF@green:play interrupted:rc_PAUSE@yellow:play'; + fhem 'attr ' . $name . ' stateFormat stateAV' + if ( !AttrVal( $name, "stateFormat", 0 ) ); + fhem 'attr ' + . $name + . ' cmdIcon muteT:rc_MUTE previous:rc_PREVIOUS next:rc_NEXT play:rc_PLAY pause:rc_PAUSE stop:rc_STOP shuffleT:rc_SHUFFLE repeatT:rc_REPEAT' + if ( !AttrVal( $name, "cmdIcon", 0 ) ); + fhem 'attr ' . $name . ' webCmd volume:muteT:input:previous:next' + if ( !AttrVal( $name, "webCmd", 0 ) ); + fhem 'attr ' + . $name + . ' devStateIcon on:rc_GREEN@green:off off:rc_STOP:on absent:rc_RED playing:rc_PLAY@green:pause paused:rc_PAUSE@green:play muted:rc_MUTE@green:muteT fast-rewind:rc_REW@green:play fast-forward:rc_FF@green:play interrupted:rc_PAUSE@yellow:play' + if ( !AttrVal( $name, "devStateIcon", 0 ) ); } $hash->{helper}{receiver}{device}{zonelist}{zone}{1}{name} = "Main"; $hash->{helper}{receiver}{device}{zonelist}{zone}{1}{value} = "1"; @@ -155,7 +161,7 @@ sub ONKYO_AVR_Define($$$) { $hash->{DeviceName} = @$a[2]; $hash->{DeviceName} = $hash->{DeviceName} . ":60128" if ( $hash->{DeviceName} =~ -/\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b/ +/^\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b$/ ); my $ret = DevIo_OpenDev( $hash, 0, "ONKYO_AVR_DevInit" ); @@ -277,6 +283,7 @@ sub ONKYO_AVR_Notify($$) { if ( ReadingsVal( $name, "stateAV", "-" ) ne $stateAV ); ONKYO_AVR_SendCommand( $hash, "power", "query" ); + ONKYO_AVR_SendCommand( $hash, "network-standby", "query" ); ONKYO_AVR_SendCommand( $hash, "input", "query" ); ONKYO_AVR_SendCommand( $hash, "mute", "query" ); ONKYO_AVR_SendCommand( $hash, "volume", "query" ); @@ -290,7 +297,7 @@ sub ONKYO_AVR_Notify($$) { ONKYO_AVR_SendCommand( $hash, "subwoofer-temporary-level", "query" ); fhem -"sleep 1 quiet;get $name remoteControl net-receiver-information query"; +"sleep 1 quiet;get $name remoteControl net-receiver-information query quiet"; # send to slaves if ( $definedZones > 1 ) { @@ -1283,33 +1290,33 @@ sub ONKYO_AVR_Read($) { } } - # elsif ( $cmd eq "NLA" ) { - # if ( $value =~ /^(.)(....)(.)(.)(..)(.*)/ ) { - # - # Log3 $name, 4, "ONKYO_AVR $name: rcv $cmd($1) unknown type" - # and return - # if ( $1 ne "X" ); - # - # Log3 $name, 4, "ONKYO_AVR $name: rcv $cmd($1) in progress" - # if ( $1 eq "X" ); - # - # my $uiTypes = { - # '0' => 'List', - # '1' => 'Menu', - # '2' => 'Playback', - # '3' => 'Popup', - # '4' => 'Keyboard', - # '5' => 'Menu List', - # }; - # my $uiType = $uiTypes->{$4}; - # - # $hash->{helper}{listinfo}{$3}{$2} = $6; - # } - # else { - # Log3 $name, 4, - # "ONKYO_AVR $name: NLA could not be parsed: " . $value; - # } - # } + # screen/list XML + elsif ( $cmd eq "net-usb-list-info-xml" ) { + if ( $value =~ /^(.)(....)(.)(.)(..)(.*)/ ) { + Log3 $name, 4, "ONKYO_AVR $name: rcv $cmd($1) unknown type" + and return + if ( $1 ne "X" ); + + Log3 $name, 4, "ONKYO_AVR $name: rcv $cmd($1) in progress"; + + my $uiTypes = { + '0' => 'List', + '1' => 'Menu', + '2' => 'Playback', + '3' => 'Popup', + '4' => 'Keyboard', + '5' => 'Menu List', + }; + my $uiType = $uiTypes->{$4}; + + $hash->{helper}{listinfo}{$3}{$2} = $6; + } + else { + Log3 $name, 4, + "ONKYO_AVR $name: net-usb-list-info-xml could not be parsed: " + . $value; + } + } elsif ( $cmd eq "net-usb-play-status" ) { if ( $value =~ /^(.)(.)(.)$/ ) { @@ -1514,8 +1521,11 @@ sub ONKYO_AVR_Ready($) { # This is relevant for windows/USB only my $po = $hash->{USBDev}; - my ( $BlockingFlags, $InBytes, $OutBytes, $ErrorFlags ) = $po->status; - return ( $InBytes > 0 ); + my ( $BlockingFlags, $InBytes, $OutBytes, $ErrorFlags ); + if ($po) { + ( $BlockingFlags, $InBytes, $OutBytes, $ErrorFlags ) = $po->status; + } + return ( $InBytes && $InBytes > 0 ); } ################################### @@ -1533,6 +1543,13 @@ sub ONKYO_AVR_Get($$$) { return "Argument is missing" if ( int(@$a) < 1 ); + # readings + return $hash->{READINGS}{ @$a[1] }{VAL} + if ( defined( $hash->{READINGS}{ @$a[1] } ) ); + + return "Device is offline and cannot be controlled at that stage." + if ( $presence eq "absent" ); + # createZone if ( lc( @$a[1] ) eq "createzone" ) { @@ -1540,20 +1557,14 @@ sub ONKYO_AVR_Get($$$) { $return = "Syntax: ZONE ID or NAME"; } else { - if ( $presence eq "absent" ) { - $return = - "Device is offline and cannot be controlled at that stage."; - } - else { - $return = - fhem "define " - . $name . "_" - . @$a[2] - . " ONKYO_AVR_ZONE " - . @$a[2]; - $return = $name . "_" . @$a[2] . " created" - if ( !$return || $return eq "" ); - } + $return = + fhem "define " + . $name . "_" + . @$a[2] + . " ONKYO_AVR_ZONE " + . @$a[2]; + $return = $name . "_" . @$a[2] . " created" + if ( !$return || $return eq "" ); } } @@ -1561,27 +1572,20 @@ sub ONKYO_AVR_Get($$$) { elsif ( lc( @$a[1] ) eq "statusrequest" ) { Log3 $name, 3, "ONKYO_AVR get $name " . @$a[1]; - if ( $presence ne "absent" ) { - ONKYO_AVR_SendCommand( $hash, "power", "query" ); - ONKYO_AVR_SendCommand( $hash, "input", "query" ); - ONKYO_AVR_SendCommand( $hash, "mute", "query" ); - ONKYO_AVR_SendCommand( $hash, "volume", "query" ); - ONKYO_AVR_SendCommand( $hash, "sleep", "query" ); - ONKYO_AVR_SendCommand( $hash, "audio-information", "query" ); - ONKYO_AVR_SendCommand( $hash, "video-information", "query" ); - ONKYO_AVR_SendCommand( $hash, "listening-mode", "query" ); - ONKYO_AVR_SendCommand( $hash, "video-picture-mode", "query" ); - ONKYO_AVR_SendCommand( $hash, "phase-matching-bass", "query" ); - ONKYO_AVR_SendCommand( $hash, "center-temporary-level", "query" ); - ONKYO_AVR_SendCommand( $hash, "subwoofer-temporary-level", - "query" ); - fhem -"sleep 1 quiet;get $name remoteControl net-receiver-information query"; - } - else { - $return = - "Device is offline and cannot be controlled at that stage."; - } + ONKYO_AVR_SendCommand( $hash, "power", "query" ); + ONKYO_AVR_SendCommand( $hash, "input", "query" ); + ONKYO_AVR_SendCommand( $hash, "mute", "query" ); + ONKYO_AVR_SendCommand( $hash, "volume", "query" ); + ONKYO_AVR_SendCommand( $hash, "sleep", "query" ); + ONKYO_AVR_SendCommand( $hash, "audio-information", "query" ); + ONKYO_AVR_SendCommand( $hash, "video-information", "query" ); + ONKYO_AVR_SendCommand( $hash, "listening-mode", "query" ); + ONKYO_AVR_SendCommand( $hash, "video-picture-mode", "query" ); + ONKYO_AVR_SendCommand( $hash, "phase-matching-bass", "query" ); + ONKYO_AVR_SendCommand( $hash, "center-temporary-level", "query" ); + ONKYO_AVR_SendCommand( $hash, "subwoofer-temporary-level", "query" ); + fhem +"sleep 1 quiet;get $name remoteControl net-receiver-information query quiet"; } # remoteControl @@ -1666,25 +1670,16 @@ sub ONKYO_AVR_Get($$$) { # normal processing else { Log3 $name, 3, - "ONKYO_AVR get $name " . @$a[1] . " " . @$a[2] . " " . @$a[3]; + "ONKYO_AVR get $name " . @$a[1] . " " . @$a[2] . " " . @$a[3] + if ( !@$a[4] || @$a[4] ne "quiet" ); - if ( $presence ne "absent" ) { - - ONKYO_AVR_SendCommand( $hash, @$a[2], @$a[3] ); - $return = "Sent command: " . @$a[2] . " " . @$a[3]; - } - else { - $return = - "Device needs to be reachable to be controlled remotely."; - } + ONKYO_AVR_SendCommand( $hash, @$a[2], @$a[3] ); + $return = "Sent command: " . @$a[2] . " " . @$a[3] + if ( !@$a[4] || @$a[4] ne "quiet" ); } } } - # readings - elsif ( defined( $hash->{READINGS}{ @$a[1] } ) ) { - $return = $hash->{READINGS}{ @$a[1] }{VAL}; - } else { $return = "Unknown argument " . @$a[1] . ", choose one of statusRequest:noArg"; @@ -1719,7 +1714,7 @@ sub ONKYO_AVR_Get($$$) { } } - return $return; + return $return if ($return); } ################################### @@ -1944,8 +1939,15 @@ sub ONKYO_AVR_Set($$$) { $usage .= $implicit_txt if ( $implicit_txt ne "" ); $usage .= " sleep:off,5,10,15,30,60,90"; + if ( ReadingsVal( $name, "currentTrackPosition", "--:--" ) ne "--:--" ) { + $usage .= " currentTrackPosition"; + } + my $cmd = ''; + return "Device is offline and cannot be controlled at that stage." + if ( $presence eq "absent" && lc( @$a[1] ) ne "on" ); + readingsBeginUpdate($hash); # channel @@ -1956,17 +1958,13 @@ sub ONKYO_AVR_Set($$$) { $return = "Syntax: CHANNELNAME [USERNAME PASSWORD]"; } else { - if ( $presence eq "absent" ) { - $return = - "Device is offline and cannot be controlled at that stage."; - } - elsif ( $state eq "off" ) { - $return = fhem "set $name on"; + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; $return .= fhem "sleep 5;set $name channel " . @$a[2]; } elsif ( $hash->{INPUT} ne "2B" ) { - ONKYO_AVR_SendCommand( $hash, "input", "2B" ); - $return = fhem "sleep 1;set $name channel " . @$a[2]; + $return = fhem "get $name remoteControl input 2B quiet"; + $return .= fhem "sleep 1;set $name channel " . @$a[2]; } elsif ( ReadingsVal( $name, "channel", "" ) ne @$a[2] @@ -2018,20 +2016,56 @@ sub ONKYO_AVR_Set($$$) { } } - # implicit commands through available readings - elsif ( grep $_ eq lc( @$a[1] ), @implicit_cmds ) { + # channelDown + elsif ( lc( @$a[1] ) eq "channeldown" ) { + Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; + + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name channelDown"; + } + elsif ( $hash->{INPUT} ne "2B" ) { + $return = fhem "get $name remoteControl input 2B quiet"; + $return .= fhem "sleep 1;set $name channelDown"; + } + else { + $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "chdn" ); + } + } + + # channelUp + elsif ( lc( @$a[1] ) eq "channelup" ) { + Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; + + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name channelUp"; + } + elsif ( $hash->{INPUT} ne "2B" ) { + $return = fhem "get $name remoteControl input 2B quiet"; + $return .= fhem "sleep 1;set $name channelUp"; + } + else { + $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "chup" ); + } + } + + # currentTrackPosition + elsif ( lc( @$a[1] ) eq "currenttrackposition" ) { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; if ( !defined( @$a[2] ) ) { $return = "No argument given"; } else { - if ( $presence eq "absent" ) { + + if ( @$a[2] !~ /^[0-9][0-9]:[0-5][0-9]$/ ) { $return = - "Device is offline and cannot be controlled at that stage."; + "Time needs to have format mm:ss and between 00:00 and 99:59"; } else { - $return = ONKYO_AVR_SendCommand( $hash, @$a[1], @$a[2] ); + $return = + ONKYO_AVR_SendCommand( $hash, "net-usb-time-seek", @$a[2] ); } } } @@ -2045,8 +2079,12 @@ sub ONKYO_AVR_Set($$$) { } else { if ( $state eq "off" ) { - $return = -"Device power is turned off, this function is unavailable at that stage."; + $return = fhem "get $name remoteControl power on quiet quiet"; + $return .= fhem "sleep 5;set $name preset " . @$a[2]; + } + elsif ( $hash->{INPUT} ne "24" && $hash->{INPUT} ne "25" ) { + $return = fhem "get $name remoteControl input 24 quiet"; + $return .= fhem "sleep 1;set $name preset " . @$a[2]; } elsif ( lc( @$a[2] ) eq "up" ) { $return = ONKYO_AVR_SendCommand( $hash, lc( @$a[1] ), "UP" ); @@ -2087,12 +2125,13 @@ sub ONKYO_AVR_Set($$$) { elsif ( lc( @$a[1] ) eq "presetdown" ) { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name presetDown"; } - elsif ( $state eq "off" ) { - $return = fhem "set $name on"; - $return = ONKYO_AVR_SendCommand( $hash, "preset", "down" ); + elsif ( $hash->{INPUT} ne "24" && $hash->{INPUT} ne "25" ) { + $return = fhem "get $name remoteControl input 24 quiet"; + $return .= fhem "sleep 1;set $name presetDown"; } else { $return = ONKYO_AVR_SendCommand( $hash, "preset", "down" ); @@ -2103,12 +2142,13 @@ sub ONKYO_AVR_Set($$$) { elsif ( lc( @$a[1] ) eq "presetup" ) { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name presetUp"; } - elsif ( $state eq "off" ) { - $return = fhem "set $name on"; - $return = ONKYO_AVR_SendCommand( $hash, "preset", "up" ); + elsif ( $hash->{INPUT} ne "24" && $hash->{INPUT} ne "25" ) { + $return = fhem "get $name remoteControl input 24 quiet"; + $return .= fhem "sleep 1;set $name presetUp"; } else { $return = ONKYO_AVR_SendCommand( $hash, "preset", "up" ); @@ -2234,6 +2274,9 @@ sub ONKYO_AVR_Set($$$) { else { $return = "Device is offline and cannot be controlled at that stage."; + $return .= +"\nYou may enable network-standby to allow a permanent connection to the device by the following command:\nget $name remoteControl network-standby on" + if ( ReadingsVal( $name, "network-standby", "off" ) ne "on" ); } } else { @@ -2261,14 +2304,7 @@ sub ONKYO_AVR_Set($$$) { # off elsif ( lc( @$a[1] ) eq "off" ) { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; - - if ( $presence eq "absent" ) { - $return = - "Device is offline and cannot be controlled at that stage."; - } - else { - $return = ONKYO_AVR_SendCommand( $hash, "power", "off" ); - } + $return = ONKYO_AVR_SendCommand( $hash, "power", "off" ); } # remoteControl @@ -2279,60 +2315,53 @@ sub ONKYO_AVR_Set($$$) { else { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; - if ( $presence eq "absent" ) { + if ( lc( @$a[2] ) eq "play" + || lc( @$a[2] ) eq "pause" + || lc( @$a[2] ) eq "repeat" + || lc( @$a[2] ) eq "stop" + || lc( @$a[2] ) eq "top" + || lc( @$a[2] ) eq "down" + || lc( @$a[2] ) eq "up" + || lc( @$a[2] ) eq "right" + || lc( @$a[2] ) eq "delete" + || lc( @$a[2] ) eq "display" + || lc( @$a[2] ) eq "ff" + || lc( @$a[2] ) eq "left" + || lc( @$a[2] ) eq "mode" + || lc( @$a[2] ) eq "return" + || lc( @$a[2] ) eq "rew" + || lc( @$a[2] ) eq "select" + || lc( @$a[2] ) eq "setup" + || lc( @$a[2] ) eq "0" + || lc( @$a[2] ) eq "1" + || lc( @$a[2] ) eq "2" + || lc( @$a[2] ) eq "3" + || lc( @$a[2] ) eq "4" + || lc( @$a[2] ) eq "5" + || lc( @$a[2] ) eq "6" + || lc( @$a[2] ) eq "7" + || lc( @$a[2] ) eq "8" + || lc( @$a[2] ) eq "9" ) + { $return = - "Device is offline and cannot be controlled at that stage."; + ONKYO_AVR_SendCommand( $hash, "net-usb", lc( @$a[2] ) ); + } + elsif ( lc( @$a[2] ) eq "prev" ) { + $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "trdown" ); + } + elsif ( lc( @$a[2] ) eq "next" ) { + $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "trup" ); + } + elsif ( lc( @$a[2] ) eq "shuffle" ) { + $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "random" ); + } + elsif ( lc( @$a[2] ) eq "menu" ) { + $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "men" ); } else { - if ( lc( @$a[2] ) eq "play" - || lc( @$a[2] ) eq "pause" - || lc( @$a[2] ) eq "repeat" - || lc( @$a[2] ) eq "stop" - || lc( @$a[2] ) eq "top" - || lc( @$a[2] ) eq "down" - || lc( @$a[2] ) eq "up" - || lc( @$a[2] ) eq "right" - || lc( @$a[2] ) eq "delete" - || lc( @$a[2] ) eq "display" - || lc( @$a[2] ) eq "ff" - || lc( @$a[2] ) eq "left" - || lc( @$a[2] ) eq "mode" - || lc( @$a[2] ) eq "return" - || lc( @$a[2] ) eq "rew" - || lc( @$a[2] ) eq "select" - || lc( @$a[2] ) eq "setup" - || lc( @$a[2] ) eq "0" - || lc( @$a[2] ) eq "1" - || lc( @$a[2] ) eq "2" - || lc( @$a[2] ) eq "3" - || lc( @$a[2] ) eq "4" - || lc( @$a[2] ) eq "5" - || lc( @$a[2] ) eq "6" - || lc( @$a[2] ) eq "7" - || lc( @$a[2] ) eq "8" - || lc( @$a[2] ) eq "9" ) - { - $return = - ONKYO_AVR_SendCommand( $hash, "net-usb", lc( @$a[2] ) ); - } - elsif ( lc( @$a[2] ) eq "prev" ) { - $return = - ONKYO_AVR_SendCommand( $hash, "net-usb", "trdown" ); - } - elsif ( lc( @$a[2] ) eq "next" ) { - $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "trup" ); - } - elsif ( lc( @$a[2] ) eq "shuffle" ) { - $return = - ONKYO_AVR_SendCommand( $hash, "net-usb", "random" ); - } - elsif ( lc( @$a[2] ) eq "menu" ) { - $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "men" ); - } - else { - $return = "Unsupported remoteControl command: " . @$a[2]; - } + $return = "Unsupported remoteControl command: " . @$a[2]; } + } } @@ -2427,32 +2456,6 @@ sub ONKYO_AVR_Set($$$) { } } - # channelDown - elsif ( lc( @$a[1] ) eq "channeldown" ) { - Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; - - if ( $state ne "on" ) { - $return = -"Device power is turned off, this function is unavailable at that stage."; - } - else { - $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "chdn" ); - } - } - - # channelUp - elsif ( lc( @$a[1] ) eq "channelup" ) { - Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; - - if ( $state ne "on" ) { - $return = -"Device power is turned off, this function is unavailable at that stage."; - } - else { - $return = ONKYO_AVR_SendCommand( $hash, "net-usb", "chup" ); - } - } - # sleep elsif ( lc( @$a[1] ) eq "sleep" ) { if ( !defined( @$a[2] ) ) { @@ -2461,24 +2464,18 @@ sub ONKYO_AVR_Set($$$) { else { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; - if ( $presence eq "absent" ) { + my $_ = @$a[2]; + if ( $_ eq "off" ) { + $return = ONKYO_AVR_SendCommand( $hash, "sleep", "off" ); + } + elsif ( m/^\d+$/ && $_ > 0 && $_ <= 90 ) { $return = - "Device is offline and cannot be controlled at that stage."; + ONKYO_AVR_SendCommand( $hash, "sleep", + ONKYO_AVR_dec2hex($_) ); } else { - my $_ = @$a[2]; - if ( $_ eq "off" ) { - $return = ONKYO_AVR_SendCommand( $hash, "sleep", "off" ); - } - elsif ( m/^\d+$/ && $_ > 0 && $_ <= 90 ) { - $return = - ONKYO_AVR_SendCommand( $hash, "sleep", - ONKYO_AVR_dec2hex($_) ); - } - else { - $return = + $return = "Argument does not seem to be a valid integer between 0 and 90"; - } } } } @@ -2563,10 +2560,7 @@ sub ONKYO_AVR_Set($$$) { else { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; - } - elsif ( $state eq "off" ) { + if ( $state eq "off" ) { $return = fhem "set $name on"; $return = ONKYO_AVR_SendCommand( $hash, "input", @$a[2] ); } @@ -2580,10 +2574,7 @@ sub ONKYO_AVR_Set($$$) { elsif ( lc( @$a[1] ) eq "inputup" ) { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; - } - elsif ( $state eq "off" ) { + if ( $state eq "off" ) { $return = fhem "set $name on"; $return = ONKYO_AVR_SendCommand( $hash, "input", "up" ); } @@ -2596,10 +2587,7 @@ sub ONKYO_AVR_Set($$$) { elsif ( lc( @$a[1] ) eq "inputdown" ) { Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; - } - elsif ( $state eq "off" ) { + if ( $state eq "off" ) { $return = fhem "set $name on"; $return = ONKYO_AVR_SendCommand( $hash, "input", "down" ); } @@ -2608,6 +2596,18 @@ sub ONKYO_AVR_Set($$$) { } } + # implicit commands through available readings + elsif ( grep $_ eq lc( @$a[1] ), @implicit_cmds ) { + Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; + + if ( !defined( @$a[2] ) ) { + $return = "No argument given"; + } + else { + $return = ONKYO_AVR_SendCommand( $hash, @$a[1], @$a[2] ); + } + } + # return usage hint else { $return = $usage; @@ -2957,7 +2957,8 @@ sub ONKYO_AVR_RClayout() {
    Define
      - define <name> ONKYO_AVR <ip-address-or-hostname>[:PORT] [<protocol-version>]
      + define <name> ONKYO_AVR <ip-address-or-hostname[:PORT]> [<protocol-version>]
      + define <name> ONKYO_AVR <devicename[@baudrate]> [<protocol-version>]

      This module controls ONKYO A/V receivers in real-time via network connection.
      Use ONKYO_AVR_ZONE to control slave zones.
      @@ -2994,6 +2995,9 @@ sub ONKYO_AVR_RClayout() {
    • channel   -   set active network service (e.g. Spotify)
      • +
    • + currentTrackPosition   -   seek to specific time for current track +
    • input   -   switches between inputs
      • diff --git a/fhem/FHEM/71_ONKYO_AVR_ZONE.pm b/fhem/FHEM/71_ONKYO_AVR_ZONE.pm index 009226c83..5c1db1ace 100644 --- a/fhem/FHEM/71_ONKYO_AVR_ZONE.pm +++ b/fhem/FHEM/71_ONKYO_AVR_ZONE.pm @@ -26,7 +26,6 @@ ############################################################################## package main; - use strict; use warnings; use Time::HiRes qw(usleep); @@ -134,16 +133,27 @@ sub ONKYO_AVR_ZONE_Define($$$) { # set default settings on first define if ($init_done) { - fhem 'attr ' . $name . ' stateFormat stateAV'; - fhem 'attr ' . $name - . ' cmdIcon muteT:rc_MUTE previous:rc_PREVIOUS next:rc_NEXT play:rc_PLAY pause:rc_PAUSE stop:rc_STOP shuffleT:rc_SHUFFLE repeatT:rc_REPEAT'; - fhem 'attr ' . $name . ' webCmd volume:muteT:input:previous:next'; - fhem 'attr ' . $name - . ' devStateIcon on:rc_GREEN@green:off off:rc_STOP:on absent:rc_RED playing:rc_PLAY@green:pause paused:rc_PAUSE@green:play muted:rc_MUTE@green:muteT fast-rewind:rc_REW@green:play fast-forward:rc_FF@green:play interrupted:rc_PAUSE@yellow:play'; + fhem 'attr ' . $name . ' stateFormat stateAV' + if ( !AttrVal( $name, "stateFormat", 0 ) ); + fhem 'attr ' + . $name + . ' cmdIcon muteT:rc_MUTE previous:rc_PREVIOUS next:rc_NEXT play:rc_PLAY pause:rc_PAUSE stop:rc_STOP shuffleT:rc_SHUFFLE repeatT:rc_REPEAT' + if ( !AttrVal( $name, "cmdIcon", 0 ) ); + fhem 'attr ' . $name . ' webCmd volume:muteT:input:previous:next' + if ( !AttrVal( $name, "webCmd", 0 ) ); + fhem 'attr ' + . $name + . ' devStateIcon on:rc_GREEN@green:off off:rc_STOP:on absent:rc_RED playing:rc_PLAY@green:pause paused:rc_PAUSE@green:play muted:rc_MUTE@green:muteT fast-rewind:rc_REW@green:play fast-forward:rc_FF@green:play interrupted:rc_PAUSE@yellow:play' + if ( !AttrVal( $name, "devStateIcon", 0 ) ); fhem 'attr ' . $name . ' inputs ' . AttrVal( $IOname, "inputs", "" ) - if ( AttrVal( $IOname, "inputs", "" ) ne "" ); + if (!AttrVal( $name, "inputs", 0 ) + && AttrVal( $IOname, "inputs", "" ) ne "" ); fhem 'attr ' . $name . ' room ' . AttrVal( $IOname, "room", "" ) - if ( AttrVal( $IOname, "room", "" ) ne "" ); + if (!AttrVal( $name, "room", 0 ) + && AttrVal( $IOname, "room", "" ) ne "" ); + fhem 'attr ' . $name . ' group ' . AttrVal( $IOname, "group", "" ) + if (!AttrVal( $name, "group", 0 ) + && AttrVal( $IOname, "group", "" ) ne "" ); } ONKYO_AVR_ZONE_SendCommand( $hash, "power", "query" ); @@ -329,6 +339,8 @@ sub ONKYO_AVR_ZONE_Get($$$) { my ( $hash, $a, $h ) = @_; my $name = $hash->{NAME}; my $zone = $hash->{ZONE}; + my $IOhash = $hash->{IODev}; + my $IOname = $IOhash->{NAME}; my $state = ReadingsVal( $name, "power", "off" ); my $presence = ReadingsVal( $name, "presence", "absent" ); my $commands = ONKYOdb::ONKYO_GetRemotecontrolCommand($zone); @@ -339,8 +351,25 @@ sub ONKYO_AVR_ZONE_Get($$$) { return "Argument is missing" if ( int(@$a) < 1 ); + # readings + return $hash->{READINGS}{ @$a[1] }{VAL} + if ( defined( $hash->{READINGS}{ @$a[1] } ) ); + + return "Device is offline and cannot be controlled at that stage." + if ( $presence eq "absent" ); + + # statusRequest + if ( lc( @$a[1] ) eq "statusrequest" ) { + Log3 $name, 3, "ONKYO_AVR_ZONE get $name " . @$a[1]; + + ONKYO_AVR_ZONE_SendCommand( $hash, "power", "query" ); + ONKYO_AVR_ZONE_SendCommand( $hash, "input", "query" ); + ONKYO_AVR_ZONE_SendCommand( $hash, "mute", "query" ); + ONKYO_AVR_ZONE_SendCommand( $hash, "volume", "query" ); + } + # remoteControl - if ( lc( @$a[1] ) eq "remotecontrol" ) { + elsif ( lc( @$a[1] ) eq "remotecontrol" ) { # Output help for commands if ( !defined( @$a[2] ) || @$a[2] eq "help" || @$a[2] eq "?" ) { @@ -424,26 +453,19 @@ sub ONKYO_AVR_ZONE_Get($$$) { "ONKYO_AVR_ZONE get $name " . @$a[1] . " " . @$a[2] . " " - . @$a[3]; + . @$a[3] + if ( !@$a[4] || @$a[4] ne "quiet" ); - if ( $presence ne "absent" ) { - ONKYO_AVR_ZONE_SendCommand( $hash, @$a[2], @$a[3] ); - $return = "Sent command: " . @$a[2] . " " . @$a[3]; - } - else { - $return = - "Device needs to be reachable to be controlled remotely."; - } + ONKYO_AVR_ZONE_SendCommand( $hash, @$a[2], @$a[3] ); + $return = "Sent command: " . @$a[2] . " " . @$a[3] + if ( !@$a[4] || @$a[4] ne "quiet" ); } } } - # readings - elsif ( defined( $hash->{READINGS}{ @$a[1] } ) ) { - $return = $hash->{READINGS}{ @$a[1] }{VAL}; - } else { - $return = "Unknown argument " . @$a[1] . ", choose one of"; + $return = + "Unknown argument " . @$a[1] . ", choose one of statusRequest:noArg"; # remoteControl $return .= " remoteControl:"; @@ -452,7 +474,7 @@ sub ONKYO_AVR_ZONE_Get($$$) { } } - return $return; + return $return if ($return); } ################################### @@ -673,8 +695,15 @@ sub ONKYO_AVR_ZONE_Set($$$) { $usage .= " $repeat_txt"; $usage .= $implicit_txt if ( $implicit_txt ne "" ); + if ( ReadingsVal( $name, "currentTrackPosition", "--:--" ) ne "--:--" ) { + $usage .= " currentTrackPosition"; + } + my $cmd = ''; + return "Device is offline and cannot be controlled at that stage." + if ( $presence eq "absent" && lc( @$a[1] ) ne "on" ); + readingsBeginUpdate($hash); # channel @@ -685,17 +714,13 @@ sub ONKYO_AVR_ZONE_Set($$$) { $return = "Syntax: CHANNELNAME [USERNAME PASSWORD]"; } else { - if ( $presence eq "absent" ) { - $return = - "Device is offline and cannot be controlled at that stage."; - } - elsif ( $state eq "off" ) { - $return = fhem "set $name on"; + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; $return .= fhem "sleep 5;set $name channel " . @$a[2]; } elsif ( $hash->{INPUT} ne "2B" ) { - ONKYO_AVR_ZONE_SendCommand( $hash, "input", "2B" ); - $return = fhem "sleep 1;set $name channel " . @$a[2]; + $return = fhem "get $name remoteControl input 2B quiet"; + $return .= fhem "sleep 1;set $name channel " . @$a[2]; } elsif ( ReadingsVal( $name, "channel", "" ) ne @$a[2] @@ -748,20 +773,57 @@ sub ONKYO_AVR_ZONE_Set($$$) { } } - # implicit commands through available readings - elsif ( grep $_ eq lc( @$a[1] ), @implicit_cmds ) { + # channelDown + elsif ( lc( @$a[1] ) eq "channeldown" ) { + Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; + + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name channelDown"; + } + elsif ( $hash->{INPUT} ne "2B" ) { + $return = fhem "get $name remoteControl input 2B quiet"; + $return .= fhem "sleep 1;set $name channelDown"; + } + else { + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "chdn" ); + } + } + + # channelUp + elsif ( lc( @$a[1] ) eq "channelup" ) { + Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; + + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name channelUp"; + } + elsif ( $hash->{INPUT} ne "2B" ) { + $return = fhem "get $name remoteControl input 2B quiet"; + $return .= fhem "sleep 1;set $name channelUp"; + } + else { + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "chup" ); + } + } + + # currentTrackPosition + elsif ( lc( @$a[1] ) eq "currenttrackposition" ) { Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1] . " " . @$a[2]; if ( !defined( @$a[2] ) ) { - $return = "No argument given, choose one of ?"; + $return = "No argument given"; } else { - if ( $presence eq "absent" ) { + + if ( @$a[2] !~ /^[0-9][0-9]:[0-5][0-9]$/ ) { $return = - "Device is offline and cannot be controlled at that stage."; + "Time needs to have format mm:ss and between 00:00 and 99:59"; } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, @$a[1], @$a[2] ); + $return = + ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-time-seek", + @$a[2] ); } } } @@ -775,20 +837,24 @@ sub ONKYO_AVR_ZONE_Set($$$) { } else { if ( $state eq "off" ) { - $return = -"Device power is turned off, this function is unavailable at that stage."; + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name preset " . @$a[2]; + } + elsif ( $hash->{INPUT} ne "24" && $hash->{INPUT} ne "25" ) { + $return = fhem "get $name remoteControl input 24 quiet"; + $return .= fhem "sleep 1;set $name preset " . @$a[2]; } elsif ( lc( @$a[2] ) eq "up" ) { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, lc( @$a[1] ), "UP" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, lc( @$a[1] ), "UP" ); } elsif ( lc( @$a[2] ) eq "down" ) { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, lc( @$a[1] ), "DOWN" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, lc( @$a[1] ), "DOWN" ); } elsif ( @$a[2] =~ /^\d*$/ ) { $return = ONKYO_AVR_ZONE_SendCommand( - $hash, + $IOhash, lc( @$a[1] ), ONKYO_AVR_dec2hex( @$a[2] ) ); @@ -806,7 +872,7 @@ sub ONKYO_AVR_ZONE_Set($$$) { if ( $presetName eq @$a[2] ) { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, lc( @$a[1] ), + ONKYO_AVR_ZONE_SendCommand( $IOhash, lc( @$a[1] ), uc($id) ); last; @@ -818,33 +884,35 @@ sub ONKYO_AVR_ZONE_Set($$$) { # presetDown elsif ( lc( @$a[1] ) eq "presetdown" ) { - Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; + Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name presetDown"; } - elsif ( $state eq "off" ) { - $return = fhem "set $name on"; - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "preset", "down" ); + elsif ( $hash->{INPUT} ne "24" && $hash->{INPUT} ne "25" ) { + $return = fhem "get $name remoteControl input 24 quiet"; + $return .= fhem "sleep 1;set $name presetDown"; } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "preset", "down" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "preset", "down" ); } } # presetUp elsif ( lc( @$a[1] ) eq "presetup" ) { - Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1]; + Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; + if ( $state eq "off" ) { + $return = fhem "get $name remoteControl power on quiet"; + $return .= fhem "sleep 5;set $name presetUp"; } - elsif ( $state eq "off" ) { - $return = fhem "set $name on"; - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "preset", "up" ); + elsif ( $hash->{INPUT} ne "24" && $hash->{INPUT} ne "25" ) { + $return = fhem "get $name remoteControl input 24 quiet"; + $return .= fhem "sleep 1;set $name presetUp"; } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "preset", "up" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "preset", "up" ); } } @@ -861,21 +929,22 @@ sub ONKYO_AVR_ZONE_Set($$$) { "Device power is turned off, this function is unavailable at that stage."; } elsif ( lc( @$a[2] ) eq "up" ) { - my $setVal; + my $setVal = ""; $setVal = "B" if ( $2 eq "bass" ); $setVal = "T" if ( $2 eq "treble" ); $return = - ONKYO_AVR_ZONE_SendCommand( $hash, lc($1), $setVal . "UP" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, lc($1), $setVal . "UP" ); } elsif ( lc( @$a[2] ) eq "down" ) { - my $setVal; + my $setVal = ""; $setVal = "B" if ( $2 eq "bass" ); $setVal = "T" if ( $2 eq "treble" ); $return = - ONKYO_AVR_ZONE_SendCommand( $hash, lc($1), $setVal . "DOWN" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, lc($1), + $setVal . "DOWN" ); } elsif ( @$a[2] =~ /^-*\d+$/ ) { - my $setVal; + my $setVal = ""; $setVal = "B" if ( $2 eq "bass" ); $setVal = "T" if ( $2 eq "treble" ); $setVal .= "+" if ( @$a[2] > 0 ); @@ -887,49 +956,12 @@ sub ONKYO_AVR_ZONE_Set($$$) { $setVal2 = substr( $setVal2, 1 ) if ( $setVal2 ne "00" ); $return = - ONKYO_AVR_ZONE_SendCommand( $hash, lc($1), + ONKYO_AVR_ZONE_SendCommand( $IOhash, lc($1), $setVal . $setVal2 ); } } } - # balance - elsif ( lc( @$a[1] ) eq "balance" ) { - Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; - - if ( !defined( @$a[2] ) ) { - $return = "No argument given"; - } - else { - if ( $state eq "off" ) { - $return = -"Device power is turned off, this function is unavailable at that stage."; - } - elsif ( lc( @$a[2] ) eq "up" ) { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, lc($1), "UP" ); - } - elsif ( lc( @$a[2] ) eq "down" ) { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, lc($1), "DOWN" ); - } - elsif ( @$a[2] =~ /^-*\d+$/ ) { - my $setVal; - $setVal = "+" if ( @$a[2] > 0 ); - $setVal = "-" if ( @$a[2] < 0 ); - - my $setVal2 = @$a[2]; - $setVal2 = substr( $setVal2, 1 ) if ( $setVal2 < 0 ); - $setVal2 = ONKYO_AVR_dec2hex($setVal2); - $setVal2 = substr( $setVal2, 1 ) if ( $setVal2 ne "00" ); - - $return = ONKYO_AVR_ZONE_SendCommand( - $hash, - lc( @$a[1] ), - $setVal . $setVal2 - ); - } - } - } - # toggle elsif ( lc( @$a[1] ) eq "toggle" ) { Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; @@ -965,41 +997,37 @@ sub ONKYO_AVR_ZONE_Set($$$) { else { $return = "Device is offline and cannot be controlled at that stage."; + $return .= +"\nYou may enable network-standby to allow a permanent connection to the device by the following command:\nget $name remoteControl network-standby on" + if ( ReadingsVal( $name, "network-standby", "off" ) ne "on" ); } } else { Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "power", "on" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "power", "on" ); # don't wait for receiver to confirm power on # - readingsBeginUpdate($hash); + readingsBeginUpdate($IOhash); # power - readingsBulkUpdate( $hash, "power", "on" ) + readingsBulkUpdate( $IOhash, "power", "on" ) if ( ReadingsVal( $name, "power", "-" ) ne "on" ); # stateAV - my $stateAV = ONKYO_AVR_ZONE_GetStateAV($hash); - readingsBulkUpdate( $hash, "stateAV", $stateAV ) + my $stateAV = ONKYO_AVR_ZONE_GetStateAV($IOhash); + readingsBulkUpdate( $IOhash, "stateAV", $stateAV ) if ( ReadingsVal( $name, "stateAV", "-" ) ne $stateAV ); - readingsEndUpdate( $hash, 1 ); + readingsEndUpdate( $IOhash, 1 ); } } # off elsif ( lc( @$a[1] ) eq "off" ) { Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; - - if ( $presence eq "absent" ) { - $return = - "Device is offline and cannot be controlled at that stage."; - } - else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "power", "off" ); - } + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "power", "off" ); } # remoteControl @@ -1008,67 +1036,60 @@ sub ONKYO_AVR_ZONE_Set($$$) { $return = "No argument given, choose one of minutes off"; } else { - Log3 $name, 3, "ONKYO_AVR set $name " . @$a[1] . " " . @$a[2]; + Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1] . " " . @$a[2]; - if ( $presence eq "absent" ) { + if ( lc( @$a[2] ) eq "play" + || lc( @$a[2] ) eq "pause" + || lc( @$a[2] ) eq "repeat" + || lc( @$a[2] ) eq "stop" + || lc( @$a[2] ) eq "top" + || lc( @$a[2] ) eq "down" + || lc( @$a[2] ) eq "up" + || lc( @$a[2] ) eq "right" + || lc( @$a[2] ) eq "delete" + || lc( @$a[2] ) eq "display" + || lc( @$a[2] ) eq "ff" + || lc( @$a[2] ) eq "left" + || lc( @$a[2] ) eq "mode" + || lc( @$a[2] ) eq "return" + || lc( @$a[2] ) eq "rew" + || lc( @$a[2] ) eq "select" + || lc( @$a[2] ) eq "setup" + || lc( @$a[2] ) eq "0" + || lc( @$a[2] ) eq "1" + || lc( @$a[2] ) eq "2" + || lc( @$a[2] ) eq "3" + || lc( @$a[2] ) eq "4" + || lc( @$a[2] ) eq "5" + || lc( @$a[2] ) eq "6" + || lc( @$a[2] ) eq "7" + || lc( @$a[2] ) eq "8" + || lc( @$a[2] ) eq "9" ) + { $return = - "Device is offline and cannot be controlled at that stage."; + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", + lc( @$a[2] ) ); + } + elsif ( lc( @$a[2] ) eq "prev" ) { + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "trdown" ); + } + elsif ( lc( @$a[2] ) eq "next" ) { + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "trup" ); + } + elsif ( lc( @$a[2] ) eq "shuffle" ) { + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "random" ); + } + elsif ( lc( @$a[2] ) eq "menu" ) { + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "men" ); } else { - if ( lc( @$a[2] ) eq "play" - || lc( @$a[2] ) eq "pause" - || lc( @$a[2] ) eq "repeat" - || lc( @$a[2] ) eq "stop" - || lc( @$a[2] ) eq "top" - || lc( @$a[2] ) eq "down" - || lc( @$a[2] ) eq "up" - || lc( @$a[2] ) eq "right" - || lc( @$a[2] ) eq "delete" - || lc( @$a[2] ) eq "display" - || lc( @$a[2] ) eq "ff" - || lc( @$a[2] ) eq "left" - || lc( @$a[2] ) eq "mode" - || lc( @$a[2] ) eq "return" - || lc( @$a[2] ) eq "rew" - || lc( @$a[2] ) eq "select" - || lc( @$a[2] ) eq "setup" - || lc( @$a[2] ) eq "0" - || lc( @$a[2] ) eq "1" - || lc( @$a[2] ) eq "2" - || lc( @$a[2] ) eq "3" - || lc( @$a[2] ) eq "4" - || lc( @$a[2] ) eq "5" - || lc( @$a[2] ) eq "6" - || lc( @$a[2] ) eq "7" - || lc( @$a[2] ) eq "8" - || lc( @$a[2] ) eq "9" ) - { - $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", - lc( @$a[2] ) ); - } - elsif ( lc( @$a[2] ) eq "prev" ) { - $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", - "trdown" ); - } - elsif ( lc( @$a[2] ) eq "next" ) { - $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "trup" ); - } - elsif ( lc( @$a[2] ) eq "shuffle" ) { - $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", - "random" ); - } - elsif ( lc( @$a[2] ) eq "menu" ) { - $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "men" ); - } - else { - $return = "Unsupported remoteControl command: " . @$a[2]; - } + $return = "Unsupported remoteControl command: " . @$a[2]; } + } } @@ -1081,7 +1102,7 @@ sub ONKYO_AVR_ZONE_Set($$$) { "Device power is turned off, this function is unavailable at that stage."; } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "play" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "play" ); } } @@ -1094,7 +1115,7 @@ sub ONKYO_AVR_ZONE_Set($$$) { "Device power is turned off, this function is unavailable at that stage."; } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "pause" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "pause" ); } } @@ -1107,7 +1128,7 @@ sub ONKYO_AVR_ZONE_Set($$$) { "Device power is turned off, this function is unavailable at that stage."; } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "stop" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "stop" ); } } @@ -1121,7 +1142,7 @@ sub ONKYO_AVR_ZONE_Set($$$) { } else { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "random" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "random" ); } } @@ -1135,7 +1156,7 @@ sub ONKYO_AVR_ZONE_Set($$$) { } else { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "repeat" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "repeat" ); } } @@ -1149,7 +1170,7 @@ sub ONKYO_AVR_ZONE_Set($$$) { } else { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "trdown" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "trdown" ); } } @@ -1162,7 +1183,31 @@ sub ONKYO_AVR_ZONE_Set($$$) { "Device power is turned off, this function is unavailable at that stage."; } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "net-usb-z", "trup" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "net-usb", "trup" ); + } + } + + # sleep + elsif ( lc( @$a[1] ) eq "sleep" ) { + if ( !defined( @$a[2] ) ) { + $return = "No argument given, choose one of minutes off"; + } + else { + Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1] . " " . @$a[2]; + + my $_ = @$a[2]; + if ( $_ eq "off" ) { + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "sleep", "off" ); + } + elsif ( m/^\d+$/ && $_ > 0 && $_ <= 90 ) { + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "sleep", + ONKYO_AVR_dec2hex($_) ); + } + else { + $return = +"Argument does not seem to be a valid integer between 0 and 90"; + } } } @@ -1177,13 +1222,14 @@ sub ONKYO_AVR_ZONE_Set($$$) { if ( $state eq "on" ) { if ( !defined( @$a[2] ) || @$a[2] eq "toggle" ) { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "mute", "toggle" ); + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "mute", "toggle" ); } elsif ( lc( @$a[2] ) eq "off" ) { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "mute", "off" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "mute", "off" ); } elsif ( lc( @$a[2] ) eq "on" ) { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "mute", "on" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "mute", "on" ); } else { $return = "Argument does not seem to be one of on off toogle"; @@ -1206,8 +1252,8 @@ sub ONKYO_AVR_ZONE_Set($$$) { my $_ = @$a[2]; if ( m/^\d+$/ && $_ >= 0 && $_ <= 100 ) { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "volume", - ONKYO_AVR_ZONE_dec2hex($_) ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, "volume", + ONKYO_AVR_dec2hex($_) ); } else { $return = @@ -1227,11 +1273,11 @@ sub ONKYO_AVR_ZONE_Set($$$) { if ( $state eq "on" ) { if ( lc( @$a[1] ) eq "volumeup" ) { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "volume", "level-up" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, "volume", "level-up" ); } else { $return = - ONKYO_AVR_ZONE_SendCommand( $hash, "volume", "level-down" ); + ONKYO_AVR_ZONE_SendCommand( $IOhash, "volume", "level-down" ); } } else { @@ -1247,15 +1293,14 @@ sub ONKYO_AVR_ZONE_Set($$$) { else { Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1] . " " . @$a[2]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; - } - elsif ( $state eq "off" ) { + if ( $state eq "off" ) { $return = fhem "set $name on"; - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "input", @$a[2] ); + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "input", @$a[2] ); } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "input", @$a[2] ); + $return = + ONKYO_AVR_ZONE_SendCommand( $IOhash, "input", @$a[2] ); } } } @@ -1264,15 +1309,12 @@ sub ONKYO_AVR_ZONE_Set($$$) { elsif ( lc( @$a[1] ) eq "inputup" ) { Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; - } - elsif ( $state eq "off" ) { + if ( $state eq "off" ) { $return = fhem "set $name on"; - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "input", "up" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "input", "up" ); } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "input", "up" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "input", "up" ); } } @@ -1280,15 +1322,24 @@ sub ONKYO_AVR_ZONE_Set($$$) { elsif ( lc( @$a[1] ) eq "inputdown" ) { Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1]; - if ( $presence eq "absent" ) { - $return = "Device needs to be ON to change input."; - } - elsif ( $state eq "off" ) { + if ( $state eq "off" ) { $return = fhem "set $name on"; - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "input", "down" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "input", "down" ); } else { - $return = ONKYO_AVR_ZONE_SendCommand( $hash, "input", "down" ); + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, "input", "down" ); + } + } + + # implicit commands through available readings + elsif ( grep $_ eq lc( @$a[1] ), @implicit_cmds ) { + Log3 $name, 3, "ONKYO_AVR_ZONE set $name " . @$a[1] . " " . @$a[2]; + + if ( !defined( @$a[2] ) ) { + $return = "No argument given"; + } + else { + $return = ONKYO_AVR_ZONE_SendCommand( $IOhash, @$a[1], @$a[2] ); } } @@ -1384,7 +1435,7 @@ sub ONKYO_AVR_ZONE_SendCommand($$$) { } ################################### -sub ONKYO_AVR_ZONE_dec2hex($) { +sub ONKYO_AVR_dec2hex($) { my ($dec) = @_; my $hex = uc( sprintf( "%x", $dec ) );