mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-08 19:32:42 +00:00
YAMAHA_AVR: new set command presetUp and presetDown for preset selection in the current input (Forum: #51954)
git-svn-id: https://svn.fhem.de/fhem/trunk@11542 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch
parent
dafdc74009
commit
23610cf36c
@ -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 command presetUp and presetDown for preset
|
||||
selection in the current input
|
||||
- added: 52_I2C_GY30_BH1750FVI: modul i2c light intensity sensor
|
||||
- added: 52_I2C_HDC1008: modul for i2c humidity and temperature sensor
|
||||
- bugfix: FB_CALLLIST: fixing double space in certain call state values.
|
||||
|
||||
@ -301,7 +301,7 @@ YAMAHA_AVR_Set($@)
|
||||
((exists($hash->{ACTIVE_ZONE}) and $hash->{ACTIVE_ZONE} eq "mainzone") ? "straight:on,off 3dCinemaDsp:off,auto adaptiveDrc:off,auto ".
|
||||
(exists($hash->{helper}{DIRECT_TAG}) ? "direct:on,off " : "").
|
||||
(exists($hash->{helper}{DSP_MODES}) ? "dsp:".$dsp_modes_comma." " : "")."enhancer:on,off " : "").
|
||||
(exists($hash->{helper}{CURRENT_INPUT_TAG}) ? "navigateListMenu play:noArg pause:noArg stop:noArg skip:reverse,forward preset: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 ".
|
||||
(exists($hash->{helper}{CURRENT_INPUT_TAG}) ? "navigateListMenu play:noArg pause:noArg stop:noArg skip:reverse,forward preset: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 presetUp:noArg presetDown:noArg ".
|
||||
(($hash->{helper}{SUPPORT_SHUFFLE_REPEAT}) ? "shuffle:on,off repeat:off,one,all " : "") : "").
|
||||
"sleep:off,30min,60min,90min,120min,last ".
|
||||
(($hash->{helper}{SUPPORT_TONE_STATUS} and exists($hash->{ACTIVE_ZONE}) and $hash->{ACTIVE_ZONE} eq "mainzone") ? "bass:slider,-6,0.5,6 treble:slider,-6,0.5,6 " : "").
|
||||
@ -780,6 +780,16 @@ YAMAHA_AVR_Set($@)
|
||||
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$zone><Basic_Status>GetParam</Basic_Status></$zone></YAMAHA_AV>", "statusRequest", "basicStatus", {options => {no_playinfo => 1}});
|
||||
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><[CURRENT_INPUT_TAG]><Play_Control><Preset><Preset_Sel>".$a[2]."</Preset_Sel></Preset></Play_Control></[CURRENT_INPUT_TAG]></YAMAHA_AV>", $what, $a[2], {options => {can_fail => 1}});
|
||||
}
|
||||
elsif($what eq "presetUp")
|
||||
{
|
||||
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$zone><Basic_Status>GetParam</Basic_Status></$zone></YAMAHA_AV>", "statusRequest", "basicStatus", {options => {no_playinfo => 1}});
|
||||
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><[CURRENT_INPUT_TAG]><Play_Control><Preset><Preset_Sel>Up</Preset_Sel></Preset></Play_Control></[CURRENT_INPUT_TAG]></YAMAHA_AV>", $what, $a[2], {options => {can_fail => 1}});
|
||||
}
|
||||
elsif($what eq "presetDown")
|
||||
{
|
||||
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$zone><Basic_Status>GetParam</Basic_Status></$zone></YAMAHA_AV>", "statusRequest", "basicStatus", {options => {no_playinfo => 1}});
|
||||
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"PUT\"><[CURRENT_INPUT_TAG]><Play_Control><Preset><Preset_Sel>Down</Preset_Sel></Preset></Play_Control></[CURRENT_INPUT_TAG]></YAMAHA_AV>", $what, $a[2], {options => {can_fail => 1}});
|
||||
}
|
||||
elsif($what eq "skip" and defined($a[2]))
|
||||
{
|
||||
if($a[2] eq "forward")
|
||||
@ -923,6 +933,34 @@ YAMAHA_AVR_Undefine($$)
|
||||
#
|
||||
############################################################################################################
|
||||
|
||||
#
|
||||
# Structure of a request hash
|
||||
# ===========================
|
||||
#
|
||||
# {
|
||||
# data => XML data to send without <?xml> prefix
|
||||
# cmd => name of the command which is related to the request
|
||||
# arg => optional argument related to the command and request
|
||||
# original_hash => $hash of the originating definition. must be set, if a zone definition sends a request via the mainzones command queue.
|
||||
# options => optional values, see following list of possibilities.
|
||||
# }
|
||||
#
|
||||
# following option values can be used to control the execution of the command:
|
||||
#
|
||||
# {
|
||||
# unless_in_queue => don't insert the command if an equivalent command already exists in the queue. (flag: 0,1 - default: 0)
|
||||
# priority => integer value of priority. lower values will be executed before higher values in the appropriate order. (integer value - default value: 3)
|
||||
# at_first => insert the command at the beginning of the queue, not at the end. (flag: 0,1 - default: 0)
|
||||
# not_before => don't execute the command before the given Unix timestamp is reached (integer/float value)
|
||||
# can_fail => the request can return an error. If this flag is set, don't treat this as an communication error, ignore it instead. (flag: 0,1 - default: 0)
|
||||
# no_playinfo => (only relevant for "statusRequest basicStatus") - don't retrieve extended playback information, after receiving a successful response (flag: 0,1 - default: 0)
|
||||
# init => (only relevant for navigateListMenu) - marks the initial request to obtain the current menu level (flag: 0,1 - default: 0)
|
||||
# last_layer => (only relevant for navigateListMenu) - the menu layer that was reached within the last request (integer value)
|
||||
# item_selected => (only relevant for navigateListMenu) - is set, when the final item is going to be selected with the current request. (flag: 0,1 - default: 0)
|
||||
# volume_target => (only relevant for volume) - the target volume, that should be reached by smoothing. (float value)
|
||||
# volume_diff => (only relevant for volume) - the volume difference between each step to reach the target volume (float value)
|
||||
# }
|
||||
#
|
||||
|
||||
|
||||
#############################
|
||||
@ -1132,7 +1170,7 @@ sub YAMAHA_AVR_getNextRequestHash($)
|
||||
#############################
|
||||
# parses the receiver response
|
||||
sub
|
||||
YAMAHA_AVR_ParseResponse ($$$)
|
||||
YAMAHA_AVR_ParseResponse($$$)
|
||||
{
|
||||
my ( $param, $err, $data ) = @_;
|
||||
|
||||
@ -1673,7 +1711,7 @@ YAMAHA_AVR_ParseResponse ($$$)
|
||||
$menu_status = $1;
|
||||
}
|
||||
|
||||
my $last = ($param->{last_menu_item} or ($menu_layer == ($#list_cmds + 1)));
|
||||
my $last = ($options->{last_menu_item} or ($menu_layer == ($#list_cmds + 1)));
|
||||
|
||||
if($menu_status eq "Ready")
|
||||
{
|
||||
@ -1742,7 +1780,7 @@ YAMAHA_AVR_ParseResponse ($$$)
|
||||
{
|
||||
# list must be checked again in 1 second.
|
||||
Log3 $name, 5 ,"YAMAHA_AVR ($name) - menu is busy. retrying in 1 second";
|
||||
YAMAHA_AVR_SendCommand($hash,"<YAMAHA_AV cmd=\"GET\"><[CURRENT_INPUT_TAG]><List_Info>GetParam</List_Info></[CURRENT_INPUT_TAG]></YAMAHA_AV>", $cmd, $arg,{options => {not_before => (gettimeofday()+1), last_layer => $menu_layer, at_first => 1}});
|
||||
YAMAHA_AVR_SendCommand($hash,"<YAMAHA_AV cmd=\"GET\"><[CURRENT_INPUT_TAG]><List_Info>GetParam</List_Info></[CURRENT_INPUT_TAG]></YAMAHA_AV>", $cmd, $arg, {options => {not_before => (gettimeofday()+1), last_layer => $menu_layer, at_first => 1}});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2151,9 +2189,11 @@ YAMAHA_AVR_isModel_DSP($)
|
||||
<li><b>3dCinemaDsp</b> auto|off - controls the CINEMA DSP 3D mode</li>
|
||||
<li><b>adaptiveDrc</b> auto|off - controls the Adaptive DRC</li>
|
||||
<li><b>partyMode</b> on|off - controls the party mode. In Main Zone the whole party mode is enabled/disabled system wide. In each zone executed, it enables/disables the current zone from party mode.</li>
|
||||
<li><b>navigateListMenu</b> [item1]/[item2]/[itemN]/... - select a specific item within a menu structure. for menu-based inputs (e.g. Net Radio, USB, Server, ...) only. See chapter <a href="#YAMAHA_AVR_MenuNavigation">Automatic Menu Navigation</a> for further details and examples.</li>
|
||||
<li><b>navigateListMenu</b> [item1]/[item2]/.../[itemN] - select a specific item within a menu structure. for menu-based inputs (e.g. Net Radio, USB, Server, ...) only. See chapter <a href="#YAMAHA_AVR_MenuNavigation">Automatic Menu Navigation</a> for further details and examples.</li>
|
||||
<li><b>tunerFrequency</b> [frequency] [AM|FM] - sets the tuner frequency. The first argument is the frequency, second parameter is optional to set the tuner band (AM or FM, default: FM). Depending which tuner band you select, the frequency is given in kHz (AM band) or MHz (FM band). If the second parameter is not set, the FM band will be used. This command can be used even the current input is not "tuner", the new frequency is set and will be played, when the tuner gets active.</li>
|
||||
<li><b>preset</b> 1...40 - selects a saved preset of the currently selected input.</li>
|
||||
<li><b>presetUp</b> - selects the next preset of the currently selected input.</li>
|
||||
<li><b>presetDown</b> - selects the previous preset of the currently selected input.</li>
|
||||
<li><b>straight</b> on|off - bypasses the internal codec converter and plays the original sound codec</li>
|
||||
<li><b>direct</b> on|off - bypasses all internal sound enhancement features and plays the sound straight directly</li>
|
||||
<li><b>sleep</b> off,30min,60min,...,last - activates the internal sleep timer</li>
|
||||
@ -2200,7 +2240,7 @@ YAMAHA_AVR_isModel_DSP($)
|
||||
<u>Automatic Menu Navigation (only for menu based inputs like Net Radio, Server, USB, ...)</u><br><br>
|
||||
<ul>
|
||||
For menu based inputs you have to select a specific item out of a complex menu structure to start playing music.
|
||||
Mostly you want to start automatic playback for a specific internet radio (input: Net Radio) or similar, which you have to navigate through several menu and submenu items.
|
||||
Mostly you want to start automatic playback for a specific internet radio (input: Net Radio) or similar, where you have to navigate through several menu and submenu items.
|
||||
<br><br>
|
||||
To automate such a complex menu navigation, you can use the set command "navigateListMenu".
|
||||
As Parameter you give a menu path of the desired item you want to select.
|
||||
@ -2413,9 +2453,11 @@ So here are some examples:
|
||||
<li><b>3dCinemaDsp</b> auto,off - Aktiviert den CINEMA DSP 3D Modus</li>
|
||||
<li><b>adaptiveDrc</b> auto,off - Aktiviert Adaptive DRC</li>
|
||||
<li><b>partyMode</b> on|off - Aktiviert den Party Modus. In der Main Zone wird hierbei der Party Modus geräteweit aktiviert oder deaktiviert. In den anderen Zonen kann man damit die entsprechende Zone dem Party Modus zuschalten oder entziehen.</li>
|
||||
<li><b>navigateListMenu</b> [Element 1]/[Element 2]/[Element N]/... - Wählt ein spezifisches Element aus einer Menüstruktur aus. Nur verwendbar bei Menü-basierenden Eingängen (z.B. Net Radio, USB, Server, etc.). Siehe nachfolgendes Kapitel "<a href="#YAMAHA_AVR_MenuNavigation">Automatische Menü Navigation</a>" für weitere Details und Beispiele.</li>
|
||||
<li><b>navigateListMenu</b> [Element 1]/[Element 2]/.../[Element N] - Wählt ein spezifisches Element aus einer Menüstruktur aus. Nur verwendbar bei Menü-basierenden Eingängen (z.B. Net Radio, USB, Server, etc.). Siehe nachfolgendes Kapitel "<a href="#YAMAHA_AVR_MenuNavigation">Automatische Menü Navigation</a>" für weitere Details und Beispiele.</li>
|
||||
<li><b>tunerFrequency</b> [Frequenz] [AM|FM] - setzt die Radio-Frequenz. Das erste Argument ist die Frequenz, der zweite dient optional zu Angabe des Bandes (AM oder FM, standardmäßig FM). Abhängig davon, welches Band man benutzt, wird die Frequenz in kHz (AM-Band) oder MHz (FM-Band) angegeben. Wenn im zweiten Argument kein Band angegeben ist, wird standardmäßig das FM-Band benutzt. Dieser Befehl kann auch benutzt werden, wenn der aktuelle Eingang nicht "tuner" ist. Die neue Frequenz wird dennoch gesetzt und bei der nächsten Benutzung abgespielt.</li>
|
||||
<li><b>preset</b> 1...40 - wählt ein gespeichertes Preset für den aktuellen Eingang aus.</li>
|
||||
<li><b>presetUp</b> - wählt das nächste Preset für den aktuellen Eingang aus.</li>
|
||||
<li><b>presetDown</b> - wählt das vorherige Preset für den aktuellen Eingang aus.</li>
|
||||
<li><b>direct</b> on,off - Umgeht alle internen soundverbessernden Maßnahmen (Equalizer, Enhancer, Adaptive DRC,...) und gibt das Signal unverfälscht wieder</li>
|
||||
<li><b>input</b> hdmi1,hdmiX,... - Wählt den Eingangskanal (es werden nur die tatsächlich verfügbaren Eingänge angeboten)</li>
|
||||
<li><b>scene</b> scene1,sceneX - Wählt eine vorgefertigte Szene aus</li>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user