Updated external content (Jenkins build 2147)

pull/2299/head
openHAB Build Server 2024-05-25 13:30:34 +00:00
parent 82e9956202
commit c66adf5718
6 changed files with 40 additions and 36 deletions

View File

@ -22,18 +22,18 @@ This binding integrates Denon & Marantz AV receivers by using either Telnet or a
This binding supports Denon and Marantz receivers having a Telnet interface or a web based controller at `http://<AVR IP address>/`. This binding supports Denon and Marantz receivers having a Telnet interface or a web based controller at `http://<AVR IP address>/`.
The thing type for all of them is `avr`. The thing type for all of them is `avr`.
Tested models: Marantz SR5008, Denon AVR-X2000 / X3000 / X1200W / X2100W / X2200W / X3100W / X3300W / X4400H Tested models: Marantz SR5008, Denon AVR-3808 / AVR-4520 / AVR-X2000 / X3000 / X1200W / X2100W / X2200W / X3100W / X3300W / X4400H / X4800H
Denon models with HEOS support (`AVR-X..00H`) do not support the HTTP API. They do support Telnet.
During Discovery this is auto-detected and configured.
## Discovery ## Discovery
This binding can discover Denon and Marantz receivers using mDNS. This binding can discover Denon and Marantz receivers using mDNS.
The serial number (which is the MAC address of the network interface) is used as unique identifier. The serial number (which is the MAC address of the network interface) is used as unique identifier.
The protocol will be auto-detected.
The HTTP port as well as slight variations in the API will be auto-detected as well.
It tries to detect the number of zones (when the AVR responds to HTTP). It tries to detect the number of zones (when the AVR responds to HTTP).
It defaults to 2 zones. It defaults to two zones.
## Thing Configuration ## Thing Configuration

File diff suppressed because one or more lines are too long

View File

