Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make bindings discoverable on system startup #15817

Merged
merged 25 commits into from
Dec 7, 2023
Merged

Make bindings discoverable on system startup #15817

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c73fb4e
[discovery-methods] mDNS discovery methods
andrewfg Oct 28, 2023
7dd5bce
[discovery-methods] UPnP discovery methods
andrewfg Oct 28, 2023
1614740
[discovery-methods] UPnP discovery methods
andrewfg Oct 28, 2023
d918ea9
[discovery-methods] remove Wemo; add others
andrewfg Oct 29, 2023
4d8845e
Merge branch 'discovery-mthods-xml' of https://github.com/andrewfg/op…
andrewfg Oct 29, 2023
2a88060
[discovery-methods] add nikohomecontrol
andrewfg Oct 29, 2023
c8ea945
[discovery-methods] update nikohomecontrol
andrewfg Oct 30, 2023
6df7289
[discovery-methods] fix upn device type
andrewfg Oct 30, 2023
d3b9f25
[discovery-methods] fix niko again
andrewfg Oct 30, 2023
1e951e5
[discovery-methods] changes based on reviewer feedback
andrewfg Nov 2, 2023
c847cd2
[discovery-methods] corrections
andrewfg Nov 2, 2023
4b212ae
[discovery-methods] adopt reviewer suggestions
andrewfg Nov 4, 2023
c0031e4
[discovery-methods] corrections and additions
andrewfg Nov 4, 2023
9e0409a
[discovery-methods] ism8
andrewfg Nov 4, 2023
e553b79
[discovery-methods] change miele; delete remote openhab
andrewfg Nov 5, 2023
d75cfee
[discovery-methods] fix miele regex
andrewfg Nov 5, 2023
b8e2636
[discovery-methods] remove boschshc
andrewfg Nov 6, 2023
868b4fb
Merge branch 'openhab:main' into discovery-mthods-xml
andrewfg Nov 11, 2023
3b07910
Merge branch 'openhab:main' into discovery-mthods-xml
andrewfg Nov 26, 2023
c0dd8a9
Merge branch 'openhab:main' into discovery-mthods-xml
andrewfg Nov 29, 2023
003858e
[discovery-methods] add openwebnet
andrewfg Dec 2, 2023
b3bce9b
Merge branch 'openhab:main' into discovery-mthods-xml
andrewfg Dec 5, 2023
7f4a27a
Merge branch 'openhab:main' into discovery-mthods-xml
andrewfg Dec 5, 2023
dfebfde
[discovery-methods] make androidtv less restrictive
andrewfg Dec 7, 2023
1153bab
[discovery-methods] make androiddebugbridge less restrictive
andrewfg Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,17 @@
<description>This is the binding for the AmpliPi Home Audio System from MicroNova.</description>
<connection>local</connection>

<discovery-methods>

Check failure on line 11 in bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/addon/addon.xml

View workflow job for this annotation

GitHub Actions / Build (Java 17, ubuntu-22.04) 

Invalid content was found starting with element discovery-methods. One of {countries, service-id, config-description, config-description-ref} is expected.
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_http._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>name</name>
<regex>amplipi-api</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
24 changes: 24 additions & 0 deletions bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,28 @@
<default>255</default>
</parameter>
</config-description>

<discovery-methods>

Check failure on line 34 in bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/addon/addon.xml

View workflow job for this annotation

GitHub Actions / Build (Java 17, ubuntu-22.04) 

Invalid content was found starting with element discovery-methods. No child element is expected at this point.
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_androidtvremote2._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>bt</name>
<regex>.*</regex>
</match-property>
</match-properties>
</discovery-method>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_amzn-wplay._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>c</name>
<regex>.*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
23 changes: 23 additions & 0 deletions bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,27 @@
<description>This is the add-on for AndroidTV.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_androidtvremote2._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>bt</name>
<regex>.*</regex>
</match-property>
</match-properties>
</discovery-method>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_nv_shield_remote._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>SERVER</name>
<regex>^$</regex>
andrewfg marked this conversation as resolved.
Show resolved Hide resolved
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
12 changes: 12 additions & 0 deletions bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,16 @@
<description>This is the binding for a Autelis pool controller.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>manufacturer</name>
<regex>(?i)AUTELIS.*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
12 changes: 12 additions & 0 deletions bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,16 @@
<description>This is the binding for AVM FRITZ! devices.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>deviceType</name>
<regex>(?i).*fritzbox.*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,11 @@
<description>This is the binding for the Bond Bridge for Ceiling Fans and other RF devices.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_bond._tcp.local.</mdns-service-type>
</discovery-method>
</discovery-methods>

