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

YAMAHA_AVR: change values of reading "playStatus" values according to FHEM development guidelines AV (Forum: #60902)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14207 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2017-05-06 12:08:19 +00:00
parent 9cd58c1c2a
commit 25a79d0972
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- change: 71_YAMAHA_AVR: changing values of reading values conform
to FHEM AV guidelines ("stopped", "playing" or "paused")
- bugfix 73_km200.pm: Errorlist unsorted timestamp part 3 - bugfix 73_km200.pm: Errorlist unsorted timestamp part 3
- bugfix: 76_SMAInverter: version 2.9.1, issues for some inverter types - bugfix: 76_SMAInverter: version 2.9.1, issues for some inverter types
e.g. SunnyBoy systems e.g. SunnyBoy systems

11
FHEM/71_YAMAHA_AVR.pm
View File

@ -1643,7 +1643,7 @@ YAMAHA_AVR_ParseResponse($$$)
{ {
Log3 $name, 4, "YAMAHA_AVR ($name) - check for extended input informations on <$1>"; Log3 $name, 4, "YAMAHA_AVR ($name) - check for extended input informations on <$1>";
YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$1><Play_Info>GetParam</Play_Info></$1></YAMAHA_AV>", "statusRequest", "playInfo", {options => {can_fail => 1}}); YAMAHA_AVR_SendCommand($hash, "<YAMAHA_AV cmd=\"GET\"><$1><Play_Info>GetParam</Play_Info></$1></YAMAHA_AV>", "statusRequest", "playInfo", {options => {can_fail => 1, input_tag => $1}});
if(!exists($hash->{helper}{LAST_INPUT_TAG}) or ($hash->{helper}{LAST_INPUT_TAG} ne $hash->{helper}{CURRENT_INPUT_TAG}) or $hash->{helper}{SUPPORT_SHUFFLE_REPEAT}) if(!exists($hash->{helper}{LAST_INPUT_TAG}) or ($hash->{helper}{LAST_INPUT_TAG} ne $hash->{helper}{CURRENT_INPUT_TAG}) or $hash->{helper}{SUPPORT_SHUFFLE_REPEAT})
{ {
@ -1667,6 +1667,7 @@ YAMAHA_AVR_ParseResponse($$$)
readingsBulkUpdateIfChanged($hash, "currentStation", ""); readingsBulkUpdateIfChanged($hash, "currentStation", "");
readingsBulkUpdateIfChanged($hash, "currentStationFrequency",""); readingsBulkUpdateIfChanged($hash, "currentStationFrequency","");
readingsBulkUpdateIfChanged($hash, "currentArtist", ""); readingsBulkUpdateIfChanged($hash, "currentArtist", "");
readingsBulkUpdateIfChanged($hash, "playStatus", "stopped");
} }
} }
@ -1823,7 +1824,13 @@ YAMAHA_AVR_ParseResponse($$$)
if($data =~ /<Playback_Info>(.+?)<\/Playback_Info>/) if($data =~ /<Playback_Info>(.+?)<\/Playback_Info>/)
{ {
readingsBulkUpdate($hash, "playStatus", lc($1)); readingsBulkUpdate($hash, "playStatus", "stopped") if($1 eq "Stop");
readingsBulkUpdate($hash, "playStatus", "playing") if($1 eq "Play");
readingsBulkUpdate($hash, "playStatus", "paused") if($1 eq "Pause");
}
elsif($options->{input_tag} eq "Tuner")
{
readingsBulkUpdate($hash, "playStatus", "playing");
} }
if($data =~ /<Tuning>.*?<Freq><Current><Val>(\d+?)<\/Val><Exp>(\d+?)<\/Exp><Unit>(.*?)<\/Unit><\/Current>.*?<\/Tuning>/ or (YAMAHA_AVR_isModel_DSP($hash) and $data =~ /<Tuning>.*?<Freq><Val>(\d+?)<\/Val><Exp>(\d+?)<\/Exp><Unit>(.*?)<\/Unit><\/Freq>.*?<\/Tuning>/)) if($data =~ /<Tuning>.*?<Freq><Current><Val>(\d+?)<\/Val><Exp>(\d+?)<\/Exp><Unit>(.*?)<\/Unit><\/Current>.*?<\/Tuning>/ or (YAMAHA_AVR_isModel_DSP($hash) and $data =~ /<Tuning>.*?<Freq><Val>(\d+?)<\/Val><Exp>(\d+?)<\/Exp><Unit>(.*?)<\/Unit><\/Freq>.*?<\/Tuning>/))