mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-28 11:01:59 +00:00
71_YAMAHA_NP: New command set and readings for manu navigation
git-svn-id: https://svn.fhem.de/fhem/trunk@7864 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ra666ack
parent
2f5be0d4fb
commit
12223783dc
@ -1,5 +1,6 @@
|
||||
# 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: 71_YAMAHA_NP: New command set and readings for menu navigation
|
||||
- feature: 71_YAMAHA_NP: New command 'dimmer [1..3]'
|
||||
- bugfix: 31_MilightDevice: if we're already off don't turn on to set dim level!
|
||||
- added: new dustbin icon
|
||||
|
||||
@ -41,6 +41,7 @@ use Time::HiRes qw(gettimeofday sleep);
|
||||
use Time::Piece;
|
||||
use POSIX qw{strftime};
|
||||
use HttpUtils;
|
||||
use List::Util qw(first);
|
||||
|
||||
###################################
|
||||
sub YAMAHA_NP_Initialize
|
||||
@ -130,7 +131,6 @@ sub YAMAHA_NP_Get
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
###################################
|
||||
sub YAMAHA_NP_Set
|
||||
{
|
||||
@ -198,6 +198,12 @@ sub YAMAHA_NP_Set
|
||||
"player:play,stop,pause,next,prev,shuffleToggle,repeatToggle ".
|
||||
"clockUpdate:noArg ".
|
||||
"dimmer:1,2,3 ".
|
||||
"playerListGetList:noArg ".
|
||||
"playerListJumpLine ".
|
||||
"playerListSelectLine ".
|
||||
"playerListCursorReturn:noArg ".
|
||||
"playerListCursorDown:noArg ".
|
||||
"playerListCursorUp:noArg ".
|
||||
"tunerPresetDAB:1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 ".
|
||||
"tunerPresetFM:1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 ".
|
||||
"timerHour:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 ".
|
||||
@ -226,6 +232,12 @@ sub YAMAHA_NP_Set
|
||||
"player:play,stop,pause,next,prev,shuffleToggle,repeatToggle ".
|
||||
"clockUpdate:noArg ".
|
||||
"dimmer:1,2,3 ".
|
||||
"playerListGetList:noArg ".
|
||||
"playerListJumpLine ".
|
||||
"playerListSelectLine ".
|
||||
"playerListCursorReturn:noArg ".
|
||||
"playerListCursorDown:noArg ".
|
||||
"playerListCursorUp:noArg ".
|
||||
"tunerPresetFM:1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 ".
|
||||
"timerHour:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 ".
|
||||
"timerMinute:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59 ";
|
||||
@ -454,6 +466,58 @@ sub YAMAHA_NP_Set
|
||||
return $usage;
|
||||
}
|
||||
}
|
||||
elsif($what eq "playerListGetList")
|
||||
{
|
||||
YAMAHA_NP_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><Player><List_Info>GetParam</List_Info></Player></YAMAHA_AV>", $what, "playerGetList");
|
||||
}
|
||||
elsif($what eq "playerListCursorReturn")
|
||||
{
|
||||
YAMAHA_NP_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><Player><List_Control><Cursor>Return</Cursor></List_Control></Player></YAMAHA_AV>", $what, "playerListCursorReturn");
|
||||
}
|
||||
elsif($what eq "playerListCursorDown")
|
||||
{
|
||||
YAMAHA_NP_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><Player><List_Control><Cursor>Down</Cursor></List_Control></Player></YAMAHA_AV>", $what, "playerListCursorDown");
|
||||
}
|
||||
elsif($what eq "playerListCursorUp")
|
||||
{
|
||||
YAMAHA_NP_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><Player><List_Control><Cursor>Up</Cursor></List_Control></Player></YAMAHA_AV>", $what, "playerListCursorUp");
|
||||
}
|
||||
elsif($what eq "playerListJumpLine")
|
||||
{
|
||||
if($a[2] ne "")
|
||||
{
|
||||
if($a[2] =~ /^\d+$/ and $a[2] >= 1)
|
||||
{
|
||||
YAMAHA_NP_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><Player><List_Control><Jump_Line>".$a[2]."</Jump_Line></List_Control></Player></YAMAHA_AV>", $what, $a[2]);
|
||||
}
|
||||
else
|
||||
{
|
||||
return "Argument must be numeric and >= 1.";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return "No argument given.";
|
||||
}
|
||||
}
|
||||
elsif($what eq "playerListSelectLine")
|
||||
{
|
||||
if($a[2] ne "")
|
||||
{
|
||||
if($a[2] =~ /^\d+$/ and $a[2] >= 1)
|
||||
{
|
||||
YAMAHA_NP_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><Player><List_Control><Direct_Sel>Line_".$a[2]."</Direct_Sel></List_Control></Player></YAMAHA_AV>", $what, $a[2]);
|
||||
}
|
||||
else
|
||||
{
|
||||
return "Argument must be numeric and >= 1.";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return "No argument given.";
|
||||
}
|
||||
}
|
||||
elsif($what eq "standbyMode")
|
||||
{
|
||||
if($a[2] eq "eco")
|
||||
@ -744,7 +808,7 @@ sub YAMAHA_NP_Undefine
|
||||
# sends a command to the receiver via HTTP
|
||||
sub YAMAHA_NP_SendCommand
|
||||
{
|
||||
my ($hash, $data,$cmd,$arg,$blocking) = @_;
|
||||
my ($hash,$data,$cmd,$arg,$blocking) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
my $address = $hash->{helper}{ADDRESS};
|
||||
|
||||
@ -1181,6 +1245,48 @@ sub YAMAHA_NP_ParseResponse
|
||||
}
|
||||
}
|
||||
}
|
||||
elsif($cmd eq "playerListGetList")
|
||||
{
|
||||
# Delete old List listLines
|
||||
my $i = 1;
|
||||
|
||||
while(exists($hash->{READINGS}{"playerListLine_$i"}))
|
||||
{
|
||||
delete($hash->{READINGS}{"playerListLine_$i"});
|
||||
delete($hash->{READINGS}{"playerListLine_Attribute_$i"});
|
||||
$i++;
|
||||
}
|
||||
|
||||
if($data =~ /<Menu_Status>(.*)<\/Menu_Status>/)
|
||||
{
|
||||
readingsBulkUpdate($hash, "playerListMenuStatus", $1);
|
||||
}
|
||||
if($data =~ /<Menu_Name>(.*)<\/Menu_Name>/)
|
||||
{
|
||||
readingsBulkUpdate($hash, "playerListMenuName", $1);
|
||||
}
|
||||
if($data =~ /<Menu_Layer>(.*)<\/Menu_Layer>/)
|
||||
{
|
||||
readingsBulkUpdate($hash, "playerListMenuLayer", $1);
|
||||
}
|
||||
if($data =~ /<Current_List>(.*)<\/Current_List>/)
|
||||
{
|
||||
# <Line_X><Txt>****</Txt><Attribute>Container|Item|Unselectable</Attribute></Line_X>
|
||||
|
||||
$i = 1;
|
||||
while($data =~ /<Line_$i><Txt>(.*?)<\/Txt><Attribute>(.*?)<\/Attribute><\/Line_$i>/gc)
|
||||
{
|
||||
readingsBulkUpdate($hash, "playerListLine_$i", $1);
|
||||
readingsBulkUpdate($hash, "playerListLine_Attribute_$i", $2);
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
if($data =~ /<Cursor_Position><Current_Line>(.*)<\/Current_Line><Max_Line>(.*)<\/Max_Line><\/Cursor_Position>/)
|
||||
{
|
||||
readingsBulkUpdate($hash, "playerListCurrentLine", $1);
|
||||
readingsBulkUpdate($hash, "playerListMaxLine", $2);
|
||||
}
|
||||
}
|
||||
elsif($cmd eq "on")
|
||||
{
|
||||
if($data =~ /RC="0"/ and $data =~ /<Power><\/Power>/)
|
||||
@ -1224,6 +1330,15 @@ sub YAMAHA_NP_ParseResponse
|
||||
readingsBulkUpdate($hash, "standbyMode", lc($arg));
|
||||
}
|
||||
}
|
||||
#elsif($cmd eq "netRadioSelectBookmark")
|
||||
#{
|
||||
# if($data =~ /RC="0"/)
|
||||
# {
|
||||
# Log3 $name, 5, "ParseListInfo\n";
|
||||
# YAMAHA_NP_Parse_List_Info($hash, $data);
|
||||
#
|
||||
# }
|
||||
#}
|
||||
elsif($cmd eq "volume" or $cmd eq "volumeStraight" or $cmd eq "volumeUp" or $cmd eq "volumeDown")
|
||||
{
|
||||
if($data =~ /RC="0"/)
|
||||
@ -1438,6 +1553,7 @@ sub YAMAHA_NP_html2txt
|
||||
<li>Tuner: tune +/-, preset +/-, Station information (FM/DAB)</li>
|
||||
<li>Stand-by mode: eco/normal</li>
|
||||
<li>Player (play, stop, next, prev, shuffle, repeat)</li>
|
||||
<li>Menu navigation</li>
|
||||
<li>...</li>
|
||||
</ul>
|
||||
<br>
|
||||
@ -1496,6 +1612,12 @@ sub YAMAHA_NP_html2txt
|
||||
<li><b>shuffleToggle</b> - Toggles the shuffle mode.</li>
|
||||
<li><b>repeatToggle</b> - Toggles the repeat modes.</li>
|
||||
</ul>
|
||||
<li><b>playerListCursorDown</b> - Command for list navigation in inputs such as Net Radio or Server. Command moves the cursor down. Next line displayed.</li>
|
||||
<li><b>playerListCursorReturn</b> - Command for list navigation in inputs such as Net Radio or Server. Command returns from a hierarchical sub-menu. Higher level menu displayed.</li>
|
||||
<li><b>playerListCursorUp</b> - Command for list navigation in inputs such as Net Radio or Server. Command moves the cursor up. Previous line displayed.</li>
|
||||
<li><b>playerListGetList</b> - Command for list navigation in inputs such as Net Radio or Server. Command returns readings relevant for list/menu navigation.</li>
|
||||
<li><b>playerListJumpLine [value]</b> - Command for list navigation in inputs such as Net Radio or Server. Command jumps to a given line.</li>
|
||||
<li><b>playerListSelectLine [value]</b> - Command for list navigation in inputs such as Net Radio or Server. Command selects the given line. In case the line is a 'Container' (folder) it's entered. In case of 'Item' the playback starts.</li>
|
||||
<li><b>sleep</b> [off|30min|60min|90min|120min] - activates the internal sleep timer</li>
|
||||
<li><b>standbyMode</b> [eco|normal] - set the standby mode.</li>
|
||||
<li><b>statusRequest [<parameter>] </b> - requests the current status of the device</li>
|
||||
@ -1615,6 +1737,13 @@ sub YAMAHA_NP_html2txt
|
||||
<li><b>playerAlbumArtURL</b> - Reports the album art url (if available) of the currently played audio. The URL points to the network player.</li>
|
||||
<li><b>playerAlbumArtID</b> - Reports the album art ID (if available) of the currently played audio.</li>
|
||||
<li><b>playerAlbumArtFormat</b> - Reports the album art format (if available) of the currently played audio.</li>
|
||||
<br><br><u>Player List (Menu) related readings:</u><br><br>
|
||||
<li><b>playerListCurrentLine</b> - Reports the current active list line as displayd.</li>
|
||||
<li><b>playerListLine_1..._8</b> - Reports the content of the Line 1...8 as provided by the device.</li>
|
||||
<li><b>playerListLine_Attribute_1..._8</b> - Reports the attribute of the Line 1...8 (Container|Item|Unselectable).</li>
|
||||
<li><b>playerListMaxLine</b> - Reports the number of lines in current list/menu.</li>
|
||||
<li><b>playerListMenuName</b> - Reports the name of the current list/menu.</li>
|
||||
<li><b>playerListStatus</b> - Reports the status of the current list/menu (Busy|Ready).</li>
|
||||
<br><br><u>Tuner related readings:</u><br><br>
|
||||
<li><b>tunerAudioModeDAB</b> - Reports current audio mode (Mono|Stereo).</li>
|
||||
<li><b>tunerBand</b> - Reports the currently selected tuner band (FM|DAB). DAB if available.</li>
|
||||
@ -1673,6 +1802,7 @@ sub YAMAHA_NP_html2txt
|
||||
<li>Tuner: tune +/-, preset +/-, Senderinformation (FM/DAB)</li>
|
||||
<li>Stand-by mode: eco/normal</li>
|
||||
<li>Player (play, stop, next, prev, shuffle, repeat)</li>
|
||||
<li>Menünavigation</li>
|
||||
<li>...</li>
|
||||
</ul>
|
||||
<br>
|
||||
@ -1680,7 +1810,7 @@ sub YAMAHA_NP_html2txt
|
||||
Das Intervall (in Sekunden) kann für die Zustände <on_status_interval> und <off_status_interval> optional gesetzt werden.<br>
|
||||
<off_status_interval> steht für das Intervall, wenn das Gerät ausgeschaltet/abwesend ist.<br>
|
||||
<on_status_interval> steht für das Intervall, wenn das Gerät eingeschaltet/verfügbar ist.<br>
|
||||
Wenn keine Parametere angegeben wurden, wird ein Default-Wert von 30 Sekunden für beide gesetzt.<br>
|
||||
Wenn keine Parametere angegeben wurden, wird ein Default-Wert von 30 Sekunden für beide gesetzt.<br>
|
||||
Wenn nur <off_status_interval> gesetzt wird, gilt dieser Wert für beide Zustände (eingeschaltet/ausgeschaltet).<br>
|
||||
Der Task liest zyklisch grundlegende Parameter vom Network Player wie z.B. (Power-Status , gewählter Eingang, Lautstärke etc.) und triggert notify/filelog Befehle.<br><br>
|
||||
Beispiel:<br><br>
|
||||
@ -1727,6 +1857,12 @@ sub YAMAHA_NP_html2txt
|
||||
<li><b>shuffleToggle</b> - Umschaltung des Zufallswiedergabe.</li>
|
||||
<li><b>repeatToggle</b> - Umschaltung des Wiederholungsmodes.</li>
|
||||
</ul>
|
||||
<li><b>playerListCursorDown</b> - Befehl zur Navigation in Eingängen wie Net Radio oder Server. Befehl bewegt den Cursor nach unten. Nächste Zeile wird im Gerät angezeit.</li>
|
||||
<li><b>playerListCursorReturn</b> - Befehl zur Navigation in Eingängen wie Net Radio oder Server. Befehl kehrt zurück vom hierarchischen, untergeordneten Menü. Übergeordnetes Menü wird angezeigt.</li>
|
||||
<li><b>playerListCursorUp</b> - Befehl zur Navigation in Eingängen wie Net Radio oder Server. Befehl bewegt den Cursor nach oben. Vorherige Zeile wird im Gerät angezeit.</li>
|
||||
<li><b>playerListGetList</b> - Befehl zur Navigation in Eingängen wie Net Radio oder Server. Befehl liefert Informationen (Readings) relevant zur Menünavigation.</li>
|
||||
<li><b>playerListJumpLine [value]</b> - Befehl zur Navigation in Eingängen wie Net Radio oder Server. Befehl spring zur angegebenen Zeile.</li>
|
||||
<li><b>playerListSelectLine [value]</b> - Befehl zur Navigation in Eingängen wie Net Radio oder Server. Befehl aktiviert die angegebenen Zeile. Falls die Zeile das Attribut 'Container' (Ordner) besitzt, wird dieser geöffnet. Falls 'Item' wird die Wiedergabe gestartet.</li>
|
||||
<li><b>sleep</b> [off|30min|60min|90min|120min] - Aktiviert/Deaktiviert den internen Sleep-Timer</li>
|
||||
<li><b>standbyMode</b> [eco|normal] - Umschaltung des Standby Modus.</li>
|
||||
<li><b>statusRequest [<parameter>] </b> - Abfrage des aktuellen Status des Network Players.</li>
|
||||
@ -1744,7 +1880,7 @@ sub YAMAHA_NP_html2txt
|
||||
<li><b>timerRepeat</b> [once|every] - Setzt den Wiederholungsmodus des internen Wake-up Timers</li>
|
||||
<li><b>timerSet</b> - konfiguriert den Timer nach den Vorgaben: timerHour, timerMinute, timerRepeat, timerVolume. (ALLE Paremeter müssen zuvor gesetzt werden. Dieser Befehl schaltet den Timer nicht ein → 'timer on'.)</li>
|
||||
<li><b>timerVolume</b> [<VOL_MIN>...<VOL_MAX>] - Setzt die Lautstärke des internen Wake-up Timers</li>
|
||||
<li><b>timer</b> [on|off] - Schaltet ein/aus den internen Wake-up Timer. <i>(Bemerkung: Der Timer wird basierend auf den im Gerät gespeicherten Parametern aktiviert. Um diese zu ändern, bitte den 'timerSet' Befehl benutzen.)</i></li>
|
||||
<li><b>timer</b> [on|off] - Schaltet ein/aus den internen Wake-up Timer. <i>(Bemerkung: Der Timer wird basierend auf den im Gerät gespeicherten Parametern aktiviert. Um diese zu ändern, bitte den 'timerSet' Befehl benutzen.)</i></li>
|
||||
<li><b>tuner [<parameter>] </b> - Tuner-relevante Befehle.</li>
|
||||
<ul>
|
||||
<li><b>bandDAB</b> - Setzt das Tuner-Band auf DAB (falls verfügbar).</li>
|
||||
@ -1843,6 +1979,13 @@ sub YAMAHA_NP_html2txt
|
||||
<li><b>playerAlbumArtURL</b> - Abfrage der Album URL (falls verfügbar) der aktuellen Wiedergabe.</li>
|
||||
<li><b>playerAlbumArtID</b> - Abfrage der AlbumArtID (falls verfügbar) der aktuellen Wiedergabe.</li>
|
||||
<li><b>playerAlbumArtFormat</b> - Abfrage des AlbumArt Formats (falls verfügbar) der aktuellen Wiedergabe.</li>
|
||||
<br><br><u>Player List (Menu) Readings:</u><br><br>
|
||||
<li><b>playerListCurrentLine</b> - Abfrage der aktuellen Listenzeile (wie im Gerät angezeigt).</li>
|
||||
<li><b>playerListLine_1..._8</b> - Abfrage des Listeninhalts Zeile 1...8 (Das Gerät liefert 8 Zeilen Pakete).</li>
|
||||
<li><b>playerListLine_Attribute_1..._8</b> - Abfrage der Listenzeilenattribute Zeile 1...8 (Container|Item|Unselectable).</li>
|
||||
<li><b>playerListMaxLine</b> - Abfrage der Anzahl von Listenzeilen in der aktuellen Liste/Menu.</li>
|
||||
<li><b>playerListMenuName</b> - Abfrage der bezeichnung der aktuellen Liste/Menus.</li>
|
||||
<li><b>playerListStatus</b> - Abfrage des aktuellen Status der Liste/Menus (Busy|Ready).</li>
|
||||
<br><br><u>Tuner Readings:</u><br><br>
|
||||
<li><b>tunerAudioModeDAB</b> - Abfrage des aktuellen DAB Audio-Modus (Mono|Stereo)..</li>
|
||||
<li><b>tunerBand</b> - Abfrage des aktuellen Radio-Bandes (FM|DAB). DAB falls verfügbar.</li>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user