</addon:addon>
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,11 @@
<description>This is the binding for Bose SoundTouch devices.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_soundtouch._tcp.local.</mdns-service-type>
</discovery-method>
</discovery-methods>

</addon:addon>
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,11 @@
</parameter>
</config-description>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_googlecast._tcp.local.</mdns-service-type>
</discovery-method>
</discovery-methods>

</addon:addon>
16 changes: 16 additions & 0 deletions bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,20 @@
with the HUE binding which makes the lights and plugs available.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>manufacturerURI</name>
<regex>.*dresden.*</regex>
</match-property>
<match-property>
<name>manufacturer</name>
<regex>dresden elektronik</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
14 changes: 14 additions & 0 deletions bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,18 @@
<description>Binding for controlling network enabled Denon and Marantz receivers.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_raop._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>name</name>
<regex>^(000678|0005CD)</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>


</addon:addon>
12 changes: 12 additions & 0 deletions bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,16 @@
<description>@text/binding_desc</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>application</name>
<regex>.*dssweb.*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>
</addon:addon>
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,11 @@
<description>This is the binding for D-Link Smart Home devices</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_dhnap._tcp.local.</mdns-service-type>
</discovery-method>
</discovery-methods>

</addon:addon>
13 changes: 13 additions & 0 deletions bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,17 @@
<description>This is the binding for Drayton Wiser smart heating system.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_http._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>name</name>
<regex>.*WiserHeat.*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
13 changes: 13 additions & 0 deletions bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,17 @@
<description>This is the binding for Enigma2.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_http._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>name</name>
<regex>.*enigma.*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
13 changes: 13 additions & 0 deletions bundles/org.openhab.binding.enphase/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,17 @@
<description>This is the binding for Enphase Envoy solar panels.</description>
<connection>hybrid</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_enphase-envoy._tcp.local.</mdns-service-type>
<match-properties>
<match-property>
<name>name</name>
<regex>.*envoy.*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,11 @@
</parameter>
</config-description>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_fbx-api._tcp.local.</mdns-service-type>
</discovery-method>
</discovery-methods>

</addon:addon>
21 changes: 21 additions & 0 deletions bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,25 @@
<description>This is the binding for internet radios based on the Frontier Silicon chipset.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>manufacturer</name>
<regex>(?i)(MEDION|HAMA|TEUFEL|TTMICRO|REVO|ROBERTS|AUNA|SANGEAN|ROKU).*</regex>
</match-property>
</match-properties>
</discovery-method>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>friendlyName</name>
<regex>(?i).*(MEDION|HAMA|TEUFEL|TTMICRO|REVO|ROBERTS|AUNA|SANGEAN|ROKU).*</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
12 changes: 12 additions & 0 deletions bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,16 @@
<description>The HarmonyHub Binding integrates Logitech Harmony hubs and remotes.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>modelName</name>
<regex>Harmony Hub</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
11 changes: 11 additions & 0 deletions bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,15 @@
<description>The Hunter Douglas PowerView binding provides access to the Hunter Douglas line of PowerView shades.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_powerview-g3._tcp.local.</mdns-service-type>
</discovery-method>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_powerview._tcp.local.</mdns-service-type>
</discovery-method>
</discovery-methods>

</addon:addon>
12 changes: 12 additions & 0 deletions bundles/org.openhab.binding.heos/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,16 @@
<description>Binding for the Denon HEOS system.</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>manufacturer</name>
<regex>(?i)DENON</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@
to household devices from brands like Bosch and Siemens.</description>
<connection>cloud</connection>

<discovery-methods>
<discovery-method>
<service-type>mdns</service-type>
<mdns-service-type>_homeconnect._tcp.local.</mdns-service-type>
</discovery-method>
</discovery-methods>
lolodomo marked this conversation as resolved.
Show resolved Hide resolved

</addon:addon>
12 changes: 12 additions & 0 deletions bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/addon/addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,16 @@
<description>This is the binding for Homematic gateways</description>
<connection>local</connection>

<discovery-methods>
<discovery-method>
<service-type>upnp</service-type>
<match-properties>
<match-property>
<name>manufacturer</name>
<regex>(?i)HOMEGEAR</regex>
</match-property>
</match-properties>
</discovery-method>
</discovery-methods>

</addon:addon>
Loading
Loading