FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 08:03:40 +00:00
Code Issues Releases Wiki Activity

ONKYO_AVR: rewrite for IODev and separate module ONKYO_AVR_ZONE for zones

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11502 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-05-22 18:51:57 +00:00
parent d23a2031c3
commit d882b0dd0d
6 changed files with 3384 additions and 1150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/CHANGED
View File

@ -1,5 +1,9 @@
# 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.
- added: 71_ONKYO_AVR_ZONE: separate module for ONKYO_AVR zones;
any existing ONKYO_AVR devices used for zoning need to to
redefined manually by a ONKYO_AVR_ZONE device
- change: 70_ONKYO_AVR: rewrite based on IODev
- feature: configDB: new command 'configdb dump' added. - feature: configDB: new command 'configdb dump' added.
currently only supported for sqlite! currently only supported for sqlite!
- bugfix: FB_CALLLIST: fix not working calllist when renaming the - bugfix: FB_CALLLIST: fix not working calllist when renaming the

3103
fhem/FHEM/70_ONKYO_AVR.pm Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff

1303
fhem/FHEM/71_ONKYO_AVR_ZONE.pm Normal file
View File

File diff suppressed because it is too large Load Diff

119
fhem/FHEM/ONKYOdb.pm Executable file → Normal file
View File

@ -34,7 +34,7 @@ my $ONKYO_cmds_hr = {
'dock' => { 'dock' => {
'command-for-docking-station-via-ri' => 'CDS' 'command-for-docking-station-via-ri' => 'CDS'
}, },
'main' => { '1' => {
'12v-trigger-a' => 'TGA', '12v-trigger-a' => 'TGA',
'12v-trigger-b' => 'TGB', '12v-trigger-b' => 'TGB',
'12v-trigger-c' => 'TGC', '12v-trigger-c' => 'TGC',
@ -141,45 +141,42 @@ my $ONKYO_cmds_hr = {
'xm-channel-number' => 'XCH', 'xm-channel-number' => 'XCH',
'xm-title-info' => 'XTI' 'xm-title-info' => 'XTI'
}, },
'zone2' => { '2' => {
'balance' => 'ZBL', 'balance' => 'ZBL',
'internet-radio-preset' => 'NPZ', 'internet-radio-preset' => 'NPZ',
'late-night' => 'LTZ', 'late-night' => 'LTZ',
'listening-mode' => 'LMZ', 'listening-mode' => 'LMZ',
'mute' => 'ZMT', 'mute' => 'ZMT',
'net-receiver-information' => 'NRI', 'net-usb-z' => 'NTZ',
'net-tune-network' => 'NTZ', 'power' => 'ZPW',
'power' => 'ZPW', 'preset' => 'PRZ',
'preset' => 'PRZ', 're-eq-academy-filter' => 'RAZ',
're-eq-academy-filter' => 'RAZ', 'input' => 'SLZ',
'input' => 'SLZ', 'tone' => 'ZTN',
'tone' => 'ZTN', 'tuning' => 'TUZ',
'tuning' => 'TUZ', 'volume' => 'ZVL'
'volume' => 'ZVL'
}, },
'zone3' => { '3' => {
'balance' => 'BL3', 'balance' => 'BL3',
'internet-radio-preset' => 'NP3', 'internet-radio-preset' => 'NP3',
'mute' => 'MT3', 'mute' => 'MT3',
'net-receiver-information' => 'NRI', 'net-usb-z' => 'NT3',
'net-tune-network' => 'NT3', 'power' => 'PW3',
'power' => 'PW3', 'preset' => 'PR3',
'preset' => 'PR3', 'input' => 'SL3',
'input' => 'SL3', 'tone' => 'TN3',
'tone' => 'TN3', 'tuning' => 'TU3',
'tuning' => 'TU3', 'volume' => 'VL3'
'volume' => 'VL3'
}, },
'zone4' => { '4' => {
'internet-radio-preset' => 'NP4', 'internet-radio-preset' => 'NP4',
'mute' => 'MT4', 'mute' => 'MT4',
'net-receiver-information' => 'NRI', 'net-usb-z' => 'NT4',
'net-tune-network' => 'NT4', 'power' => 'PW4',
'power' => 'PW4', 'preset' => 'PR4',
'preset' => 'PR4', 'input' => 'SL4',
'input' => 'SL4', 'tuning' => 'TU4',
'tuning' => 'TU4', 'volume' => 'VL4'
'volume' => 'VL4'
} }
}; };
@ -210,7 +207,7 @@ my $ONKYO_values_hr = {
'up' => 'UP' 'up' => 'UP'
} }
}, },
'main' => { '1' => {
'ADQ' => { 'ADQ' => {
'off' => '00', 'off' => '00',
'on' => '01', 'on' => '01',
@ -719,10 +716,10 @@ my $ONKYO_values_hr = {
}, },
'NJA' => { 'NJA' => {
'tp-xx-xx-xx-xx-xx-xx' => 'tp{xx}{xx}{xx}{xx}{xx}{xx}', 'tp-xx-xx-xx-xx-xx-xx' => 'tp{xx}{xx}{xx}{xx}{xx}{xx}',
'off' => 'DIS', 'off' => 'DIS',
'on' => 'ENA', 'on' => 'ENA',
'up' => 'UP', 'up' => 'UP',
'query' => 'QSTN', 'query' => 'QSTN',
}, },
'NKY' => { 'NKY' => {
'll' => 'll' 'll' => 'll'
@ -1203,7 +1200,7 @@ my $ONKYO_values_hr = {
'query' => 'QSTN' 'query' => 'QSTN'
} }
}, },
'zone2' => { '2' => {
'LMZ' => { 'LMZ' => {
'direct' => '01', 'direct' => '01',
'dvs' => '88', 'dvs' => '88',
@ -1373,7 +1370,7 @@ my $ONKYO_values_hr = {
'xrange(80)' => '(0, 80)' 'xrange(80)' => '(0, 80)'
} }
}, },
'zone3' => { '3' => {
'BL3' => { 'BL3' => {
'down' => 'DOWN', 'down' => 'DOWN',
'query' => 'QSTN', 'query' => 'QSTN',
@ -1521,7 +1518,7 @@ my $ONKYO_values_hr = {
'xrange(80)' => '(0, 80)' 'xrange(80)' => '(0, 80)'
} }
}, },
'zone4' => { '4' => {
'MT4' => { 'MT4' => {
'off' => '00', 'off' => '00',
'on' => '01', 'on' => '01',
@ -1656,7 +1653,7 @@ my $ONKYO_values_hr = {
# ----------------Complete command reference database----------------------- # ----------------Complete command reference database-----------------------
my $ONKYO_cmddb = { my $ONKYO_cmddb = {
'main' => { '1' => {
'PWR', 'PWR',
{ {
'description' => 'System Power Command', 'description' => 'System Power Command',
@ -4554,25 +4551,25 @@ ii-> Service icon
'DIS', 'DIS',
{ {
'description' => 'sets Jacket Art disable', 'description' => 'sets Jacket Art disable',
'name' => 'off' 'name' => 'off'
}, },
'ENA', 'ENA',
{ {
'description' => 'sets Jacket Art enable', 'description' => 'sets Jacket Art enable',
'name' => 'on' 'name' => 'on'
}, },
'UP', 'UP',
{ {
'description' => 'sets Jacket Art Wrap-Around up', 'description' => 'sets Jacket Art Wrap-Around up',
'name' => 'up' 'name' => 'up'
}, },
'QSTN', 'QSTN',
{ {
'description' => 'gets Jacket Art enable/disable', 'description' => 'gets Jacket Art enable/disable',
'name' => 'query' 'name' => 'query'
} }
} }
}, },
@ -5754,7 +5751,7 @@ ii-> Service icon
'name' => 'net-receiver-information', 'name' => 'net-receiver-information',
} }
}, },
'zone2' => { '2' => {
'ZPW', 'ZPW',
{ {
'description' => 'Zone2 Power Command', 'description' => 'Zone2 Power Command',
@ -6253,7 +6250,7 @@ ii-> Service icon
{ {
'description' => 'description' =>
'Net-Tune/Network Operation Command{Net-Tune Model Only}', 'Net-Tune/Network Operation Command{Net-Tune Model Only}',
'name' => 'net-tune-network', 'name' => 'net-usb',
'values' => { 'values' => {
'PLAYz', 'PLAYz',
{ {
@ -6283,7 +6280,7 @@ ii-> Service icon
{ {
'description' => 'description' =>
'Net-Tune/Network Operation Command{Network Model Only}', 'Net-Tune/Network Operation Command{Network Model Only}',
'name' => 'net-tune-network', 'name' => 'net-usb',
'values' => { 'values' => {
'PLAY', 'PLAY',
{ {
@ -6484,7 +6481,7 @@ ii-> Service icon
} }
} }
}, },
'zone3' => { '3' => {
'PW3', 'PW3',
{ {
'description' => 'Zone3 Power Command', 'description' => 'Zone3 Power Command',
@ -6978,7 +6975,7 @@ ii-> Service icon
{ {
'description' => 'description' =>
'Net-Tune/Network Operation Command{Net-Tune Model Only}', 'Net-Tune/Network Operation Command{Net-Tune Model Only}',
'name' => 'net-tune-network', 'name' => 'net-usb',
'values' => { 'values' => {
'PLAYz', 'PLAYz',
{ {
@ -7008,7 +7005,7 @@ ii-> Service icon
{ {
'description' => 'description' =>
'Net-Tune/Network Operation Command{Network Model Only}', 'Net-Tune/Network Operation Command{Network Model Only}',
'name' => 'net-tune-network', 'name' => 'net-usb',
'values' => { 'values' => {
'PLAY', 'PLAY',
{ {
@ -7111,7 +7108,7 @@ ii-> Service icon
} }
} }
}, },
'zone4' => { '4' => {
'PW4', 'PW4',
{ {
'description' => 'Zone4 Power Command', 'description' => 'Zone4 Power Command',
@ -7534,7 +7531,7 @@ ii-> Service icon
{ {
'description' => 'description' =>
'Net-Tune/Network Operation Command{Net-Tune Model Only}', 'Net-Tune/Network Operation Command{Net-Tune Model Only}',
'name' => 'net-tune-network', 'name' => 'net-usb',
'values' => { 'values' => {
'PLAYz', 'PLAYz',
{ {
@ -7564,7 +7561,7 @@ ii-> Service icon
{ {
'description' => 'description' =>
'Net-Tune/Network Operation Command{Network Model Only}', 'Net-Tune/Network Operation Command{Network Model Only}',
'name' => 'net-tune-network', 'name' => 'net-usb',
'values' => { 'values' => {
'PLAY', 'PLAY',
{ {

4
fhem/HISTORY
View File

@ -672,3 +672,7 @@
- Mon Mar 30 2016 (yoda_gh) - Mon Mar 30 2016 (yoda_gh)
- added new module 52_I2C_K30 supporting the SenseAir K-30 CO2 sensor - added new module 52_I2C_K30 supporting the SenseAir K-30 CO2 sensor
- Sun May 22 2016 (loredo)
- rewrite of ONKYO_AVR module based on IODev for real-time updates
- separate ONKYO_AVR_ZONE module to support separate zone devices for ONKYO_AVR; users will need to manually delete old ONKYO_AVR definitions who where just used for a specific zone and have them re-created based on ONKYO_AVR_ZONE

1
fhem/MAINTAINER.txt
View File

@ -256,6 +256,7 @@ FHEM/70_Pushbullet.pm fhainz http://forum.fhem.de Unterstue
FHEM/70_Pushover.pm Johannes_B http://forum.fhem.de Unterstuetzende Dienste FHEM/70_Pushover.pm Johannes_B http://forum.fhem.de Unterstuetzende Dienste
FHEM/70_PushNotifier.pm xusader http://forum.fhem.de Unterstuetzende Dienste FHEM/70_PushNotifier.pm xusader http://forum.fhem.de Unterstuetzende Dienste
FHEM/70_Pushalot.pm Talkabout http://forum.fhem.de Unterstuetzende Dienste FHEM/70_Pushalot.pm Talkabout http://forum.fhem.de Unterstuetzende Dienste
FHEM/71_ONKYO_AVR_ZONE.pm loredo http://forum.fhem.de Multimedia
FHEM/71_PHILIPS_AUDIO.pm ra666ack http://forum.fhem.de Multimedia FHEM/71_PHILIPS_AUDIO.pm ra666ack http://forum.fhem.de Multimedia
FHEM/71_YAMAHA_AVR.pm markusbloch http://forum.fhem.de Multimedia FHEM/71_YAMAHA_AVR.pm markusbloch http://forum.fhem.de Multimedia
FHEM/71_YAMAHA_BD.pm markusbloch http://forum.fhem.de Multimedia FHEM/71_YAMAHA_BD.pm markusbloch http://forum.fhem.de Multimedia