diff --git a/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/thing/kecontact.xml b/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/thing/kecontact.xml index 82f9e89378..8cdea0a474 100644 --- a/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/thing/kecontact.xml +++ b/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/thing/kecontact.xml @@ -112,6 +112,10 @@ Switch State of the vehicle plug, e.g. ON if plugged in, OFF if unplugged + + Status + Enabled + @@ -124,12 +128,20 @@ Switch Activation state of the wallbox (System) + + Switch + Mode + Switch Activation state of the wallbox (User) + + Switch + Mode + @@ -148,12 +160,20 @@ Number:ElectricCurrent Preset Current + + Setpoint + Current + Number:ElectricCurrent Current + + Measurement + Current + @@ -196,12 +216,20 @@ Number:ElectricPotential Voltage + + Measurement + Voltage + Number:Power Active Power + + Measurement + Power + @@ -214,18 +242,30 @@ Number:Energy Power consumption + + Measurement + Energy + Number:Energy Total energy consumption is added up after each completed charging session + + Measurement + Energy + String Text to show on the P30 Series C or X display + + Status + Info + diff --git a/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/thing/device.xml b/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/thing/device.xml index 16c6b69ce7..0f57739cce 100644 --- a/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/thing/device.xml +++ b/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/thing/device.xml @@ -41,12 +41,20 @@ Switch A channel to manage a generic Group Addresses with a DPT compatible with Switch Items + + Switch + Power + Switch Control a switch item via KNX (i.e. the status is not owned by KNX) + + Switch + Power + @@ -55,12 +63,20 @@ Dimmer A channel to control a dimmer + + Control + Brightness + Dimmer Control a dimmer item via KNX (i.e. the status is not owned by KNX) + + Control + Brightness + @@ -69,12 +85,20 @@ Rollershutter A channel to control a rollershutter + + Control + OpenLevel + Rollershutter Control a rollershutter item (i.e. the status is not owned by KNX) + + Control + OpenLevel + @@ -83,12 +107,20 @@ Color A channel to control color information (RGB) + + Control + Color + Color Control a color item (i.e. the status is not owned by KNX) + + Control + Color + @@ -97,12 +129,20 @@ Contact A channel to manage a generic Group Addresses with a DPT compatible with Contact Items + + Control + OpenState + Contact Control a contact item (i.e. the status is not owned by KNX) + + Control + OpenState + @@ -111,12 +151,20 @@ Number A channel to manage a generic Group Addresses with a DPT compatible with Number Items + + Control + OpenLevel + Number Control a number item (i.e. the status is not owned by KNX) + + Control + OpenLevel + @@ -125,12 +173,20 @@ String A channel to manage a generic Group Addresses with a DPT compatible with String Items + + Control + Info + String Control a string item (i.e. the status is not owned by KNX) + + Control + Info + @@ -139,12 +195,20 @@ DateTime A channel to manage a generic Group Addresses with a DPT compatible with DateTime Items + + Control + Timestamp + DateTime Control a date/time item (i.e. the status is not owned by KNX) + + Control + Timestamp + diff --git a/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/thing/thing-types.xml index c921faffc2..8ee68a4a8e 100644 --- a/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/thing/thing-types.xml @@ -23,6 +23,10 @@ Switch This zone is a read only switch type zone + + Status + Power + @@ -54,6 +58,10 @@ Number:Temperature This zone measures temperature + + Measurement + Temperature + @@ -89,6 +97,10 @@ Number:Dimensionless This zone measures humidity + + Measurement + Humidity + @@ -110,6 +122,10 @@ Switch This zone is an actuator + + Switch + Power + @@ -152,6 +168,10 @@ Switch This zone is a read only switch type zone + + Status + Power + @@ -188,6 +208,10 @@ Switch This zone is an actuator + + Switch + Power + @@ -234,6 +258,10 @@ Number:Temperature This zone measures temperature + + Measurement + Temperature + @@ -270,6 +298,10 @@ Number:Dimensionless This zone measures humidity + + Measurement + Humidity + diff --git a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/clock-app.xml b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/clock-app.xml index 3906028968..c67759d79a 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/clock-app.xml +++ b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/clock-app.xml @@ -29,6 +29,10 @@ DateTime Set the alarm to a specific time (date is ignored) + + Control + Timestamp + String diff --git a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/countdown-app.xml b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/countdown-app.xml index d0a9b9ef60..c4d8034f54 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/countdown-app.xml +++ b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/countdown-app.xml @@ -29,6 +29,10 @@ Number Set the duration of the timer in seconds + + Control + Duration + String diff --git a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/device.xml b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/device.xml index 82b128e5e7..f611fe8c65 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/device.xml +++ b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/device.xml @@ -42,6 +42,10 @@ Dimmer Adjust the brightness of the display + + Control + Brightness + @@ -62,12 +66,20 @@ Adjust the volume of the speaker soundvolume + + Control + SoundVolume + Switch Switch Bluetooth on/off + + Switch + Power + diff --git a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/radio-app.xml b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/radio-app.xml index e09f1498a3..b1394a290a 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/radio-app.xml +++ b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/radio-app.xml @@ -31,6 +31,10 @@ Player Player control + + Control + MediaControl + diff --git a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/stopwatch-app.xml b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/stopwatch-app.xml index 2f8fb3e9fd..9cc483d575 100644 --- a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/stopwatch-app.xml +++ b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/thing/stopwatch-app.xml @@ -28,6 +28,10 @@ String Send a command to the stopwatch app + + Control + Mode + diff --git a/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/thing/thing-types.xml index 20e9f64fe6..5d5ceb1886 100644 --- a/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/thing/thing-types.xml @@ -85,18 +85,30 @@ Dimmer + + Control + Brightness + veto Color + + Control + Color + veto String + + Control + Light + @@ -132,6 +144,10 @@ Switch + + Switch + Power + veto @@ -168,6 +184,10 @@ Rollershutter + + Control + OpenLevel + veto @@ -312,6 +332,10 @@ Contact + + Alarm + OpenState + veto 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 4bf73f96a9..be9e74cfdb 100644 --- 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 @@ -90,6 +90,10 @@ Current battery charge. BatteryLevel + + Measurement + Energy + @@ -108,16 +112,28 @@ Switch Start cleaning / return home. + + Switch + Power + Switch Start cleaning. + + Switch + Power + Switch Return home. + + Switch + Mode + Switch @@ -128,16 +144,28 @@ Switch Turbo mode ON, OFF. + + Switch + Mode + Switch Repeat cleaning ON, OFF. + + Switch + Mode + String Cleaning mode. + + Status + Mode + @@ -182,6 +210,10 @@ DateTime Last time the HomBot cleaned. + + Status + Timestamp + diff --git a/bundles/org.openhab.binding.lgthinq/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.lgthinq/src/main/resources/OH-INF/thing/channels.xml index 67998cd01f..465e6b5454 100644 --- a/bundles/org.openhab.binding.lgthinq/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.lgthinq/src/main/resources/OH-INF/thing/channels.xml @@ -8,6 +8,10 @@ Current temperature. Temperature + + Measurement + Temperature + @@ -56,24 +60,40 @@ Switch Switch + + Switch + Mode + Switch Switch + + Switch + Mode + Switch Switch + + Switch + Mode + Switch Switch + + Switch + Mode + @@ -81,6 +101,10 @@ Fan Vertical Direction wind + + Control + Airflow + @@ -88,6 +112,10 @@ Fan Horizontal Direction wind + + Control + Airflow + @@ -95,6 +123,10 @@ Target temperature. Temperature + + Setpoint + Temperature + @@ -119,6 +151,10 @@ Current Energy Consumption (kWh) Energy + + Measurement + Energy + @@ -127,12 +163,20 @@ AC Wind Strength Wind + + Control + Airflow + Number AC Operation Mode + + Control + Airconditioning + @@ -146,12 +190,20 @@ Switch Remote Start/Stop + + Switch + Mode + Switch Standby Mode + + Switch + Mode + @@ -171,6 +223,10 @@ String Spin Speed + + Status + Speed + @@ -178,6 +234,10 @@ String Spin Speed + + Status + Speed + @@ -237,6 +297,10 @@ Target Temperature Level Temperature + + Setpoint + Temperature + @@ -244,11 +308,19 @@ Target Temperature Level Temperature + + Setpoint + Temperature + String Door Lock + + Status + LockState + @@ -296,6 +368,10 @@ String Dryer Child Lock + + Status + LockState + @@ -308,6 +384,10 @@ DateTime Dryer Remaining Time + + Status + Progress + @@ -328,6 +408,10 @@ Contact Door status (at least one if combined fridge/freezer) + + Status + OpenState + @@ -352,6 +436,10 @@ Freezer target temperature Temperature + + Setpoint + Temperature + @@ -360,6 +448,10 @@ Fridge target temperature Temperature + + Setpoint + Temperature + @@ -367,41 +459,69 @@ String Express Freeze Mode + + Status + Mode + Switch Express Cool + + Switch + Mode + Switch Vacation Mode + + Switch + Mode + Switch Ice Plus Feature + + Switch + Mode + Switch Smart Saving + + Switch + Mode + String Smart Saving Mode + + Status + Mode + Switch Active Saving + + Switch + Mode + 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 b554eeb1fb..eae088b16a 100644 --- 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 @@ -11,7 +11,7 @@ Light Control - Light + Brightness @@ -23,7 +23,7 @@ ColorLight Control - Light + Color @@ -57,6 +57,10 @@ String Controls the effect of the light + + Control + Mode + diff --git a/bundles/org.openhab.binding.liquidcheck/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.liquidcheck/src/main/resources/OH-INF/thing/thing-types.xml index b6f93ea06f..a78efdb3a6 100644 --- a/bundles/org.openhab.binding.liquidcheck/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.liquidcheck/src/main/resources/OH-INF/thing/thing-types.xml @@ -62,18 +62,30 @@ Number:Length Level in the container + + Measurement + Level + Number:Length Level in the container as measured by the device + + Measurement + Level + Number:Dimensionless Indicates the fill level based on max content and measured content + + Measurement + Level + diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/thing/channels.xml index c3ab274c94..1d4c7e6b17 100644 --- a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/thing/channels.xml @@ -10,6 +10,10 @@ Switches the current on/off Switch + + Switch + Power + @@ -18,6 +22,10 @@ Dims the connected light Lightbulb + + Control + Brightness + @@ -26,6 +34,10 @@ Controls the blinds Blinds + + Control + OpenLevel + @@ -40,6 +52,10 @@ Switches the state on/off Switch + + Switch + Power + @@ -120,6 +136,10 @@ Shows the open/close state Contact + + Status + OpenState + @@ -129,6 +149,10 @@ Shows if smoke was detected Smoke + + Alarm + Smoke + @@ -170,6 +194,10 @@ The count of detected motions Motion + + Measurement + Motion + @@ -179,6 +207,10 @@ Shows the detected luminance in percent Sun + + Measurement + Illuminance + @@ -197,6 +229,10 @@ The energy consumption per month in kWh Energy + + Measurement + Energy + @@ -206,6 +242,10 @@ The absolute energy consumption Energy + + Measurement + Energy + @@ -233,6 +273,10 @@ The energy consumption per day in kWh Energy + + Measurement + Energy + @@ -242,6 +286,10 @@ The current power consumption in Watt Energy + + Measurement + Power + @@ -251,6 +299,10 @@ The energy generation per month in kWh Energy + + Measurement + Energy + @@ -260,6 +312,10 @@ The total energy generation Energy + + Measurement + Energy + @@ -287,6 +343,10 @@ The energy generation per day in kWh Energy + + Measurement + Energy + @@ -296,6 +356,10 @@ The current power generation in Watt Energy + + Measurement + Power + @@ -305,6 +369,10 @@ The total energy consumption Energy + + Measurement + Energy + @@ -314,6 +382,10 @@ The energy feed per month in kWh Energy + + Measurement + Energy + @@ -323,6 +395,10 @@ The total energy fed Energy + + Measurement + Energy + @@ -341,6 +417,10 @@ The energy feed per day in Euro Energy + + Measurement + Energy + @@ -350,6 +430,10 @@ The energy feed per day in kWh Energy + + Measurement + Energy + diff --git a/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/thing/thing-types.xml index 6bf5064f0c..6a906b8802 100644 --- a/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/thing/thing-types.xml @@ -139,6 +139,10 @@ Switch Loxone's virtual input of switch type and push button controls. + + Switch + Power + @@ -152,6 +156,10 @@ Rollershutter Loxone's Jalousies (rollershutters, blinds). + + Control + OpenLevel + @@ -185,6 +193,10 @@ Number Loxone's light controllers (LightController). + + Control + Light + @@ -212,12 +224,20 @@ Dimmer Loxone's dimmer control + + Control + Brightness + Color Loxone's Color Picker V2 control + + Control + Color + 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 0b53d25171..1912b37736 100644 --- 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 @@ -1275,6 +1275,10 @@ Increase/decrease the light level Light + + Control + Brightness + @@ -1283,6 +1287,10 @@ Raise/lower the shade level Rollershutter + + Control + OpenLevel + @@ -1291,6 +1299,10 @@ Raise/lower the blind level Rollershutter + + Control + OpenLevel + @@ -1299,6 +1311,10 @@ Tilt the blinds up/down Rollershutter + + Control + Tilt + @@ -1307,6 +1323,10 @@ On/off status of the switch Switch + + Switch + Power + @@ -1314,12 +1334,20 @@ Occupancy status Motion + + Status + Presence + String + + Control + Speed + @@ -1335,6 +1363,10 @@ String Motion + + Status + Presence + @@ -1406,6 +1438,10 @@ Today's sunrise/sunset time Schedule + + Calculation + Timestamp + @@ -1529,6 +1565,10 @@ Specifies the intensity of the zone Zone + + Control + Brightness + diff --git a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/thing/thing-types.xml index b47bb4f427..796e1b1218 100644 --- a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/thing/thing-types.xml @@ -95,6 +95,10 @@ Switch control for action in Luxom. Switch + + Switch + Power + veto diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml index 48bbe1139a..c8a995fe07 100644 --- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml @@ -8,6 +8,10 @@ Number:Temperature Temperature + + Measurement + Temperature + @@ -15,6 +19,10 @@ Number:Temperature Temperature + + Measurement + Temperature + @@ -22,6 +30,10 @@ Number:Temperature Temperature + + Setpoint + Temperature + @@ -29,6 +41,10 @@ Number:Temperature Temperature + + Measurement + Temperature + @@ -43,6 +59,10 @@ Number:Temperature Temperature + + Measurement + Temperature + @@ -50,6 +70,10 @@ Number:Temperature Temperature + + Calculation + Temperature + @@ -57,6 +81,10 @@ Number:Temperature Temperature + + Measurement + Temperature + @@ -1358,6 +1386,10 @@ Number:Energy Energy + + Measurement + Energy + @@ -1365,6 +1397,10 @@ Number:Energy Energy + + Measurement + Energy + @@ -1372,6 +1408,10 @@ Number:Energy Energy + + Measurement + Energy + @@ -1379,6 +1419,10 @@ Number:Energy Energy + + Measurement + Energy + @@ -2072,6 +2116,10 @@ Number:Temperature Temperature + + Setpoint + Temperature + @@ -2147,6 +2195,10 @@ Number:Temperature Temperature + + Setpoint + Temperature + @@ -2172,6 +2224,10 @@ Number:Temperature Temperature + + Measurement + Temperature + @@ -2179,6 +2235,10 @@ Number:Temperature Temperature + + Setpoint + Temperature + diff --git a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml index 16b04571c7..da487c4709 100644 --- a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml @@ -92,6 +92,10 @@ Number Send channel number to switch program + + Control + Channel + @@ -119,6 +123,10 @@ String Running program + + Status + Info + @@ -126,6 +134,10 @@ String Some info on the running program + + Status + Info + @@ -133,6 +145,10 @@ DateTime Program start time + + Status + Timestamp + @@ -140,6 +156,10 @@ Number:Time Duration of the program + + Status + Duration + @@ -147,6 +167,10 @@ Number:Time Play Position since program started + + Measurement + Progress + diff --git a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml index ac7316c322..b6889669fc 100644 --- a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml @@ -430,6 +430,10 @@ String Thermostat Mode Setting + + Control + Mode + @@ -477,6 +481,10 @@ Contact state information Contact + + Status + OpenState + diff --git a/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/thing/channels.xml index ce722a0dac..8223b03402 100644 --- a/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/thing/channels.xml @@ -57,6 +57,10 @@ channel type for MCP23017 pin in DIGITAL_INPUT mode (contact) Contact + + Status + OpenState + @@ -66,6 +70,10 @@ channel type for MCP23017 pin in DIGITAL_INPUT mode (switch) Switch + + Status + Power + diff --git a/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/thing/thing-types.xml index 06d2877970..ca3b03859a 100644 --- a/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/thing/thing-types.xml @@ -362,6 +362,10 @@ Number:Frequency Frequency in Hertz + + Measurement + Frequency + @@ -382,6 +386,10 @@ Number:ElectricPotential Average N – Phase Voltage in Volt + + Measurement + Voltage + @@ -425,6 +433,10 @@ Number:Power Active power consumed + + Measurement + Power + @@ -462,6 +474,10 @@ Forward Active Energy in kWh Energy + + Measurement + Energy + @@ -476,6 +492,10 @@ Forward Active Energy all phase in kWh Energy + + Measurement + Energy + @@ -509,6 +529,10 @@ Reverse Active Energy in kWh Energy + + Measurement + Energy + diff --git a/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/thing/channels.xml index c22a0e21c3..f078d2a137 100644 --- a/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/thing/channels.xml @@ -9,6 +9,10 @@ Switch Power status of device + + Switch + Power + @@ -29,6 +33,10 @@ DateTime Last communication time between device and MELCloud + + Status + Timestamp + @@ -36,6 +44,10 @@ DateTime Next communication time between device and MELCloud + + Status + Timestamp + @@ -44,6 +56,10 @@ String Operation mode + + Status + Mode + @@ -59,6 +75,10 @@ Number:Temperature Set temperature + + Control + Temperature + @@ -66,6 +86,10 @@ String Fan speed + + Status + Speed + @@ -82,6 +106,10 @@ String Vane horizontal + + Status + Tilt + @@ -99,6 +127,10 @@ String Vane vertical + + Status + Tilt + @@ -116,6 +148,10 @@ Number:Temperature Room temperature + + Measurement + Temperature + @@ -124,6 +160,10 @@ Number:Temperature Temperature of water i + + Measurement + Temperature + @@ -131,12 +171,20 @@ Switch If water mode is Heat Now (true) or Auto (false) + + Switch + Mode + Number:Temperature Room temperature for zone 1 + + Measurement + Temperature + @@ -144,6 +192,10 @@ Number:Temperature Set temperature for zone 1 + + Setpoint + Temperature + diff --git a/bundles/org.openhab.binding.mffan/src/main/resources/OH-INF/thing/mffan.xml b/bundles/org.openhab.binding.mffan/src/main/resources/OH-INF/thing/mffan.xml index 34d685b19e..39de762dfe 100644 --- a/bundles/org.openhab.binding.mffan/src/main/resources/OH-INF/thing/mffan.xml +++ b/bundles/org.openhab.binding.mffan/src/main/resources/OH-INF/thing/mffan.xml @@ -39,11 +39,19 @@ Switch Fan on/off. + + Switch + Power + String The fan's rotational rate. + + Control + Speed + @@ -59,6 +67,10 @@ String The fan's direction of rotation: Forward (Summer), Reverse (Winter). + + Control + Mode + @@ -70,11 +82,19 @@ Switch Wind (sometimes referred to as "Breeze Mode") on/off. + + Switch + Mode + String The amount of the wind being produced. + + Control + Mode + @@ -87,11 +107,19 @@ Switch Light on/off. + + Switch + Light + Number:Dimensionless The light intensity. + + Control + Brightness + diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml index b65eae3edc..b07c938a20 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml @@ -58,6 +58,10 @@ Programmed start time of the program Time + + Status + Timestamp + @@ -66,6 +70,10 @@ End time of the program (programmed or running) Time + + Status + Timestamp + @@ -74,6 +82,10 @@ Duration of the program running on the appliance Time + + Status + Duration + @@ -82,6 +94,10 @@ Time elapsed in the program running on the appliance Time + + Status + Progress + @@ -90,6 +106,10 @@ Time to finish the program running on the appliance Time + + Status + Duration + @@ -97,6 +117,10 @@ Contact Current state of the door of the appliance + + Status + OpenState + @@ -120,6 +144,10 @@ Switch the appliance on or off Switch + + Switch + Power + @@ -172,6 +200,10 @@ Switch Start or stop Super Cooling + + Switch + Enabled + @@ -193,6 +225,10 @@ Switch Start or stop Super Freezing + + Switch + Enabled + 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 6ed1a4d587..0de254083d 100644 --- 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 @@ -7,12 +7,20 @@ Switch + + Switch + Mode + Rollershutter Blinds + + Control + OpenLevel + @@ -30,7 +38,7 @@ Light Control - Light + Brightness @@ -41,6 +49,10 @@ This channel shows the brightness of the environment of the device. + + Measurement + Illuminance + @@ -51,7 +63,7 @@ ColorLight Control - Light + Color @@ -76,12 +88,20 @@ This channel controls the volume of the gateway for playing sounds SoundVolume + + Control + SoundVolume + Switch + + Switch + SoundVolume + @@ -93,6 +113,10 @@ Number:Time + + Control + Duration + @@ -100,12 +124,20 @@ Switch Gas + + Alarm + Gas + Switch + + Alarm + Water + @@ -119,6 +151,10 @@ Number:Temperature Temperature + + Measurement + Temperature + @@ -127,6 +163,10 @@ Number:Dimensionless Humidity + + Measurement + Humidity + @@ -135,6 +175,10 @@ Number:Pressure Pressure + + Measurement + Pressure + @@ -143,6 +187,10 @@ Contact Contact + + Status + OpenState + @@ -175,6 +223,10 @@ Switch Motion + + Status + Motion + @@ -204,6 +256,10 @@ Switch PowerOutlet + + Switch + Power + @@ -215,18 +271,30 @@ Number + + Measurement + Power + Number + + Measurement + Energy + Number + + Measurement + ParticulateMatter + @@ -234,6 +302,10 @@ Switch Smoke + + Alarm + Smoke + diff --git a/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/sensor_vibration.xml b/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/sensor_vibration.xml index c2faaa1440..2c278f07e2 100644 --- a/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/sensor_vibration.xml +++ b/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/thing/sensor_vibration.xml @@ -43,6 +43,10 @@ Number + + Measurement + Tilt + diff --git a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml index f0a6b87633..33b3a6ec22 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml +++ b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml @@ -18,18 +18,34 @@ Color + + Control + Color + Contact + + Status + OpenState + DateTime + + Status + Timestamp + Dimmer + + Control + Brightness + Image @@ -38,18 +54,33 @@ Location + + Measurement + GeoLocation + Number + + Control + Player + + Control + MediaControl + Rollershutter + + Control + OpenLevel + String @@ -58,6 +89,10 @@ Switch + + Switch + Power + @@ -74,6 +109,10 @@ Number + + Measurement + RSSI + @@ -94,6 +133,10 @@ Switch + + Switch + Power + diff --git a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/vacuumThing.xml b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/vacuumThing.xml index 92246766bb..1838c5bd78 100644 --- a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/vacuumThing.xml +++ b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/vacuumThing.xml @@ -141,6 +141,10 @@ Number + + Control + Speed + @@ -320,6 +324,10 @@ Number + + Control + Speed + 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 7d884296c1..b4c770c5f7 100644 --- 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 @@ -8,6 +8,10 @@ Switch Switch to night mode, a very dimmed brightness mode + + Switch + Mode + @@ -19,6 +23,10 @@ Switch Switch to white mode, which basically sets the saturation to 0 (turns off the color leds) + + Switch + Mode + @@ -47,7 +55,7 @@ ColorLight Control - Light + Color @@ -58,7 +66,7 @@ Light Control - Light + Brightness @@ -77,6 +85,10 @@ support 64 steps Light + + Control + ColorTemperature + @@ -84,6 +96,10 @@ Dimmer The speed of some animations can be increased or decreased + + Control + Speed + @@ -99,6 +115,10 @@ Animation mode of your LED. RGBWW leds support 9 animation modes. Light + + Control + Mode + 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 7c69e912a8..b93b74ac1d 100644 --- 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 @@ -18,12 +18,20 @@ Number:Temperature Heating + + Setpoint + Temperature + Number:Temperature Heating + + Setpoint + Temperature + @@ -31,6 +39,10 @@ Set temperature away mode Heating + + Setpoint + Temperature + @@ -47,6 +59,10 @@ Number:Temperature Heating + + Setpoint + Temperature + @@ -54,6 +70,10 @@ Current state of the heater or heaters in room Energy + + Status + Heating + @@ -66,17 +86,29 @@ Switch Master ON/OFF switch for independent heater + + Switch + Power + Switch Current state of heater fan (if available, OFF if not found) Flow + + Switch + Power + Contact Open window/cold air flow detection + + Status + OpenState + @@ -84,11 +116,19 @@ Actual energy usage in watts Energy + + Measurement + Power + String + + Status + Mode + @@ -120,11 +160,19 @@ Switch Toggles vacation mode. Start and end time must be preset before activating + + Switch + Mode + Switch Use room Away mode temperatures instead of home global temperature + + Switch + Mode + DateTime diff --git a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml index 93092d1f05..71a481587e 100644 --- a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml @@ -7,54 +7,90 @@ Number:Power Photovoltaic Power Production + + Measurement + Power + Number:Power Battery discharges and provides Power + + Measurement + Power + Number:Power Battery charges and consumes Power + + Measurement + Power + Number:Power Household consuming Power + + Measurement + Power + Number:Power More Photovoltaic Power is produced than needed. Additional Power is consumed by Grid + + Measurement + Power + Number:Power Grid Power is needed in order to satisfy your overall Power consumption + + Measurement + Power + Number:Power Power produced by an external device which is attached to your E3DC device + + Measurement + Power + Number:Power Power consumption of attached Wallboxes + + Measurement + Power + Number:Power Photovoltaic Power consumption (PV plus Battery) of attached Wallboxes + + Measurement + Power + @@ -73,18 +109,30 @@ Number:Dimensionless Charge Level of your attached Battery in Percent + + Status + Energy + Number:Energy Charged energy of battery + + Measurement + Energy + Number:Energy Open energy capacity of battery + + Measurement + Energy + diff --git a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/strings-channel-types.xml b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/strings-channel-types.xml index 9638f2290e..6ad83164d3 100644 --- a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/strings-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/strings-channel-types.xml @@ -7,54 +7,90 @@ Number:ElectricPotential Voltage on String 1 + + Measurement + Voltage + Number:ElectricPotential Voltage on String 2 + + Measurement + Voltage + Number:ElectricPotential Voltage on String 3 + + Measurement + Voltage + Number:ElectricCurrent Current on String 1 + + Measurement + Current + Number:ElectricCurrent Current on String 2 + + Measurement + Current + Number:ElectricCurrent Current on String 3 + + Measurement + Current + Number:Power Power produced by String 1 + + Measurement + Power + Number:Power Power produced by String 2 + + Measurement + Power + Number:Power Power produced by String 3 + + Measurement + Power + diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/thing/thing-types.xml index 12029740f7..74735db80a 100644 --- a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/thing/thing-types.xml @@ -321,6 +321,10 @@ Switch Used for functionality that can be enabled or disabled + + Switch + Mode + @@ -335,6 +339,10 @@ Switch Used for configurations that can be on or off + + Switch + Power + @@ -423,6 +431,9 @@ Number:Dimensionless Percentage + + Measurement + @@ -431,6 +442,10 @@ Temperature in °C Temperature + + Measurement + Temperature + @@ -438,6 +453,9 @@ Number:Dimensionless Measurement of a sensor + + Measurement + @@ -462,6 +480,10 @@ Number RPM + + Status + Speed + @@ -483,6 +505,10 @@ DateTime Date + + Status + Timestamp + @@ -584,6 +610,10 @@ Output power of preheater/afterheater (in percent) Energy + + Measurement + Heating + @@ -633,6 +663,10 @@ String Errors / warnings / infos as string + + Status + Info + diff --git a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-alarm-channel-types.xml b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-alarm-channel-types.xml index 9a3b19b18f..ccefb2d865 100644 --- a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-alarm-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-alarm-channel-types.xml @@ -7,5 +7,8 @@ Contact Current alarm-state of your heat pump + + Alarm + diff --git a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-charging-circuit-channel-types.xml b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-charging-circuit-channel-types.xml index f325705d3d..ede6b3ec2e 100644 --- a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-charging-circuit-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-charging-circuit-channel-types.xml @@ -7,18 +7,30 @@ Number:Temperature B16 - Flow Temperature + + Measurement + Temperature + Number:Temperature B17 - Return Temperature + + Measurement + Temperature + Number:VolumetricFlowRate P13 - Flow speed + + Measurement + Speed + diff --git a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-energy-source-channel-types.xml b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-energy-source-channel-types.xml index 2ceeba71ba..689040fc0e 100644 --- a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-energy-source-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-energy-source-channel-types.xml @@ -7,18 +7,30 @@ Number:Temperature B14 - Exit Temperature Energy Source + + Measurement + Temperature + Number:Temperature B15 - Incoming Temperature Energy Source + + Measurement + Temperature + Number:Temperature BOT - Sensor Outside Temperature + + Measurement + Temperature + diff --git a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-power-channel-types.xml b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-power-channel-types.xml index 04f65a65d4..b5c6b842e0 100644 --- a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-power-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-power-channel-types.xml @@ -27,42 +27,74 @@ Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + diff --git a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-pv-modulation-channel-types.xml b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-pv-modulation-channel-types.xml index 5791762cf2..e114c77b04 100644 --- a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-pv-modulation-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-pv-modulation-channel-types.xml @@ -11,16 +11,28 @@ Number:Power + + Measurement + Power + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + diff --git a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-state-channel-types.xml b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-state-channel-types.xml index 9853a2341c..e73fc36008 100644 --- a/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-state-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.kermi/src/main/resources/OH-INF/thing/xcenter-state-channel-types.xml @@ -25,5 +25,8 @@ Contact If there's a global alarm + + Alarm + diff --git a/bundles/org.openhab.binding.modbus.sbc/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.modbus.sbc/src/main/resources/OH-INF/thing/thing-types.xml index d62cd11cb7..eb7d9fe4a1 100644 --- a/bundles/org.openhab.binding.modbus.sbc/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.modbus.sbc/src/main/resources/OH-INF/thing/thing-types.xml @@ -51,30 +51,50 @@ Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:ElectricPotential + + Measurement + Voltage + Number:ElectricCurrent + + Measurement + Current + @@ -82,6 +102,10 @@ Number:Power Negative numbers mean feeding back + + Measurement + Power + @@ -89,6 +113,10 @@ Number:Power Negative numbers mean feeding back + + Measurement + Power + diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/resources/OH-INF/thing/heatpump-channel-types.xml b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/resources/OH-INF/thing/heatpump-channel-types.xml index 73afff13e1..98ac2b72d2 100644 --- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/resources/OH-INF/thing/heatpump-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/resources/OH-INF/thing/heatpump-channel-types.xml @@ -7,63 +7,111 @@ Number:Temperature + + Measurement + Temperature + Number:Temperature + + Setpoint + Temperature + Number:Dimensionless + + Measurement + Humidity + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + @@ -71,42 +119,74 @@ Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + @@ -151,21 +231,37 @@ Number:Temperature + + Setpoint + Temperature + Number:Temperature + + Setpoint + Temperature + Number:Temperature + + Setpoint + Temperature + Number:Temperature + + Setpoint + Temperature + diff --git a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/BSP-channel-types.xml b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/BSP-channel-types.xml index 39dbdaa3c5..2a6f28bb7e 100644 --- a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/BSP-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/BSP-channel-types.xml @@ -7,18 +7,30 @@ Number:Power + + Measurement + Power + Number:Dimensionless + + Status + Energy + Number:Temperature + + Measurement + Temperature + diff --git a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Common-channel-types.xml b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Common-channel-types.xml index 84ea4f78e7..ab3ad9dbce 100644 --- a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Common-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Common-channel-types.xml @@ -7,12 +7,20 @@ Number:ElectricPotential + + Measurement + Voltage + Number:ElectricCurrent + + Measurement + Current + diff --git a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VarioTrack-channel-types.xml b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VarioTrack-channel-types.xml index 313e11902b..91e6e3bab1 100644 --- a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VarioTrack-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VarioTrack-channel-types.xml @@ -18,24 +18,40 @@ Number:ElectricPotential + + Measurement + Voltage + Number:Power + + Measurement + Power + Number:Energy + + Measurement + Energy + String + + Status + Mode + diff --git a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VariotString-channel-types.xml b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VariotString-channel-types.xml index d76ef0431b..c5f81a0e2a 100644 --- a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VariotString-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/VariotString-channel-types.xml @@ -7,24 +7,40 @@ Number:ElectricPotential + + Measurement + Voltage + Number:ElectricCurrent + + Measurement + Current + Number:Power + + Measurement + Power + Number:Energy + + Measurement + Energy + @@ -51,24 +67,40 @@ Number:ElectricPotential + + Measurement + Voltage + Number:ElectricCurrent + + Measurement + Current + Number:Power + + Measurement + Power + Number:Energy + + Measurement + Energy + @@ -95,30 +127,50 @@ Number:ElectricPotential + + Measurement + Voltage + Number:ElectricCurrent + + Measurement + Current + Number:Power + + Measurement + Power + Number:Energy + + Measurement + Energy + String + + Status + Mode + diff --git a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Xtender-channel-types.xml b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Xtender-channel-types.xml index 00cd830c25..a1e55eefb2 100644 --- a/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Xtender-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.studer/src/main/resources/OH-INF/thing/Xtender-channel-types.xml @@ -7,54 +7,90 @@ Number:ElectricPotential + + Measurement + Voltage + Number:ElectricCurrent + + Measurement + Current + Number:Power + + Measurement + Power + Number:Frequency + + Measurement + Frequency + Number:ElectricPotential + + Measurement + Voltage + Number:ElectricCurrent + + Measurement + Current + Number:Power + + Measurement + Power + Number:Frequency + + Measurement + Frequency + String + + Status + Mode + diff --git a/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/inverter-channel-types.xml b/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/inverter-channel-types.xml index e40ae0b522..e4fed99e49 100644 --- a/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/inverter-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/inverter-channel-types.xml @@ -7,12 +7,20 @@ Number:ElectricCurrent + + Measurement + Current + Number:ElectricCurrent + + Measurement + Current + @@ -20,6 +28,10 @@ Number:ElectricPotential This phase's AC voltage relative to the next phase + + Measurement + Voltage + @@ -27,18 +39,30 @@ Number:ElectricPotential This phase's AC voltage relative to N line + + Measurement + Voltage + Number:Power + + Measurement + Power + Number:Frequency + + Measurement + Frequency + @@ -57,54 +81,90 @@ Number:Dimensionless + + Measurement + Airconditioning + Number:Energy + + Measurement + Energy + Number:ElectricCurrent + + Measurement + Current + Number:ElectricPotential + + Measurement + Voltage + Number:Power + + Measurement + Power + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + Number:Temperature + + Measurement + Temperature + @@ -112,6 +172,10 @@ String Device status + + Status + Mode + diff --git a/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/meter-channel-types.xml b/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/meter-channel-types.xml index c36244b677..f08b1b0ff5 100644 --- a/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/meter-channel-types.xml +++ b/bundles/org.openhab.binding.modbus.sunspec/src/main/resources/OH-INF/thing/meter-channel-types.xml @@ -7,120 +7,212 @@ Number:ElectricPotential + + Measurement + Voltage + Number:ElectricPotential + + Measurement + Voltage + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Power + + Measurement + Power + Number:Dimensionless + + Measurement + Airconditioning + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + Number:Energy + + Measurement + Energy + diff --git a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-types.xml index c44d0b4db4..d9229fc0e9 100644 --- a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-types.xml @@ -7,31 +7,55 @@ Switch Switch item channel + + Switch + Power + Contact Contact item channel + + Status + OpenState + DateTime DateTime item channel + + Status + Timestamp + Dimmer Dimmer item channel + + Control + Brightness + Rollershutter Rollershutter item channel + + Control + OpenLevel + String String item channel + + Status + Info + Number diff --git a/bundles/org.openhab.binding.mqtt.fpp/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.mqtt.fpp/src/main/resources/OH-INF/thing/thing-types.xml index 3410a086f5..30731400e8 100644 --- a/bundles/org.openhab.binding.mqtt.fpp/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.mqtt.fpp/src/main/resources/OH-INF/thing/thing-types.xml @@ -47,6 +47,10 @@ String FPP Player Status + + Status + MediaControl + @@ -65,24 +69,40 @@ String FPP Current Song + + Status + Info + String FPP Current Playlist + + Status + Info + Number:Time FPP Seconds Played + + Status + Progress + Number:Time FPP Seconds Remaining + + Status + Progress + @@ -95,11 +115,19 @@ Player FPP Player Control + + Control + MediaControl + Dimmer FPP Volume of the Output + + Control + SoundVolume + Switch diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/thing/homeassistant-channels.xml b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/thing/homeassistant-channels.xml index a949792f50..b3d0a29eae 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/thing/homeassistant-channels.xml +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/thing/homeassistant-channels.xml @@ -7,18 +7,30 @@ Color + + Control + Color + Dimmer + + Control + Brightness + Number:Dimensionless + + Measurement + Humidity + @@ -31,6 +43,10 @@ Location + + Measurement + GeoLocation + @@ -51,6 +67,10 @@ Rollershutter + + Control + OpenLevel + @@ -69,6 +89,10 @@ Number:Temperature + + Measurement + Temperature + diff --git a/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/thing/homie-channels.xml b/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/thing/homie-channels.xml index 8bee833ee3..fd4ee2c4d0 100644 --- a/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/thing/homie-channels.xml +++ b/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/thing/homie-channels.xml @@ -12,6 +12,9 @@ Color + + Color + diff --git a/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/thing/thing-types.xml index d9b615ddb3..6b382e9e68 100644 --- a/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/thing/thing-types.xml @@ -48,6 +48,10 @@ Received signal strength indicator QualityOfService + + Measurement + RSSI + @@ -89,6 +93,10 @@ Number:ElectricPotential + + Measurement + Voltage + @@ -99,6 +107,10 @@ Number:Dimensionless + + Measurement + Humidity + @@ -114,11 +126,19 @@ Number:Pressure + + Measurement + Pressure + Number:Temperature + + Measurement + Temperature + diff --git a/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml index 1935750d79..759391270f 100644 --- a/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml @@ -157,6 +157,10 @@ Number:Power The current power delivered by the plug + + Measurement + Power + @@ -164,6 +168,10 @@ Number:Energy Energy consumed since last API call + + Measurement + Energy + @@ -172,6 +180,10 @@ Number:Temperature The current temperature at the plug + + Measurement + Temperature + @@ -186,6 +198,10 @@ String The color mode we want the Bulb to set to + + Control + Mode + diff --git a/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readonly-channel-types.xml b/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readonly-channel-types.xml index 0ad15c7512..06a235bc88 100644 --- a/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readonly-channel-types.xml +++ b/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readonly-channel-types.xml @@ -19,6 +19,10 @@ Number:Temperature + + Measurement + Temperature + @@ -31,6 +35,10 @@ Number:ElectricCurrent + + Measurement + Current + @@ -43,18 +51,30 @@ Number:Frequency + + Measurement + Frequency + Number:Energy + + Measurement + Energy + Number:Pressure + + Measurement + Pressure + @@ -67,6 +87,10 @@ Number + + Control + Power + diff --git a/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readwrite-channel-types.xml b/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readwrite-channel-types.xml index df46da34c0..16e647d4cd 100644 --- a/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readwrite-channel-types.xml +++ b/bundles/org.openhab.binding.myuplink/src/main/resources/OH-INF/thing/readwrite-channel-types.xml @@ -7,6 +7,10 @@ Switch + + Switch + Power + @@ -17,6 +21,10 @@ String + + Control + Mode +