Replace unknown category DimmableLight by Light (#12264)

Also replace unknwon category DimmableCT by ColorLight

Fix #12263

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

diff --git a/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
index c1b2fd7587b7f1980f78069eea9ba05e14485edc..5f8a81f8c0e6ffd14dd0c2f5e057e6ad89434109 100644 (file)
--- a/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
@@ -174,7 +174,7 @@
                <item-type>Dimmer</item-type>
                <label>Light Brightness</label>
                <description>The brightness level of the fan's light</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
        <channel-type id="light-auto">
                <item-type>Switch</item-type>

diff --git a/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/thing/thing-types.xml
index bf223c1f1de091620c2376598976608cd9d80d20..c2295fe1058e9520b5d72f3ce546132feab7a473 100644 (file)
--- a/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/thing/thing-types.xml
@@ -113,7 +113,7 @@
                <item-type>Dimmer</item-type>
                <label>Level Channel</label>
                <description>Group channel for CBus variable value lighting groups</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <!-- Temperature Group Channel Type -->

diff --git a/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
index 33ed5062077a53f6656bad2f9e40bef4fdb998ee..ab987a0b32337d39f9b97d470b1628c03969bb73 100644 (file)
--- a/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
@@ -70,7 +70,7 @@
                <item-type>Dimmer</item-type>
                <label>Light Level</label>
                <description>Increase/decrease the light level</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <state min="0" max="100" pattern="%.0f %%"/>
        </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 175f0d075e4ca4af578e1275d5a85576840c44be..2dcf191bf038f6e4df8af10c751a5d32dc4b952c 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
@@ -8,7 +8,7 @@
                <label>Brightness</label>
                <description>Allows to send a brightness value to the thing. If the thing is associated with more than one DMX
                        channel, the values is used for ALL DMX channels.</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <tags>
                        <tag>Control</tag>
                        <tag>Light</tag>

diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/channels.xml
index 9de583532fddcb289b3d78b4d8ff2fc74a281e0a..76574c35f368eace3f5a81cdb35cd466e567e8c0 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/channels.xml
@@ -67,7 +67,7 @@
                <item-type>Dimmer</item-type>
                <label>Dimmer</label>
                <description>Dimmer</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <config-description>
                        <parameter name="rampingTime" type="integer">
                                <label>Ramping Time</label>

diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
index 3d61a146ebd4ecb6c6b7c0a2e3113644d637836b..7e5933fcafe479b7e64563464225a6158e1aee17 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/gernericChannels.xml
@@ -27,7 +27,7 @@
                <item-type>Dimmer</item-type>
                <label>Dimmer</label>
                <description>Dimmer</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <config-description-ref uri="channel-type:enocean:genericChannel"/>
        </channel-type>
 

diff --git a/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/thing/thing-types.xml
index 84e1bdcb92dd22522e4dc6e855ee63fd5e937234..8fbec616921fb46ef8e8327426185024dbe126ea 100644 (file)
--- a/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/thing/thing-types.xml
@@ -325,7 +325,7 @@
                <item-type>Number</item-type>
                <label>Screen Brightness</label>
                <description>Brightness level of the screen in percent</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <state pattern="%d %%"/>
        </channel-type>
 

diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/thing/channels.xml
index e9dc92e5c236800daadc2222bbf986f873652aaa..672bd8794a46067474a1b8abf7b6e4851c279499 100644 (file)
--- a/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/thing/channels.xml
@@ -17,7 +17,7 @@
                <item-type>Dimmer</item-type>
                <label>Dimmer</label>
                <description>Dimms the connected light</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <!-- RollerShutter Channel -->

diff --git a/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/thing/channel.xml b/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/thing/channel.xml
index ec5f56ebb67927001b8d7bea7cb96bcdef9cbdfd..5ad847946d127def2b428bab4c213ae16cc3ec3d 100644 (file)
--- a/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/thing/channel.xml
+++ b/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/thing/channel.xml
@@ -8,7 +8,7 @@
                <item-type>Dimmer</item-type>
                <label>Brightness</label>
                <description>Controls the brightness and switches the light on and off</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <tags>
                        <tag>Control</tag>
                        <tag>Light</tag>

diff --git a/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml
index b3b40832e227cf810c83754019f81be433eb8982..d5d40b6ae870066e9633da2ba389614f637a8d4b 100644 (file)
--- a/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1272,7 +1272,7 @@
                <item-type>Dimmer</item-type>
                <label>Light Level</label>
                <description>Increase/decrease the light level</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <state min="0" max="100" pattern="%d %%"/>
        </channel-type>
 

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 7487cb3d71cc2ed39c22a3d77e00e2359a31c581..a458a510e28981874c8bd11842c44938b245d821 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
@@ -27,7 +27,7 @@
                <label>Brightness</label>
                <description>The brightness channel allows to control the brightness of a light. It is also possible to switch the
                        light on and off.</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <tags>
                        <tag>Control</tag>
                        <tag>Light</tag>

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 caefd2555837fd07f73f0d91bfbb20b86503fe71..ca335f2e63007d76972c7a5cf077ed0e66d5aa4e 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
@@ -21,7 +21,7 @@
                <item-type>Dimmer</item-type>
                <label>Brightness</label>
                <description>Control the brightness and switch the light ON and OFF</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <tags>
                        <tag>Control</tag>
                        <tag>Light</tag>

diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/lights.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/lights.xml
index 73eb4a984c0a30b9d5e94300414a71fb375cd9b1..3ce0f70fbc4836a39900327bb472966bd7185616 100644 (file)
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/lights.xml
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/lights.xml
@@ -241,7 +241,7 @@
                <item-type>Dimmer</item-type>
                <label>Brightness</label>
                <description>Brightness: 0..100%</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <state min="0" max="100" step="1" readOnly="false"></state>
        </channel-type>
        <channel-type id="colorEffectBulb">

diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
index 6750155773b349ecbea0324a8f376c5b88fc9c8f..9e33f9f68b4c0d6558ea4e515ccdf8d606d55490 100644 (file)
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
@@ -254,7 +254,6 @@
        <thing-type id="shellydimmer">
                <label>Shelly Dimmer (SHDM-1)</label>
                <description>Shelly Dimmer</description>
-               <category>DimmableLight</category>
                <channel-groups>
                        <channel-group id="relay" typeId="dimmerChannel"/>
                        <channel-group id="meter" typeId="meter"/>
@@ -268,7 +267,6 @@
        <thing-type id="shellydimmer2">
                <label>Shelly Dimmer 2 (SHDM-2)</label>
                <description>Shelly Dimmer 2</description>
-               <category>DimmableLight</category>
                <channel-groups>
                        <channel-group id="relay" typeId="dimmerChannel"/>
                        <channel-group id="meter" typeId="meter"/>
@@ -447,7 +445,7 @@
                <item-type>Dimmer</item-type>
                <label>Brightness</label>
                <description>Light brightness in %</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
        <channel-type id="meterWatts">
                <item-type>Number:Power</item-type>

diff --git a/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/thing/thing-types.xml
index 98ad625134377a089c54b8784f28ec23608e8379..cba483c4014dc903b9c5a1fb286973912e5312df 100644 (file)
--- a/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1387,7 +1387,7 @@
        <channel-type id="level-channel">
                <item-type>Dimmer</item-type>
                <label>Light Level</label>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <channel-type id="volumeLevel-channel">

diff --git a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
index 7b2abab9873f9af58ad4a0765dbb8be08ddb6fe5..393289607d73bfc9eb9dc5c6288daae50311a710 100644 (file)
--- a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1265,7 +1265,7 @@
                <item-type>Dimmer</item-type>
                <label>Dimmer Brightness</label>
                <description>The brightness can be set in 16 steps for RGBW/White leds and in 64 steps for RGBWW leds</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <state min="0" max="100" step="1" pattern="%d"/>
        </channel-type>
 
@@ -1273,14 +1273,14 @@
                <item-type>Switch</item-type>
                <label>White Mode</label>
                <description>Switch lamp to white mode</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <channel-type id="rollerBrightness">
                <item-type>RollerShutter</item-type>
                <label>Roller Brightness</label>
                <description>Brightness Up/Down</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <state readOnly="false"/>
        </channel-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/thing/thing-types.xml
index a060ece8d5cf124a3c4f153a76e8d340dce46417..b7e7096d6bedac068e4d3b84c4529882cfa1b30e 100644 (file)
--- a/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/thing/thing-types.xml
@@ -916,7 +916,7 @@
                <item-type>Dimmer</item-type>
                <label>Brightness</label>
                <description>Brightness control for dimmer action in Velbus</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
        <channel-type id="rollershutter">
                <item-type>Rollershutter</item-type>

diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
index 12ef8a10a71d273ae528182a69528c2395d59536..e21fdba0f325fac1a88a12d34d7d4e7c2111a238 100644 (file)
--- a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
@@ -342,7 +342,7 @@
                        It is also possible to switch the
                        light on and off.
                </description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <channel-type id="relay">

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 e97550b41db0f9cd2851135be0000f48e9036a30..80ac393748c66788d2707659419b407b92d76e80 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
@@ -87,7 +87,7 @@
                <item-type>Dimmer</item-type>
                <label>Segment Brightness</label>
                <description>Changes the brightness of the whole segment</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <channel-type id="primaryColor" advanced="true">
@@ -101,7 +101,7 @@
                <item-type>Dimmer</item-type>
                <label>Primary White</label>
                <description>Changes the brightness of the primary white LED</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <channel-type id="secondaryColor" advanced="true">
@@ -115,7 +115,7 @@
                <item-type>Dimmer</item-type>
                <label>Secondary White</label>
                <description>Changes the brightness of the secondary white LED</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <channel-type id="tertiaryColor" advanced="true">
@@ -129,7 +129,7 @@
                <item-type>Dimmer</item-type>
                <label>Tertiary White</label>
                <description>Changes the brightness of the third white LED</description>
-               <category>DimmableLight</category>
+               <category>Light</category>
        </channel-type>
 
        <channel-type id="palettes">

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 accfef0f2df748fd1ee0b3485d5bd83bd2b26ede..4534a54436e48e83c65af2326cf777c7e2d1e0cf 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
@@ -12,7 +12,7 @@
                        It is also possible to switch the
                        light on and off.
                </description>
-               <category>DimmableLight</category>
+               <category>Light</category>
                <tags>
                        <tag>Control</tag>
                        <tag>Light</tag>
@@ -36,7 +36,7 @@
                <item-type>Dimmer</item-type>
                <label>Color Temperature</label>
                <description>The CT channel allows to control the CT of a light.</description>
-               <category>DimmableCT</category>
+               <category>ColorLight</category>
                <tags>
                        <tag>Control</tag>
                        <tag>ColorTemperature</tag>