Added support for Denon AVR-4810.

ol-iver · Oct 15, 2017 · 31f2939 · 31f2939
1 parent 3c29b89
commit 31f2939
Show file tree

Hide file tree

Showing 15 changed files with 425 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # denonavr
 [![Build Status](https://travis-ci.org/scarface-4711/denonavr.svg?branch=master)](https://travis-ci.org/scarface-4711/denonavr)
 
-Automation Library for Denon AVR receivers - current version 0.5.3
+Automation Library for Denon AVR receivers - current version 0.5.4
 
 ## Installation
 

diff --git a/README.rst b/README.rst
@@ -3,7 +3,7 @@ denonavr
 
 |Build Status|
 
-Automation Library for Denon AVR receivers - current version 0.5.3
+Automation Library for Denon AVR receivers - current version 0.5.4
 
 Installation
 ------------

diff --git a/denonavr/__init__.py b/denonavr/__init__.py
@@ -18,7 +18,7 @@
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 __title__ = "denonavr"
-__version__ = "0.5.3"
+__version__ = "0.5.4"
 
 
 def discover():

diff --git a/denonavr/denonavr.py b/denonavr/denonavr.py
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages, setup
 
 setup(name='denonavr',
-      version='0.5.3',
+      version='0.5.4',
       description='Automation Library for Denon AVR receivers',
       long_description='Automation Library for Denon AVR receivers',
       url='https://github.com/scarface-4711/denonavr',

diff --git a/tests/test_denonavr.py b/tests/test_denonavr.py
@@ -24,7 +24,7 @@
                      "M-RC610": NO_ZONES, "AVR-X2100W-2": NO_ZONES,
                      "AVR-X2000": ZONE2_ZONE3, "AVR-X2000-2": NO_ZONES,
                      "SR5008": NO_ZONES, "M-CR603": NO_ZONES,
-                     "NR1604": ZONE2_ZONE3}
+                     "NR1604": ZONE2_ZONE3, "AVR-4810": NO_ZONES}
 
 APPCOMMAND_URL = "/goform/AppCommand.xml"
 STATUS_URL = "/goform/formMainZone_MainZoneXmlStatus.xml"

diff --git a/tests/xml/AVR-4810-AppCommand.xml b/tests/xml/AVR-4810-AppCommand.xml
@@ -0,0 +1,4 @@
+<html><head><title>Document Error: Data follows</title></head>
+		<body><h2>Access Error: Data follows</h2>
+		<p>Form AppCommand.xml is not defined</p></body></html>
+
diff --git a/tests/xml/AVR-4810-Deviceinfo.xml b/tests/xml/AVR-4810-Deviceinfo.xml
@@ -0,0 +1,4 @@
+<html><head><title>Document Error: Data follows</title></head>
+		<body><h2>Access Error: Data follows</h2>
+		<p>Form Deviceinfo.xml is not defined</p></body></html>
+
diff --git a/tests/xml/AVR-4810-formMainZone_MainZoneXml.xml b/tests/xml/AVR-4810-formMainZone_MainZoneXml.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<item>
+<Power><value>ON</value></Power>
+<ZonePower><value>ON</value></ZonePower>
+<InputFuncList>
+<value>SOURCE</value>
+<value>TUNER</value>
+<value>PHONO</value>
+<value>CD</value>
+<value>DVD</value>
+<value>HDP</value>
+<value>TV</value>
+<value>SAT/CBL</value>
+<value>VCR</value>
+<value>DVR</value>
+<value>V.AUX</value>
+<value>NET/USB</value>
+<value>XM</value>
+<value>SIRIUS</value>
+<value>HDRADIO</value>
+</InputFuncList>
+<RenameSource>
+<value></value>
+<value>TUNER   </value>
+<value>PHONO   </value>
+<value>CD      </value>
+<value>PhonoPre</value>
+<value>HDP     </value>
+<value>TV      </value>
+<value>WeTek   </value>
+<value>XBox One</value>
+<value>AirPlay </value>
+<value>V.AUX   </value>
+<value>NET/USB </value>
+<value></value>
+<value></value>
+<value></value>
+</RenameSource>
+<RenameZone><value>MAIN ZONE </value></RenameZone>
+<SourceDelete>
+<value></value>
+<value>DEL</value>
+<value>DEL</value>
+<value>USE</value>
+<value>USE</value>
+<value>USE</value>
+<value>USE</value>
+<value>USE</value>
+<value>USE</value>
+<value>USE</value>
+<value>USE</value>
+<value>USE</value>
+<value></value>
+<value></value>
+<value></value>
+</SourceDelete>
+<TopMenuLink><value>ON</value></TopMenuLink>
+<ModelId><value>3</value></ModelId>
+<SalesArea><value>1</value></SalesArea>
+<InputFuncSelect><value>DVD</value></InputFuncSelect>
+<NetFuncSelect><value></value></NetFuncSelect>
+<InputFuncSelectMain><value>DVD</value></InputFuncSelectMain>
+<VolumeDisplay><value>Relative</value></VolumeDisplay>
+<MasterVolume><value>-25.0</value></MasterVolume>
+<Mute><value>off</value></Mute>
+<RemoteMaintenance><value>OFF</value></RemoteMaintenance>
+</item>

diff --git a/tests/xml/AVR-4810-formMainZone_MainZoneXmlStatus.xml b/tests/xml/AVR-4810-formMainZone_MainZoneXmlStatus.xml
@@ -0,0 +1,4 @@
+<html><head><title>Document Error: Data follows</title></head>
+		<body><h2>Access Error: Data follows</h2>
+		<p>Form formMainZone_MainZoneXmlStatus.xml is not defined</p></body></html>
+
diff --git a/tests/xml/AVR-4810-formNetAudio_StatusXml.xml b/tests/xml/AVR-4810-formNetAudio_StatusXml.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<item>
+<chFlag>
+<value>0</value>
+<value>8</value>
+<value>0</value>
+<value>0</value>
+<value>0</value>
+<value>0</value>
+<value>0</value>
+<value>0</value>
+<value>0</value>
+<value>0</value>
+</chFlag>
+<szLine>
+<value>Denon AVR</value>
+<value>Favorites</value>
+<value>Internet Radio</value>
+<value>Media Server</value>
+<value>Napster</value>
+<value></value>
+<value></value>
+<value></value>
+<value>   [    1/4  ]</value>
+<value></value>
+</szLine>
+<PresetLists>
+<value index='0' skip='OFF' table='OFF' param=''/>
+<value index='1' skip='' table='A1' param=''/>
+<value index='2' skip='' table='A2' param=''/>
+<value index='3' skip='' table='A3' param=''/>
+<value index='4' skip='' table='A4' param=''/>
+<value index='5' skip='' table='A5' param=''/>
+<value index='6' skip='' table='A6' param=''/>
+<value index='7' skip='' table='A7' param=''/>
+<value index='8' skip='' table='A8' param=''/>
+<value index='9' skip='' table='B1' param=''/>
+<value index='10' skip='' table='B2' param=''/>
+<value index='11' skip='' table='B3' param=''/>
+<value index='12' skip='' table='B4' param=''/>
+<value index='13' skip='' table='B5' param=''/>
+<value index='14' skip='' table='B6' param=''/>
+<value index='15' skip='' table='B7' param=''/>
+<value index='16' skip='' table='B8' param=''/>
+<value index='17' skip='' table='C1' param=''/>
+<value index='18' skip='' table='C2' param=''/>
+<value index='19' skip='' table='C3' param=''/>
+<value index='20' skip='' table='C4' param=''/>
+<value index='21' skip='' table='C5' param=''/>
+<value index='22' skip='' table='C6' param=''/>
+<value index='23' skip='' table='C7' param=''/>
+<value index='24' skip='' table='C8' param=''/>
+<value index='25' skip='' table='D1' param=''/>
+<value index='26' skip='' table='D2' param=''/>
+<value index='27' skip='' table='D3' param=''/>
+<value index='28' skip='' table='D4' param=''/>
+<value index='29' skip='' table='D5' param=''/>
+<value index='30' skip='' table='D6' param=''/>
+<value index='31' skip='' table='D7' param=''/>
+<value index='32' skip='' table='D8' param=''/>
+<value index='33' skip='' table='E1' param=''/>
+<value index='34' skip='' table='E2' param=''/>
+<value index='35' skip='' table='E3' param=''/>
+<value index='36' skip='' table='E4' param=''/>
+<value index='37' skip='' table='E5' param=''/>
+<value index='38' skip='' table='E6' param=''/>
+<value index='39' skip='' table='E7' param=''/>
+<value index='40' skip='' table='E8' param=''/>
+<value index='41' skip='' table='F1' param=''/>
+<value index='42' skip='' table='F2' param=''/>
+<value index='43' skip='' table='F3' param=''/>
+<value index='44' skip='' table='F4' param=''/>
+<value index='45' skip='' table='F5' param=''/>
+<value index='46' skip='' table='F6' param=''/>
+<value index='47' skip='' table='F7' param=''/>
+<value index='48' skip='' table='F8' param=''/>
+<value index='49' skip='' table='G1' param=''/>
+<value index='50' skip='' table='G2' param=''/>
+<value index='51' skip='' table='G3' param=''/>
+<value index='52' skip='' table='G4' param=''/>
+<value index='53' skip='' table='G5' param=''/>
+<value index='54' skip='' table='G6' param=''/>
+<value index='55' skip='' table='G7' param=''/>
+<value index='56' skip='' table='G8' param=''/>
+</PresetLists>
+<Rhapsody><value>0</value></Rhapsody>
+<RhapsodySearch><value>0</value></RhapsodySearch>
+<iRadio><value>0</value></iRadio>
+<iRadioSearch><value>0</value></iRadioSearch>
+<Napster><value>0</value></Napster>
+<NapsterSearch><value>0</value></NapsterSearch>
+<Flickr><value>0</value></Flickr>
+<FlickrSearch><value>0</value></FlickrSearch>
+<ModelId><value>3</value></ModelId>
+<SalesArea><value>1</value></SalesArea>
+<InputFuncSelect><value>DVD</value></InputFuncSelect>
+<NetFuncSelect><value></value></NetFuncSelect>
+<InputFuncSelectMain><value>DVD</value></InputFuncSelectMain>
+<VolumeDisplay><value>Relative</value></VolumeDisplay>
+<MasterVolume><value>-25.0</value></MasterVolume>
+<Mute><value>off</value></Mute>
+<RemoteMaintenance><value>OFF</value></RemoteMaintenance>
+</item>
diff --git a/tests/xml/AVR-4810-formTuner_HdXml.xml b/tests/xml/AVR-4810-formTuner_HdXml.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<item>
+<Band><value></value></Band>
+<StationNameSh><value></value></StationNameSh>
+<Title><value></value></Title>
+<Artist><value></value></Artist>
+<Quality><value></value></Quality>
+<StationNameLo><value></value></StationNameLo>
+<PrgType><value></value></PrgType>
+<Album><value></value></Album>
+<Genre><value></value></Genre>
+<MltCurrch><value></value></MltCurrch>
+<SubChannel><value></value></SubChannel>
+<Preset><value></value></Preset>
+<PresetLists>
+<value index='0' skip='OFF' table='OFF' param=''/>
+<value index='1' skip='' table='A1' param=''/>
+<value index='2' skip='' table='A2' param=''/>
+<value index='3' skip='' table='A3' param=''/>
+<value index='4' skip='' table='A4' param=''/>
+<value index='5' skip='' table='A5' param=''/>
+<value index='6' skip='' table='A6' param=''/>
+<value index='7' skip='' table='A7' param=''/>
+<value index='8' skip='' table='A8' param=''/>
+<value index='9' skip='' table='B1' param=''/>
+<value index='10' skip='' table='B2' param=''/>
+<value index='11' skip='' table='B3' param=''/>
+<value index='12' skip='' table='B4' param=''/>
+<value index='13' skip='' table='B5' param=''/>
+<value index='14' skip='' table='B6' param=''/>
+<value index='15' skip='' table='B7' param=''/>
+<value index='16' skip='' table='B8' param=''/>
+<value index='17' skip='' table='C1' param=''/>
+<value index='18' skip='' table='C2' param=''/>
+<value index='19' skip='' table='C3' param=''/>
+<value index='20' skip='' table='C4' param=''/>
+<value index='21' skip='' table='C5' param=''/>
+<value index='22' skip='' table='C6' param=''/>
+<value index='23' skip='' table='C7' param=''/>
+<value index='24' skip='' table='C8' param=''/>
+<value index='25' skip='' table='D1' param=''/>
+<value index='26' skip='' table='D2' param=''/>
+<value index='27' skip='' table='D3' param=''/>
+<value index='28' skip='' table='D4' param=''/>
+<value index='29' skip='' table='D5' param=''/>
+<value index='30' skip='' table='D6' param=''/>
+<value index='31' skip='' table='D7' param=''/>
+<value index='32' skip='' table='D8' param=''/>
+<value index='33' skip='' table='E1' param=''/>
+<value index='34' skip='' table='E2' param=''/>
+<value index='35' skip='' table='E3' param=''/>
+<value index='36' skip='' table='E4' param=''/>
+<value index='37' skip='' table='E5' param=''/>
+<value index='38' skip='' table='E6' param=''/>
+<value index='39' skip='' table='E7' param=''/>
+<value index='40' skip='' table='E8' param=''/>
+<value index='41' skip='' table='F1' param=''/>
+<value index='42' skip='' table='F2' param=''/>
+<value index='43' skip='' table='F3' param=''/>
+<value index='44' skip='' table='F4' param=''/>
+<value index='45' skip='' table='F5' param=''/>
+<value index='46' skip='' table='F6' param=''/>
+<value index='47' skip='' table='F7' param=''/>
+<value index='48' skip='' table='F8' param=''/>
+<value index='49' skip='' table='G1' param=''/>
+<value index='50' skip='' table='G2' param=''/>
+<value index='51' skip='' table='G3' param=''/>
+<value index='52' skip='' table='G4' param=''/>
+<value index='53' skip='' table='G5' param=''/>
+<value index='54' skip='' table='G6' param=''/>
+<value index='55' skip='' table='G7' param=''/>
+<value index='56' skip='' table='G8' param=''/>
+</PresetLists>
+<Frequency><value> 0.00</value></Frequency>
+<Area><value>EUR</value></Area>
+<Mode><value></value></Mode>
+<ModelId><value>3</value></ModelId>
+<SalesArea><value>1</value></SalesArea>
+<InputFuncSelect><value>DVD</value></InputFuncSelect>
+<NetFuncSelect><value></value></NetFuncSelect>
+<InputFuncSelectMain><value>DVD</value></InputFuncSelectMain>
+<VolumeDisplay><value>Relative</value></VolumeDisplay>
+<MasterVolume><value>-25.0</value></MasterVolume>
+<Mute><value>off</value></Mute>
+<RemoteMaintenance><value>OFF</value></RemoteMaintenance>
+</item>
diff --git a/tests/xml/AVR-4810-formTuner_TunerXml.xml b/tests/xml/AVR-4810-formTuner_TunerXml.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<item>
+<Band><value></value></Band>
+<Preset><value></value></Preset>
+<PresetLists>
+<value index='0' skip='OFF' table='OFF' param=''/>
+<value index='1' skip='' table='A1' param=''/>
+<value index='2' skip='' table='A2' param=''/>
+<value index='3' skip='' table='A3' param=''/>
+<value index='4' skip='' table='A4' param=''/>
+<value index='5' skip='' table='A5' param=''/>
+<value index='6' skip='' table='A6' param=''/>
+<value index='7' skip='' table='A7' param=''/>
+<value index='8' skip='' table='A8' param=''/>
+<value index='9' skip='' table='B1' param=''/>
+<value index='10' skip='' table='B2' param=''/>
+<value index='11' skip='' table='B3' param=''/>
+<value index='12' skip='' table='B4' param=''/>
+<value index='13' skip='' table='B5' param=''/>
+<value index='14' skip='' table='B6' param=''/>
+<value index='15' skip='' table='B7' param=''/>
+<value index='16' skip='' table='B8' param=''/>
+<value index='17' skip='' table='C1' param=''/>
+<value index='18' skip='' table='C2' param=''/>
+<value index='19' skip='' table='C3' param=''/>
+<value index='20' skip='' table='C4' param=''/>
+<value index='21' skip='' table='C5' param=''/>
+<value index='22' skip='' table='C6' param=''/>
+<value index='23' skip='' table='C7' param=''/>
+<value index='24' skip='' table='C8' param=''/>
+<value index='25' skip='' table='D1' param=''/>
+<value index='26' skip='' table='D2' param=''/>
+<value index='27' skip='' table='D3' param=''/>
+<value index='28' skip='' table='D4' param=''/>
+<value index='29' skip='' table='D5' param=''/>
+<value index='30' skip='' table='D6' param=''/>
+<value index='31' skip='' table='D7' param=''/>
+<value index='32' skip='' table='D8' param=''/>
+<value index='33' skip='' table='E1' param=''/>
+<value index='34' skip='' table='E2' param=''/>
+<value index='35' skip='' table='E3' param=''/>
+<value index='36' skip='' table='E4' param=''/>
+<value index='37' skip='' table='E5' param=''/>
+<value index='38' skip='' table='E6' param=''/>
+<value index='39' skip='' table='E7' param=''/>
+<value index='40' skip='' table='E8' param=''/>
+<value index='41' skip='' table='F1' param=''/>
+<value index='42' skip='' table='F2' param=''/>
+<value index='43' skip='' table='F3' param=''/>
+<value index='44' skip='' table='F4' param=''/>
+<value index='45' skip='' table='F5' param=''/>
+<value index='46' skip='' table='F6' param=''/>
+<value index='47' skip='' table='F7' param=''/>
+<value index='48' skip='' table='F8' param=''/>
+<value index='49' skip='' table='G1' param=''/>
+<value index='50' skip='' table='G2' param=''/>
+<value index='51' skip='' table='G3' param=''/>
+<value index='52' skip='' table='G4' param=''/>
+<value index='53' skip='' table='G5' param=''/>
+<value index='54' skip='' table='G6' param=''/>
+<value index='55' skip='' table='G7' param=''/>
+<value index='56' skip='' table='G8' param=''/>
+</PresetLists>
+<Frequency><value> 0.00</value></Frequency>
+<Area><value>EUR</value></Area>
+<Mode><value></value></Mode>
+<ModelId><value>3</value></ModelId>
+<SalesArea><value>1</value></SalesArea>
+<InputFuncSelect><value>DVD</value></InputFuncSelect>
+<NetFuncSelect><value></value></NetFuncSelect>
+<InputFuncSelectMain><value>DVD</value></InputFuncSelectMain>
+<VolumeDisplay><value>Relative</value></VolumeDisplay>
+<MasterVolume><value>-25.0</value></MasterVolume>
+<Mute><value>off</value></Mute>
+<RemoteMaintenance><value>OFF</value></RemoteMaintenance>
+</item>