@ -39,6 +39,9 @@ cp -f siren-on.svg siren.svg
cp -f soundvolume-100.svg soundvolume.svg cp -f soundvolume-100.svg soundvolume.svg
cp -f soundvolume-100.svg soundvolume_mute-off.svg
cp -f soundvolume_mute-on.svg soundvolume_mute.svg
cp -f switch-on.svg switch.svg cp -f switch-on.svg switch.svg

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 64 64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47s-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11s.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48z" fill="#dcdcdc"/>
<path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76s-.46.33-.76.33-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62s-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46.41.42.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62s1.05-.21 1.46-.62.63-.9.63-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.41-.42-.9-.62-1.46-.62z" fill="#aaa"/>
<path d="m37.18 39.26c-.43 0-.79-.15-1.11-.46-.31-.3-.46-.67-.46-1.11 0-.34.09-.61.27-.83.22-.27.5-.51.82-.7.38-.23.76-.49 1.13-.77.43-.31.79-.76 1.09-1.32.29-.57.44-1.26.44-2.08s-.15-1.51-.44-2.08c-.29-.56-.66-1.01-1.09-1.32-.38-.28-.76-.53-1.13-.77-.32-.2-.59-.43-.82-.7-.18-.22-.27-.49-.27-.83 0-.45.15-.81.46-1.11.32-.31.68-.46 1.11-.46.24 0 .44.04.58.11 1.45.56 2.59 1.51 3.44 2.83.86 1.33 1.3 2.79 1.3 4.32s-.44 2.98-1.29 4.31c-.85 1.32-2 2.27-3.41 2.83-.18.11-.38.14-.62.14z" fill="#1e82ff"/>
<path d="m37.18 25.24c.22 0 .33.04.36.06l.04.02.04.02c1.32.51 2.35 1.36 3.16 2.62.82 1.26 1.22 2.58 1.22 4.04s-.4 2.77-1.21 4.03c-.81 1.25-1.85 2.11-3.17 2.64l-.04.02-.04.02c-.03.02-.14.06-.36.06-.3 0-.53-.1-.76-.31-.22-.21-.31-.44-.31-.76 0-.29.09-.43.16-.51.19-.23.42-.43.69-.6.39-.24.78-.5 1.17-.79.49-.36.9-.86 1.23-1.49.33-.64.5-1.41.5-2.31 0-.89-.17-1.67-.5-2.31-.33-.63-.74-1.13-1.23-1.49-.39-.28-.78-.55-1.17-.79-.27-.17-.51-.37-.69-.6-.07-.08-.16-.22-.16-.51 0-.31.1-.55.31-.76.22-.21.46-.3.76-.3m0-1c-.56 0-1.05.2-1.46.6s-.61.89-.61 1.47c0 .45.13.84.39 1.15s.57.58.94.81.73.47 1.1.74.68.65.94 1.15.39 1.11.39 1.84-.13 1.35-.39 1.84c-.26.5-.57.88-.94 1.15s-.73.52-1.1.74c-.37.23-.68.5-.94.81s-.39.7-.39 1.15c0 .58.2 1.07.61 1.47s.89.6 1.46.6c.32 0 .59-.05.81-.16 1.51-.6 2.72-1.61 3.64-3.02.91-1.42 1.37-2.94 1.37-4.58s-.46-3.17-1.37-4.59c-.92-1.42-2.13-2.43-3.64-3.01-.22-.11-.49-.16-.81-.16z" fill="#1271d8"/>
<path d="m40.16 46.9c-.45 0-.82-.15-1.13-.47-.32-.31-.47-.68-.47-1.1 0-.65.31-1.12.99-1.46 1.24-.64 2.07-1.12 2.53-1.47 1.65-1.2 2.96-2.74 3.88-4.56.93-1.82 1.4-3.79 1.4-5.84s-.47-4.02-1.4-5.84-2.23-3.35-3.89-4.56c-.45-.34-1.28-.82-2.52-1.46-.68-.35-.99-.81-.99-1.46 0-.43.15-.79.47-1.1.31-.32.68-.47 1.1-.47.22 0 .44.04.66.13 2.9 1.22 5.27 3.21 7.04 5.91s2.67 5.68 2.67 8.86-.9 6.17-2.67 8.86c-1.77 2.7-4.14 4.68-7.06 5.91-.2.07-.41.12-.61.12z" fill="#1e82ff"/>
<path d="m40.13 17.6c.16 0 .32.03.45.08 2.82 1.19 5.12 3.11 6.83 5.72 1.72 2.62 2.59 5.51 2.59 8.6s-.87 5.98-2.59 8.59c-1.71 2.61-4.01 4.54-6.8 5.71-.16.06-.32.1-.45.1-.32 0-.56-.1-.78-.32s-.32-.45-.32-.75c0-.34.09-.7.72-1.02 1.27-.66 2.12-1.15 2.59-1.5 1.72-1.25 3.08-2.85 4.04-4.74s1.45-3.93 1.45-6.07-.49-4.17-1.45-6.07c-.96-1.89-2.32-3.48-4.03-4.73-.48-.36-1.33-.85-2.6-1.51-.63-.32-.72-.68-.72-1.02 0-.3.1-.53.32-.75s.46-.32.75-.32m0-1c-.56 0-1.05.2-1.46.61s-.61.89-.61 1.46c0 .84.42 1.48 1.26 1.91 1.21.63 2.03 1.1 2.46 1.42 1.6 1.16 2.84 2.63 3.74 4.38.89 1.76 1.34 3.63 1.34 5.61s-.45 3.85-1.34 5.61-2.14 3.22-3.74 4.38c-.43.32-1.25.8-2.46 1.42-.84.43-1.26 1.07-1.26 1.91 0 .56.2 1.05.61 1.46s.91.61 1.49.61c.26 0 .53-.05.81-.16 3.02-1.27 5.45-3.3 7.28-6.1 1.83-2.77 2.75-5.82 2.75-9.12s-.92-6.35-2.75-9.14-4.26-4.83-7.28-6.1c-.28-.1-.56-.16-.84-.16z" fill="#1271d8"/>
<path d="m43.12 54.5c-.43 0-.79-.15-1.1-.47s-.47-.68-.47-1.1c0-.59.33-1.08 1.02-1.48.13-.08.36-.18.67-.31.36-.15.62-.27.78-.37 1-.54 1.91-1.11 2.7-1.68 2.71-2 4.85-4.53 6.36-7.52 1.52-2.99 2.29-6.21 2.29-9.57s-.77-6.58-2.29-9.57-3.66-5.52-6.36-7.52c-.79-.57-1.7-1.14-2.71-1.69-.15-.09-.41-.21-.77-.36-.31-.13-.53-.23-.67-.31-.68-.4-1.01-.88-1.01-1.47 0-.43.15-.79.47-1.1s.68-.47 1.1-.47c.22 0 .44.04.66.13 4.42 1.91 8.02 4.93 10.7 8.98 2.67 4.05 4.03 8.55 4.03 13.39s-1.35 9.34-4.03 13.39c-2.67 4.05-6.28 7.07-10.71 8.99-.22.07-.45.11-.66.11z" fill="#1e82ff"/>
<path d="m43.12 10c .16 0 .32.03.45.08 4.35 1.87 7.88 4.84 10.5 8.8 2.6 3.97 3.93 8.38 3.93 13.12s-1.33 9.15-3.94 13.12c-2.62 3.97-6.15 6.93-10.46 8.79-.17.06-.32.1-.48.1-.3 0-.53-.1-.75-.32s-.32-.45-.32-.75c0-.28.09-.64.76-1.04.06-.04.23-.12.62-.29.38-.16.65-.29.82-.38 1.02-.56 1.95-1.13 2.77-1.72 2.77-2.05 4.96-4.64 6.51-7.69 1.55-3.06 2.34-6.36 2.34-9.8s-.79-6.74-2.34-9.8-3.74-5.65-6.52-7.7c-.81-.58-1.74-1.16-2.74-1.71-.19-.11-.46-.24-.84-.39-.39-.16-.55-.25-.61-.28-.68-.4-.77-.77-.77-1.05 0-.3.1-.53.32-.75.22-.24.45-.34.75-.34m0-1c-.56 0-1.05.2-1.46.61s-.61.89-.61 1.46c0 .78.42 1.41 1.26 1.91.15.09.39.2.73.34.33.14.58.25.73.34.99.54 1.88 1.09 2.65 1.65 2.65 1.96 4.72 4.41 6.21 7.34s2.23 6.05 2.23 9.35-.74 6.42-2.23 9.35-3.56 5.38-6.21 7.34c-.78.56-1.66 1.11-2.65 1.65-.15.09-.39.2-.73.34-.33.14-.58.25-.73.34-.84.5-1.26 1.13-1.26 1.91 0 .56.2 1.05.61 1.46s.9.61 1.46.61c.28 0 .56-.05.84-.16 4.55-1.96 8.2-5.02 10.93-9.17 2.74-4.15 4.11-8.71 4.11-13.67s-1.37-9.52-4.11-13.67-6.38-7.21-10.93-9.17c-.28-.11-.56-.16-.84-.16z" fill="#1271d8"/>
</svg>

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 64 64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<path d="m27.92 51.29c-.43 0-.79-.15-1.11-.47l-10.99-11.32h-8.74c-.43 0-.79-.15-1.11-.47s-.47-.68-.47-1.11v-11.84c0-.43.15-.79.47-1.11s.68-.47 1.11-.47h8.74l10.99-11.33c.31-.31.68-.47 1.11-.47s.79.15 1.11.47.47.68.47 1.11v35.42c0 .43-.15.79-.47 1.11-.32.33-.68.48-1.11.48z" fill="#dcdcdc"/>
<path d="m27.92 13.21c.3 0 .53.1.76.33.22.22.32.45.32.75v35.42c0 .3-.1.53-.33.76s-.46.33-.76.33-.53-.1-.75-.31l-10.83-11.19-.29-.3h-.42-8.54c-.3 0-.53-.1-.76-.33-.22-.22-.32-.45-.32-.75v-11.84c0-.3.1-.53.33-.76.22-.22.45-.32.75-.32h8.53.42l.29-.3 10.83-11.16c.23-.23.47-.33.77-.33m0-1c-.56 0-1.05.21-1.46.62l-10.85 11.17h-8.53c-.56 0-1.05.21-1.46.62s-.62.9-.62 1.46v11.83c0 .56.21 1.05.62 1.46s.9.63 1.46.63h8.53l10.84 11.17c.41.41.9.62 1.46.62s1.05-.21 1.46-.62.63-.9.63-1.46v-35.42c0-.56-.21-1.05-.62-1.46-.41-.42-.9-.62-1.46-.62z" fill="#aaa"/>
<path d="m47.05 34.12-8.48 8.49-2.12-2.12 8.48-8.49-8.48-8.49 2.12-2.12 8.48 8.49 8.49-8.49 2.12 2.12-8.49 8.49 8.49 8.49-2.12 2.12z" fill="#ff4545"/>
<path d="m55.54 22.1 1.41 1.41-7.78 7.78-0.7 0.71 8.49 8.49-1.41 1.41-8.49-8.49-8.49 8.49-1.41-1.41 7.78-7.78 0.7-0.71-8.49-8.49 1.41-1.41 8.49 8.49 0.71-0.71zm0-1.41-8.49 8.49-8.49-8.49-2.83 2.83 8.5 8.48-8.49 8.49 2.83 2.83 8.49-8.49 8.49 8.49 2.83-2.83-8.5-8.49 8.49-8.49z" fill="#d82b2b"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -30,7 +30,7 @@
</channel-groups> </channel-groups>
<properties> <properties>
<property name="thingTypeVersion">1</property> <property name="thingTypeVersion">2</property>
</properties> </properties>
<representation-property>serialNumber</representation-property> <representation-property>serialNumber</representation-property>
@ -101,7 +101,9 @@
<label>General Control</label> <label>General Control</label>
<description>General channels for this AVR.</description> <description>General channels for this AVR.</description>
<channels> <channels>
<channel id="power" typeId="mainPower"/> <channel id="power" typeId="system.power">
<description>Power ON/OFF the AVR</description>
</channel>
<channel id="surroundProgram" typeId="surroundProgram"/> <channel id="surroundProgram" typeId="surroundProgram"/>
<channel id="artist" typeId="artist"/> <channel id="artist" typeId="artist"/>
<channel id="album" typeId="album"/> <channel id="album" typeId="album"/>
@ -114,33 +116,20 @@
<label>Zone Control</label> <label>Zone Control</label>
<description>Channels for a zone of this AVR.</description> <description>Channels for a zone of this AVR.</description>
<channels> <channels>
<channel id="power" typeId="zonePower"/> <channel id="power" typeId="system.power">
<channel id="volume" typeId="volume"/> <description>Power ON/OFF this zone of the AVR</description>
</channel>
<channel id="volume" typeId="system.volume">
<description>Set the volume level of this zone</description>
</channel>
<channel id="volumeDB" typeId="volumeDB"/> <channel id="volumeDB" typeId="volumeDB"/>
<channel id="mute" typeId="mute"/> <channel id="mute" typeId="system.mute">
<description>Mute audio on this zone of the AVR</description>
</channel>
<channel id="input" typeId="input"/> <channel id="input" typeId="input"/>
</channels> </channels>
</channel-group-type> </channel-group-type>
<channel-type id="mainPower">
<item-type>Switch</item-type>
<label>Power</label>
<description>Power ON/OFF the AVR</description>
</channel-type>
<channel-type id="zonePower">
<item-type>Switch</item-type>
<label>Power (zone)</label>
<description>Power ON/OFF this zone of the AVR</description>
</channel-type>
<channel-type id="volume">
<item-type>Dimmer</item-type>
<label>Volume</label>
<description>Set the volume level of this zone</description>
<category>SoundVolume</category>
</channel-type>
<channel-type id="volumeDB" advanced="true"> <channel-type id="volumeDB" advanced="true">
<item-type unitHint="dB">Number:Dimensionless</item-type> <item-type unitHint="dB">Number:Dimensionless</item-type>
<label>Volume (dB)</label> <label>Volume (dB)</label>
@ -149,12 +138,6 @@
<state min="-80" max="18" step="0.5" pattern="%.1f %unit%"/> <state min="-80" max="18" step="0.5" pattern="%.1f %unit%"/>
</channel-type> </channel-type>
<channel-type id="mute">
<item-type>Switch</item-type>
<label>Mute</label>
<description>Enable/Disable Mute on this zone of the AVR</description>
</channel-type>
<channel-type id="input"> <channel-type id="input">
<item-type>String</item-type> <item-type>String</item-type>
<label>Input Source</label> <label>Input Source</label>