Fix/remove outdated "Default Tags" (#11313)

There used to be the following "Default Tags" which are no longer used in the current semantic model:

* Lighting
* Switchable
* CurrentTemperature
* TargetTemperature
* CurrentHumidity

See:

* https://www.openhab.org/docs/developer/bindings/thing-xml.html#default-tags
* https://www.openhab.org/docs/tutorial/model.html#semantic-model

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
index b2c6d6f3e031ee44705e9b5a89e2f91c7ac63e33..fe22f1e907b94284cc2d56675dd572abb8ec7961 100644 (file)
--- a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
@@ -201,7 +201,8 @@
                <label>Humidity</label>
                <category>Humidity</category>
                <tags>
-                       <tag>CurrentHumidity</tag>
+                       <tag>Measurement</tag>
+                       <tag>Humidity</tag>
                </tags>
                <state pattern="%.0f %%" readOnly="true" min="0" max="100">
                </state>

diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
index 7a0fb8266e98285c7c69e3ba7cf36b197377e118..de93d26a9c481f6823ecc4cae5289111c2ad9345 100644 (file)
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
@@ -29,7 +29,8 @@
                <label>All On</label>
                <description>"On" if all lights in this group are "On", otherwise "Off".</description>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Status</tag>
+                       <tag>Light</tag>
                </tags>
                <state readOnly="true"/>
        </channel-type>
@@ -39,7 +40,8 @@
                <label>Any On</label>
                <description>"On" if any light in this group is "On", otherwise "Off".</description>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Status</tag>
+                       <tag>Light</tag>
                </tags>
                <state readOnly="true"/>
        </channel-type>
@@ -48,7 +50,8 @@
                <item-type>String</item-type>
                <label>Recall Scene</label>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 

diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
index 1e125605d3b011ec1be040563ba6291e6bfbf3c7..75bb3127ab1e6ff0079c37f6f8092eba82bcd84b 100644 (file)
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
@@ -167,7 +167,8 @@
                <item-type>String</item-type>
                <label>Effect Channel</label>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -175,7 +176,8 @@
                <item-type>Number</item-type>
                <label>Effect Speed Channel</label>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
                <state min="0" max="10" step="1"/>
        </channel-type>

diff --git a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/channels.xml
index bae3f02d3b26a7002bf36a73c27906961071e1cb..175f0d075e4ca4af578e1275d5a85576840c44be 100644 (file)
--- a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/channels.xml
@@ -10,7 +10,8 @@
                        channel, the values is used for ALL DMX channels.</description>
                <category>DimmableLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
        <!-- Color Temperature -->
@@ -20,7 +21,8 @@
                <description>Relative intensity of two adjacent DMX channels</description>
                <category>ColorLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
        <!-- Color Channel -->
@@ -31,7 +33,8 @@
                        color will be re-use in 3-channel groups.</description>
                <category>ColorLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
        <!-- Switch Channel -->

diff --git a/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/channels.xml
index 460550821e5d5641a6010d43ed84d39b21bc7f5c..33861ebdce4c1eb7d6b727847470ac5979a0cec4 100644 (file)
--- a/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/channels.xml
@@ -11,7 +11,8 @@
                </description>
                <category>ColorLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 

diff --git a/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/thing/thing-types.xml
index d6c94234aa4e215f223d70254ecd9691c81529e4..9a6ca3bff688d3cc10aac6c62e6bfdae2a18d53f 100644 (file)
--- a/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/thing/thing-types.xml
@@ -758,7 +758,8 @@
                <description>This setting describes the custom color state of the ambient light.</description>
                <category>Colorpicker</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
                <state readOnly="false"/>
        </channel-type>

diff --git a/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/thing/thing-types.xml
index 4acf55b898475a853d897cd0ed1089b6c74007aa..ab1db20d2bfce54b64134e7bc2b38ff7c5ccfbbe 100644 (file)
--- a/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/thing/thing-types.xml
@@ -108,9 +108,6 @@
                <item-type>Switch</item-type>
                <label>Clean</label>
                <description>Start cleaning / return home.</description>
-               <tags>
-                       <tag>Switchable</tag>
-               </tags>
        </channel-type>
        <channel-type id="startType">
                <item-type>Switch</item-type>

diff --git a/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/thing/thing-types.xml
index 5620a0dec47261a69076bbad979d7db7e14443f9..61fb67fe02b8d41377cb77ff8834da0f94d74de9 100644 (file)
--- a/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/thing/thing-types.xml
@@ -40,9 +40,6 @@
                <item-type>Switch</item-type>
                <label>Device Grab</label>
                <category>Switch</category>
-               <tags>
-                       <tag>Switchable</tag>
-               </tags>
        </channel-type>
 
        <channel-group-type id="keypresses">

diff --git a/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/channel.xml b/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/channel.xml
index 6328658a3dc118f6214ba911752130e9793649f1..7487cb3d71cc2ed39c22a3d77e00e2359a31c581 100644 (file)
--- a/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/channel.xml
+++ b/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/channel.xml
@@ -29,7 +29,8 @@
                        light on and off.</description>
                <category>DimmableLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
                <state max="100" min="0" step="1" pattern="%d %%" readOnly="false"></state>
        </channel-type>
@@ -49,7 +50,8 @@
                <description>Control the color of light.</description>
                <category>ColorLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -58,6 +60,7 @@
                <label>Color Temperature</label>
                <description>Allows to control the color temperature of light.</description>
                <tags>
+                       <tag>Control</tag>
                        <tag>ColorTemperature</tag>
                </tags>
                <state pattern="%d K"/>

diff --git a/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/thing/channels.xml
index 4ba89d0c1012d4cb45c3291af333e40f04a6c134..7d884296c16c3ac4c1df00a2bee519660ef54087 100644 (file)
--- a/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/thing/channels.xml
@@ -46,8 +46,8 @@
                </description>
                <category>ColorLight</category>
                <tags>
-                       <tag>ColorLighting</tag>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -57,7 +57,8 @@
                <description>The brightness can be set in 16 steps for RGBW/White leds and in 64 steps for RGBWW leds</description>
                <category>Light</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
                <state min="0" max="100" step="1" pattern="%d"></state>
        </channel-type>

diff --git a/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/thing/channels.xml
index ab6c02ac892887f28b12aa1b711463dcc237b7c4..9452c1f917cc94a61b5a05b153b6e20419a66f83 100644 (file)
--- a/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/thing/channels.xml
@@ -9,7 +9,8 @@
                <label>Current Temperature</label>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>
@@ -18,7 +19,8 @@
                <label>Temperature Comfort Mode</label>
                <category>Heating</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state pattern="%d %unit%" min="5" max="35" step="1"/>
        </channel-type>
@@ -27,7 +29,8 @@
                <label>Temperature Sleep Mode</label>
                <category>Heating</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state pattern="%d %unit%" min="5" max="35" step="1"/>
        </channel-type>
@@ -37,7 +40,8 @@
                <description>Set temperature away mode</description>
                <category>Heating</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state pattern="%d %unit%" min="5" max="35" step="1"/>
        </channel-type>
@@ -46,7 +50,8 @@
                <label>Target Temperature</label>
                <category>Heating</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state pattern="%d %unit%" min="5" max="35" step="1"/>
        </channel-type>
@@ -55,7 +60,8 @@
                <label>Target Temperature</label>
                <category>Heating</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state pattern="%d %unit%" readOnly="true" min="5" max="35" step="1"/>
        </channel-type>
@@ -121,7 +127,8 @@
                <label>Target Temperature Vacation</label>
                <category>Heating</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state pattern="%d %unit%" min="5" max="35" step="1"/>
        </channel-type>

diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/thing/thing-types.xml
index 6382d8656b414b2015fe0bdf5bc8a10c27c28c46..362b08fd33abd4e9d9e1baf8cada8c8fd7a76870 100644 (file)
--- a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/thing/thing-types.xml
@@ -225,7 +225,8 @@
                <description>Temperature measured by thermostat</description>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>
@@ -235,7 +236,8 @@
                <description>Setpoint temperature of thermostat</description>
                <category>Temperature</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state min="0" max="100" step="0.5" pattern="%.1f %unit%"/>
        </channel-type>

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
index 2c078144888c675f9051ddf4f7bf3f46b30d991b..97ca3eedc69949ad6260f4ec0d46af0f720aad8b 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
@@ -11,7 +11,8 @@
                <description>Switch the power ON and OFF</description>
                <category>Light</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Switch</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -22,7 +23,8 @@
                <description>Control the brightness and switch the light ON and OFF</description>
                <category>DimmableLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -44,7 +46,8 @@
                <description>Current temperature (read only)</description>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>
@@ -68,7 +71,8 @@
                <description>Setpoint temperature (read/write)</description>
                <category>Temperature</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state pattern="%.1f %unit%" step="0.5"/>
        </channel-type>

diff --git a/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/thing/thing-types.xml
index 7e56192d783a843f4c7bbbed4f4dc63726a1942e..6ed6fcdc054fdd09d1f412017bd9a24b6a16aa20 100755 (executable)
--- a/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/thing/thing-types.xml
@@ -47,18 +47,12 @@
                <item-type>Switch</item-type>
                <label>PlayStation 3 Power</label>
                <description>Shows if PlayStation 3 is On or Off.</description>
-               <tags>
-                       <tag>Switchable</tag>
-               </tags>
                <state readOnly="true"/>
        </channel-type>
        <channel-type id="power-channel">
                <item-type>Switch</item-type>
                <label>PlayStation 4 Power</label>
                <description>Shows if PlayStation 4 is On or in Standby/Off.</description>
-               <tags>
-                       <tag>Switchable</tag>
-               </tags>
        </channel-type>
        <channel-type id="application-channel">
                <item-type>String</item-type>

diff --git a/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/thing/thing-types.xml
index 0b8a00cd906b3dd7b7e40316a3ab74b93c430b1f..050d73b427bbf08509e98cbbc2b9dbcd4d6a300f 100644 (file)
--- a/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/thing/thing-types.xml
@@ -175,7 +175,8 @@
                <description>Temperature Measured by Thermostat</description>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>
@@ -186,7 +187,8 @@
                <description>Setpoint Temperature of Thermostat</description>
                <category>Temperature</category>
                <tags>
-                       <tag>TargetTemperature</tag>
+                       <tag>Setpoint</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state min="0" max="100" step="0.5" pattern="%.1f %unit%"/>
        </channel-type>

diff --git a/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/thing/channels.xml
index 3d0de7c5da5daf44b32ae52d50a36bb695d8f745..23a235e1a90c5cd0ee76f34efbdb3bea1259ca3d 100644 (file)
--- a/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/thing/channels.xml
@@ -9,7 +9,8 @@
                <label>Current Temperature</label>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>
@@ -18,16 +19,14 @@
                <label>Current Humidity</label>
                <category>Humidity</category>
                <tags>
-                       <tag>CurrentHumidity</tag>
+                       <tag>Measurement</tag>
+                       <tag>Humidity</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>
        <channel-type id="masterSwitch">
                <item-type>Switch</item-type>
                <label>Master Switch</label>
-               <tags>
-                       <tag>Switchable</tag>
-               </tags>
        </channel-type>
        <channel-type id="timer">
                <item-type>Number</item-type>

diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/device.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/device.xml
index 2c3b71ed4171ed49072b3a137ec146e4c28363eb..771997e6de204b145a1871bf91db9ac471fffc1c 100644 (file)
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/device.xml
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/device.xml
@@ -100,7 +100,8 @@
                <description>Internal device temperature, helps to detect overheating due to installation issues</description>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.0f %unit%">
                </state>

diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/sensor.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/sensor.xml
index eb442fd5e291e06c6f882abdf3aa6026649676b9..2b8b4c6c99d1f7cdcc882e98a0d7015e80cc5c5b 100644 (file)
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/sensor.xml
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/sensor.xml
@@ -217,7 +217,8 @@
                <description>Temperature from the sensor</description>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%">
                </state>
@@ -228,7 +229,8 @@
                <description>Temperature from the external sensor</description>
                <category>Temperature</category>
                <tags>
-                       <tag>CurrentTemperature</tag>
+                       <tag>Measurement</tag>
+                       <tag>Temperature</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%">
                </state>
@@ -239,7 +241,8 @@
                <description>Relative humidity in % (0..100%) from external sensor</description>
                <category>Humidity</category>
                <tags>
-                       <tag>CurrentHumidity</tag>
+                       <tag>Measurement</tag>
+                       <tag>Humidity</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%">
                </state>
@@ -249,7 +252,8 @@
                <label>Humidity</label>
                <description>Relative humidity in % (0..100%)</description>
                <tags>
-                       <tag>CurrentHumidity</tag>
+                       <tag>Measurement</tag>
+                       <tag>Humidity</tag>
                </tags>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>

diff --git a/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/thing/switch.xml b/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/thing/switch.xml
index c99d235f54158045fb1579808689addf4fbb531a..350164e1131067c288482dabe0cb64d735b0a32d 100644 (file)
--- a/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/thing/switch.xml
+++ b/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/thing/switch.xml
@@ -22,7 +22,8 @@
                </description>
                <category>Light</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Switch</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 

diff --git a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/thing/thing-types.xml
index fc2eb47d4f18495009c3544296d5878327f51f67..4ae88dbcf4f128e4cadd3bef81d8bce4e2274842 100644 (file)
--- a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/thing/thing-types.xml
@@ -57,7 +57,8 @@
                <description>Allows you to exit FX mode and use the LEDS like a normal light</description>
                <category>ColorLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 

diff --git a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/thing/channels.xml
index a3e83a4715f42c917fe135396cd9264abcf221a6..0e3d6e5d3f29067e188136312aac6691e60f6307 100644 (file)
--- a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/thing/channels.xml
@@ -14,7 +14,8 @@
                </description>
                <category>DimmableLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -25,7 +26,8 @@
                <description>The color channel allows to control the color of a light.</description>
                <category>ColorLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -36,6 +38,7 @@
                <description>The CT channel allows to control the CT of a light.</description>
                <category>DimmableCT</category>
                <tags>
+                       <tag>Control</tag>
                        <tag>ColorTemperature</tag>
                </tags>
        </channel-type>
@@ -54,7 +57,8 @@
                <description>The color channel allows to control the color of a light.</description>
                <category>ColorLight</category>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Control</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>
 
@@ -64,7 +68,8 @@
                <description>The nightlight channel allows to switch to nightlight mode.
                </description>
                <tags>
-                       <tag>Lighting</tag>
+                       <tag>Switch</tag>
+                       <tag>Light</tag>
                </tags>
        </channel-type>