From ae1567ef5c6ff811004c258f4608a4a50699def1 Mon Sep 17 00:00:00 2001 From: markusbloch <> Date: Tue, 20 Jun 2017 19:02:27 +0000 Subject: [PATCH] YAMAHA_AVR: new set commands / readings for controlling HDMI outputs (Forum: #41924) / fixing currentTitle reading for newer model series git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14547 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 2 + FHEM/71_YAMAHA_AVR.pm | 133 +++++++++++++++++++++++++++++++++--------- 2 files changed, 108 insertions(+), 27 deletions(-) diff --git a/CHANGED b/CHANGED index 4425a2970..f1e173859 100644 --- a/CHANGED +++ b/CHANGED @@ -1,5 +1,7 @@ # 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. + - feature: YAMAHA_AVR: new set commands / readings to control HDMI outputs + (only for models with two HDMI outputs) - featere: exclude_from_update can check the source too (Forum #73275) - change: 93_DbRep: V5.2.0, preparation for UTF-8 support by DbLog - bugfix: 36_Vallox: Changed read. Added attributes. Changed DeviceID. diff --git a/FHEM/71_YAMAHA_AVR.pm b/FHEM/71_YAMAHA_AVR.pm index 5607ab30b..26f74818d 100755 --- a/FHEM/71_YAMAHA_AVR.pm +++ b/FHEM/71_YAMAHA_AVR.pm @@ -241,6 +241,12 @@ YAMAHA_AVR_GetStatus($;$) } } + # check hdmi output state, if supported + if($hash->{ACTIVE_ZONE} eq "mainzone" and $hash->{helper}{SUPPORT_HDMI_OUT}) + { + YAMAHA_AVR_SendCommand($hash, "GetParam", "statusRequest", "hdmiOut1", {options => {can_fail => 1}}); + YAMAHA_AVR_SendCommand($hash, "GetParam", "statusRequest", "hdmiOut2", {options => {can_fail => 1}}); + } YAMAHA_AVR_ResetTimer($hash) unless($local == 1); @@ -324,7 +330,8 @@ YAMAHA_AVR_Set($@) (exists($hash->{helper}{SURROUND_DECODERS}) ? "surroundDecoder:".$decoders_comma." " : ""). ($hash->{helper}{SUPPORT_DISPLAY_BRIGHTNESS} ? "displayBrightness:slider,-4,1,0 " : ""). (exists($hash->{helper}{DSP_MODES}) ? "dsp:".$dsp_modes_comma." " : ""). - "enhancer:on,off " + "enhancer:on,off ". + ($hash->{helper}{SUPPORT_HDMI_OUT} ? "hdmiOut1:on,off hdmiOut2:on,off " : "") :""). (exists($hash->{helper}{CURRENT_INPUT_TAG}) ? "navigateListMenu play:noArg pause:noArg stop:noArg skip:reverse,forward ". @@ -339,6 +346,7 @@ YAMAHA_AVR_Set($@) ($hash->{helper}{SUPPORT_PARTY_MODE} ? "partyMode:on,off " : ""). ($hash->{helper}{SUPPORT_EXTRA_BASS} ? "extraBass:off,auto " : ""). ($hash->{helper}{SUPPORT_YPAO_VOLUME} ? "ypaoVolume:off,auto " : ""). + "tunerFrequency ". "displayBrightness:slider,-4,1,0 ". "statusRequest:noArg"; @@ -996,35 +1004,64 @@ YAMAHA_AVR_Set($@) } elsif($what eq "ypaoVolume" and defined($a[2])) { - if($a[2] eq "auto") - { - YAMAHA_AVR_SendCommand($hash, "<$zone>Auto", $what, $a[2]); - } - elsif($a[2] eq "off") - { - YAMAHA_AVR_SendCommand($hash, "<$zone>Off", $what, $a[2]); - } - else - { - return $usage; - } + if($a[2] eq "auto") + { + YAMAHA_AVR_SendCommand($hash, "<$zone>Auto", $what, $a[2]); + } + elsif($a[2] eq "off") + { + YAMAHA_AVR_SendCommand($hash, "<$zone>Off", $what, $a[2]); + } + else + { + return $usage; + } } elsif($what eq "extraBass" and defined($a[2])) { - if($a[2] eq "auto") - { - YAMAHA_AVR_SendCommand($hash, "<$zone>Auto", $what, $a[2]); - } - elsif($a[2] eq "off") - { - YAMAHA_AVR_SendCommand($hash, "<$zone>Off", $what, $a[2]); - } - else - { - return $usage; - } + if($a[2] eq "auto") + { + YAMAHA_AVR_SendCommand($hash, "<$zone>Auto", $what, $a[2]); + } + elsif($a[2] eq "off") + { + YAMAHA_AVR_SendCommand($hash, "<$zone>Off", $what, $a[2]); + } + else + { + return $usage; + } + } + elsif($what eq "hdmiOut1" and defined($a[2])) + { + if($a[2] eq "on") + { + YAMAHA_AVR_SendCommand($hash, "On", $what, $a[2]); + } + elsif($a[2] eq "off") + { + YAMAHA_AVR_SendCommand($hash, "Off", $what, $a[2]); + } + else + { + return $usage; + } + } + elsif($what eq "hdmiOut2" and defined($a[2])) + { + if($a[2] eq "on") + { + YAMAHA_AVR_SendCommand($hash, "On", $what, $a[2]); + } + elsif($a[2] eq "off") + { + YAMAHA_AVR_SendCommand($hash, "Off", $what, $a[2]); + } + else + { + return $usage; + } } - elsif($what eq "statusRequest") { YAMAHA_AVR_GetStatus($hash, 1); @@ -1388,6 +1425,10 @@ YAMAHA_AVR_ParseResponse($$$) { $hash->{helper}{SUPPORT_DISPLAY_BRIGHTNESS} = 0; } + elsif($arg eq "hdmiOut1" or $arg eq "hdmiOut2") + { + $hash->{helper}{SUPPORT_HDMI_OUT} = 0; + } } } @@ -1802,6 +1843,10 @@ YAMAHA_AVR_ParseResponse($$$) { readingsBulkUpdate($hash, "currentTitle", YAMAHA_AVR_html2txt($1)); } + elsif($data =~ /.*?(.+?)<\/Track>.*?<\/Meta_Info>/) + { + readingsBulkUpdate($hash, "currentTitle", YAMAHA_AVR_html2txt($1)); + } elsif($data =~ /.*?(.+?)<\/Radio_Text_A>.*?<\/Meta_Info>/) { my $tmp = $1; @@ -1910,6 +1955,28 @@ YAMAHA_AVR_ParseResponse($$$) $hash->{helper}{SUPPORT_DISPLAY_BRIGHTNESS} = 0; } } + elsif($arg eq "hdmiOut1") + { + if($data =~ /(.+?)<\/OUT_1>/) + { + readingsBulkUpdate($hash, "hdmiOut1", lc($1)); + } + elsif($data =~ /RC="2"/) # is not supported by this specific model + { + $hash->{helper}{SUPPORT_HDMI_OUT} = 0; + } + } + elsif($arg eq "hdmiOut2") + { + if($data =~ /(.+?)<\/OUT_2>/) + { + readingsBulkUpdate($hash, "hdmiOut2", lc($1)); + } + elsif($data =~ /RC="2"/) # is not supported by this specific model + { + $hash->{helper}{SUPPORT_HDMI_OUT} = 0; + } + } } elsif($cmd eq "on") { @@ -2067,7 +2134,7 @@ YAMAHA_AVR_ParseResponse($$$) YAMAHA_AVR_SendCommand($hash,"GetParam", "statusRequest", "tunerFrequency"); } } - + readingsEndUpdate($hash, 1); YAMAHA_AVR_GetStatus($hash, 1) unless($cmd =~ /^statusRequest|navigateListMenu|volume|input|tuner.+$/); @@ -2245,6 +2312,10 @@ YAMAHA_AVR_ParseXML($$$) } } + + # check for hdmi output command + $hash->{helper}{SUPPORT_HDMI_OUT} = ($data =~ // ? 1 : 0); + # uncomment line for zone detection testing # #$hash->{helper}{ZONES} .= "|Zone_2"; @@ -2504,6 +2575,8 @@ sub YAMAHA_AVR_isModel_DSP($)
  • volumeStraight -80...15 [direct]   -   set the volume level in decibel. If you use "direct" as second argument, no volume smoothing is used (if activated) for this volume change. In this case, the volume will be set immediatly.
  • volumeUp [0-100] [direct]   -   increases the volume level by 5% or the value of attribute volumeSteps (optional the increasing level can be given as argument, which will be used instead). If you use "direct" as second argument, no volume smoothing is used (if activated) for this volume change. In this case, the volume will be set immediatly.
  • volumeDown [0-100] [direct]   -   decreases the volume level by 5% or the value of attribute volumeSteps (optional the decreasing level can be given as argument, which will be used instead). If you use "direct" as second argument, no volume smoothing is used (if activated) for this volume change. In this case, the volume will be set immediatly.
    • +
  • hdmiOut1 on|off   -   controls the HDMI output 1
    • +
  • hdmiOut2 on|off   -   controls the HDMI output 2
  • mute on|off|toggle   -   activates volume mute
  • bass [-6...6] step 0.5 (main zone), [-10...10] step 2 (other zones), [-10...10] step 1 (other zones, DSP models)   -   set bass tone level in decibel
  • treble [-6...6] step 0.5 (main zone), [-10...10] step 2 (other zones), [-10...10] step 1 (other zones, DSP models)   -   set treble tone level in decibel
    • @@ -2671,6 +2744,8 @@ So here are some examples:
  • extraBass - The status of the extra bass (can be "auto" or "off", only available if supported by the device)
  • input - The selected input source according to the FHEM input commands
  • inputName - The input description as seen on the receiver display
    • +
  • hdmiOut1 - The status of the HDMI output 1 (can be "on" or "off")
    • +
  • hdmiOut2 - The status of the HDMI output 2 (can be "on" or "off")
  • mute - Reports the mute status of the receiver or zone (can be "on" or "off")
  • newFirmware - indicates if a firmware update is available (can be "available" or "unavailable"; only available for RX-Vx71, RX-Vx73, RX-Ax10 or RX-Ax20)
  • power - Reports the power status of the receiver or zone (can be "on" or "off")
    • @@ -2802,6 +2877,8 @@ So here are some examples:
  • presetDown   -   wählt das vorherige Preset für den aktuellen Eingang aus.
  • direct on,off   -   Umgeht alle internen soundverbessernden Maßnahmen (Equalizer, Enhancer, Adaptive DRC,...) und gibt das Signal unverfälscht wieder
  • input hdmi1,hdmiX,...   -   Wählt den Eingangskanal (es werden nur die tatsächlich verfügbaren Eingänge angeboten)
    • +
  • hdmiOut1 on,off   -   Aktiviert die Ausgabe via HDMI Ausgang 1
    • +
  • hdmiOut2 on,off   -   Aktiviert die Ausgabe via HDMI Ausgang 2
  • scene scene1,sceneX   -   Wählt eine vorgefertigte Szene aus
  • surroundDecoder dolbypl,...   -   Setzt den Surround Decoder, welcher genutzt werden soll sofern der DSP Modus "Surround Decoder" aktiv ist.
  • volume 0...100 [direct]   -   Setzt die Lautstärke in Prozent (0 bis 100%). Wenn als zweites Argument "direct" gesetzt ist, wird keine weiche Lautstärkenanpassung durchgeführt (sofern aktiviert). Die Lautstärke wird in diesem Fall sofort gesetzt.
    • @@ -2961,6 +3038,8 @@ Ein paar Beispiele:
  • extraBass - Der Status des Extra Bass ("auto" => an, "off" => aus)
  • input - Der ausgewählte Eingang entsprechend dem FHEM-Kommando
  • inputName - Die Eingangsbezeichnung, so wie sie am Receiver eingestellt wurde und auf dem Display erscheint
    • +
  • hdmiOut1 - Der Status des HDMI Ausgang 1 ("on" => an, "off" => aus)
    • +
  • hdmiOut2 - Der Status des HDMI Ausgang 2 ("on" => an, "off" => aus)
  • mute - Der aktuelle Stumm-Status ("on" => Stumm, "off" => Laut)
  • newFirmware - Zeigt an, ob eine neue Firmware zum installieren bereit liegt ("available" => neue Firmware verfügbar, "unavailable" => keine neue Firmware verfügbar; Event wird nur generiert für RX-Vx71, RX-Vx73, RX-Ax10 oder RX-Ax20)
  • power - Der aktuelle Betriebsstatus ("on" => an, "off" => aus)