Updated external content (Jenkins build 2389)

_addons_bindings/ism8/readme.md

@@ -114,12 +114,22 @@ Thing ism8:device:heater "Wolf Heizung"         [portNumber=12004]
         Type temperature-r  : DpId008 "Außentemperatur"              [id=8, type="9.001"]
         Type switch-r       : DpId009 "Status Flamme"                [id=9, type="1.001"]
         Type pressure-r     : DpId013 "Anlagendruck"                 [id=13, type="9.006"]
+        Type temperature-r  : DpId197 "Abgastemperatur"              [id=197, type="9.001"]
+
         Type switch-r       : DpId053 "Störung Systemmodul"          [id=53, type="1.001"]
         Type temperature-r  : DpId054 "Außentemperatur Systemmodul"  [id=54, type="9.001"]
+        Type switch-rw      : DpId194 "1x Warmwasser"                [id=194, type="1.001"]
+
         Type temperature-rw : DpId056 "Sollwert Warmwasser"          [id=56, type="9.001"]
         Type mode-rw        : DpId057 "Betriebsart Heizkreis"        [id=57, type="20.102"]
         Type mode-rw        : DpId058 "Betriebsart Warmwasser"       [id=58, type="20.103"]
         Type temperature-rw : DpId065 "Sollwertverschiebung"         [id=65, type="9.002"]
+
+        Type switch-r       : DpId135 "Solar Störung"                [id=135, type="1.001"]
+        Type temperature-r  : DpId136 "Solar Wassertemperatur"       [id=136, type="9.001"]
+        Type temperature-r  : DpId137 "Solar Kollektortemperatur"    [id=137, type="9.001"]
+        Type switch-r       : DpId141 "Solar Status Pumpe"           [id=141, type="1.001"]
+
         Type switch-rw      : DpId148 "CWL Störung"                  [id=148, type="1.001"]
         Type mode-rw        : DpId149 "CWL Betriebsart"              [id=149, type="20.102"]
         Type percentage-r   : DpId163 "CWL Lüftungsstufe"            [id=163, type="5.001"]
@@ -128,6 +138,23 @@ Thing ism8:device:heater "Wolf Heizung"         [portNumber=12004]
         Type flowrate-r     : DpId166 "CWL Luftdurchsatz Zuluft"     [id=166, type="13.002"]
         Type flowrate-r     : DpId167 "CWL Luftdurchsatz Abluft"     [id=167, type="13.002"]
         Type switch-r       : DpId192 "CWL Filterwarnung"            [id=192, type="1.001"]
+
+        Type switch-r       : DpId176 "CHA Störung"                  [id=176, type="1.001"]
+        Type mode-r         : DpId177 "CHA Betriebsart"              [id=177, type="20.105"]
+        Type power-r        : DpId178 "CHA Heizleistung"             [id=178, type="9.024"]
+        Type power-r        : DpId179 "CHA Kühlleistung"             [id=179, type="9.024"]
+        Type temperature-r  : DpId180 "CHA Kesseltemperatur"         [id=180, type="9.001"]
+        Type temperature-r  : DpId181 "CHA Sammlertemperatur"        [id=181, type="9.001"]
+        Type temperature-r  : DpId182 "CHA Rücklauftemperatur"       [id=182, type="9.001"]
+        Type temperature-r  : DpId183 "CHA Warmwassertemperatur"     [id=183, type="9.001"]
+        Type temperature-r  : DpId184 "CHA Aussentemperatur"         [id=184, type="9.001"]
+        Type switch-r       : DpId185 "CHA Status Heizkreispumpe"    [id=185, type="1.001"]
+        Type switch-r       : DpId186 "CHA Status Zubringerpumpe"    [id=186, type="1.001"]
+        Type switch-r       : DpId187 "CHA 3-Wege-Ventil HZ/WW"      [id=187, type="1.009"]
+        Type switch-r       : DpId188 "CHA 3-Wege-Ventil HZ/K"       [id=188, type="1.009"]
+        Type switch-r       : DpId189 "CHA Status E-Heizung"         [id=189, type="1.001"]
+        Type pressure-r     : DpId190 "CHA Anlagendruck"             [id=190, type="9.006"]
+        Type power-r        : DpId191 "CHA Leistung"                 [id=191, type="9.024"]
     }
 ```
 
@@ -137,33 +164,62 @@ Thing ism8:device:heater "Wolf Heizung"         [portNumber=12004]
 Switch ISM_HeizungStoerung                            "Störung Heizgerät"                      { channel="ism8:device:heater:DpId001" }
 Number ISM_HeizungBetriebsart                         "Betriebsart"                            { channel="ism8:device:heater:DpId002" }
 Number ISM_HeizungBrennerleistung                     "Brennerleistung [%.1f %%]"              { channel="ism8:device:heater:DpId003" }
-Number ISM_HeizungKesseltemperatur      "Kesseltemperatur [%.1f °C]"             { channel="ism8:device:heater:DpId004" }
+Number:Temperature ISM_HeizungKesseltemperatur        "Kesseltemperatur [%.1f °C]"             { channel="ism8:device:heater:DpId004" }
-Number ISM_HeizungRuecklauftemperatur   "Rücklauftemperatur [%.1f °C]"           { channel="ism8:device:heater:DpId006" }
+Number:Temperature ISM_HeizungRuecklauftemperatur     "Rücklauftemperatur [%.1f °C]"           { channel="ism8:device:heater:DpId006" }
-Number ISM_HeizungWarmwassertemperatur  "Warmwassertemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId007" }
+Number:Temperature ISM_HeizungWarmwassertemperatur    "Warmwassertemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId007" }
-Number ISM_HeizungAussentemperatur      "Außentemperatur [%.1f °C]"              { channel="ism8:device:heater:DpId008" }
+Number:Temperature ISM_HeizungAussentemperatur        "Außentemperatur [%.1f °C]"              { channel="ism8:device:heater:DpId008" }
 Switch ISM_HeizungStatusFlamme                        "Status Flamme"                          { channel="ism8:device:heater:DpId009" }
-Number ISM_HeizungAnlagendruck          "Anlagendruck [%.2f bar]"                { channel="ism8:device:heater:DpId013" }
+Number:Pressure ISM_HeizungAnlagendruck               "Anlagendruck [%.2f bar]"                { channel="ism8:device:heater:DpId013" }
+Number:Temperature ISM_HeizungAbgastemperatur         "Abgastemperatur [%.1f °C]"              { channel="ism8:device:heater:DpId197" }
+
 Switch ISM_HeizungSysStoerung                         "Störung Systemmodul"                    { channel="ism8:device:heater:DpId053" }
-Number ISM_HeizungSysAussentemperatur   "Außentemperatur Systemmodul [%.1f °C]"  { channel="ism8:device:heater:DpId054" }
+Number:Temperature ISM_HeizungSysAussentemperatur     "Außentemperatur Systemmodul [%.1f °C]"  { channel="ism8:device:heater:DpId054" }
-Number ISM_HeizungSollwertWarmwasser    "Sollwert Warmwasser [%.1f °C]"          { channel="ism8:device:heater:DpId056" }
+Switch ISM_HeizungSys1xWarmwasser                     "1x Warmwasser"                          { channel="ism8:device:heater:DpId194" }
+
+Number:Temperature ISM_HeizungSollwertWarmwasser      "Sollwert Warmwasser [%.1f °C]"          { channel="ism8:device:heater:DpId056" }
 Number ISM_HeizungBetriebsartHeizkreis                "Betriebsart Heizkreis"                  { channel="ism8:device:heater:DpId057" }
 Number ISM_HeizungBetriebsartWarmwasser               "Betriebsart Warmwasser"                 { channel="ism8:device:heater:DpId058" }
-Number ISM_HeizungSollwertverschiebung  "Sollwertverschiebung [%.1f °C]"         { channel="ism8:device:heater:DpId065" }
+Number:Temperature ISM_HeizungSollwertverschiebung    "Sollwertverschiebung [%.1f K]"          { channel="ism8:device:heater:DpId065" }
 Switch ISM_LueftungStoerung                           "CWL Störung"                            { channel="ism8:device:heater:DpId148" }
 Number ISM_LueftungBetriebsart                        "CWL Betriebsart"                        { channel="ism8:device:heater:DpId149" }
 Number ISM_LueftungLueftungsstufe                     "CWL Lüftungsstufe [%.1f %%]"            { channel="ism8:device:heater:DpId163" }
-Number ISM_LueftungAblufttemperatur     "CWL Ablufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId164" }
+Number:Temperature ISM_LueftungAblufttemperatur       "CWL Ablufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId164" }
-Number ISM_LueftungZulufttemperatur     "CWL Zulufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId165" }
+Number:Temperature ISM_LueftungZulufttemperatur       "CWL Zulufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId165" }
-Number ISM_LueftungLuftdurchsatzZuluft  "CWL Luftdurchsatz Zuluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId166" }
+Number:VolumetricFlowRate ISM_LueftungDurchsatzZuluft "CWL Luftdurchsatz Zuluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId166" }
-Number ISM_LueftungLuftdurchsatzAbluft  "CWL Luftdurchsatz Abluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId167" }
+Number:VolumetricFlowRate ISM_LueftungDurchsatzAbluft "CWL Luftdurchsatz Abluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId167" }
 Switch ISM_LueftungFilterwarnung                      "CWL Filterwarnung"                      { channel="ism8:device:heater:DpId192" }
+
+Contact ISM_SolarStoerung                             "Solar Störung"                          { channel="ism8:device:heater:DpId135" }
+Number:Temperature ISM_SolarWassertemperatur          "Solar Wassertemperatur [%.1f °C]"       { channel="ism8:device:heater:DpId136" }
+Number:Temperature ISM_SolarKollektortemperatur       "Solar Kollektortemperatur [%.1f °C]"    { channel="ism8:device:heater:DpId137" }
+Contact ISM_SolarStatusPumpe                          "Solar Status Pumpe"                     { channel="ism8:device:heater:DpId141" }
+
+Switch ISM_HeizungChaStoerung                         "CHA Störung"                            { channel="ism8:device:heater:DpId176" }
+Number ISM_HeizungChaBetriebsart                      "Betriebsart [MAP(HVACContrMode.map):%s]"{ channel="ism8:device:heater:DpId177" }
+Number:Power ISM_HeizungChaLeistungsaufnahme          "CHA Leistungsaufnahme [%.1f kW]"        { channel="ism8:device:heater:DpId191" }
+Number:Power ISM_HeizungChaHeizleistung               "CHA Heizleistung [%.1f kW]"             { channel="ism8:device:heater:DpId178" }
+Number:Power ISM_HeizungChaKuehlleistung              "CHA Kühlleistung [%.1f kW]"             { channel="ism8:device:heater:DpId179" }
+Number:Temperature ISM_HeizungChaKesseltemperatur     "CHA Kesseltemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId180" }
+Number:Temperature ISM_HeizungChaKesselsolltemperatur "CHA KesselSOLLtemperatur [%.1f °C]"     { channel="ism8:device:heater:DpId364" }
+Number:Temperature ISM_HeizungChaSammlertemperatur    "CHA Sammlertemperatur [%.1f °C]"        { channel="ism8:device:heater:DpId181" }
+Number:Temperature ISM_HeizungChaRuecklauftemperatur  "CHA Rücklauftemperatur [%.1f °C]"       { channel="ism8:device:heater:DpId182" }
+Number:Temperature ISM_HeizungChaWarmwassertemperatur "CHA Warmwassertemperatur [%.1f °C]"     { channel="ism8:device:heater:DpId183" }
+Number:Temperature ISM_HeizungChaAussentemperatur     "CHA Aussentemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId184" }
+Switch ISM_HeizungChaStatusHKPumpe                    "CHA Status HK Pumpe"                    { channel="ism8:device:heater:DpId185" }
+Switch ISM_HeizungChaStatusZPumpe                     "CHA Status Zubringer Pumpe"             { channel="ism8:device:heater:DpId186" }
+Switch ISM_HeizungChaStatusVentilHZWW                 "CHA Status Ventil HZ/WW"                { channel="ism8:device:heater:DpId187" }
+Switch ISM_HeizungChaStatusVentilHZK                  "CHA Status Ventil HZ/K"                 { channel="ism8:device:heater:DpId188" }
+Switch ISM_HeizungChaStatusEHeizung                   "CHA Status E-Heizung"                   { channel="ism8:device:heater:DpId189" }
+Number:Pressure ISM_HeizungChaAnlagendruck            "CHA Anlagendruck [%.2f bar]"            { channel="ism8:device:heater:DpId190" }
 ```
 
-### demo.sitemap
+### ism8.sitemap
 
 ```perl
-Frame label="Heizung"
+sitemap ism8 label="Wolf ism8"
 {
+    Frame label="Heizung"
+    {
         Text item=ISM_HeizungSysStoerung                icon="siren"
         Text item=ISM_HeizungStoerung                   icon="siren"
         Text item=ISM_HeizungAussentemperatur           icon="temperature"
@@ -174,24 +230,52 @@ Frame label="Heizung"
         Text item=ISM_HeizungStatusFlamme               icon="fire"
         Text item=ISM_HeizungKesseltemperatur           icon="temperature"
         Text item=ISM_HeizungRuecklauftemperatur        icon="temperature_cold"
+        Text item=ISM_HeizungAbgastemperatur            icon="temperature"
         Setpoint item=ISM_HeizungSollwertverschiebung   icon="radiator"          minValue=-5 maxValue=5 step=1
-}
+    }
-Frame label="Wasser"
+    Frame label="Wasser"
-{
+    {
         Text item=ISM_HeizungWarmwassertemperatur       icon="temperature_hot"
         Setpoint item=ISM_HeizungSollwertWarmwasser     icon="temperature"       minValue=40 maxValue=60 step=1
         Selection item=ISM_HeizungBetriebsartWarmwasser icon="faucet"            mappings=[0="Auto", 1="Legionellen Schutz", 2="Normal", 3="Eco", 4="Frost Schutz"]
-}
+        Switch item=ISM_HeizungSys1xWarmwasser
-Frame label="Lüftung"
+    }
-{
+    Frame label="Solar"
+    {
+    Text item=ISM_SolarStoerung                      icon="siren"
+    Text item=ISM_SolarWassertemperatur              icon="cistern"
+    Text item=ISM_SolarKollektortemperatur           icon="solarplant"
+    Text item=ISM_SolarStatusPumpe                   icon="switch"
+    }
+    Frame label="Lüftung"
+    {
         Text item=ISM_LueftungStoerung                  icon="siren"
         Selection item=ISM_LueftungBetriebsart          icon="fan"                mappings=[0="Auto", 1="Minimum", 2="Reduziert", 3="Normal", 4="Intensiv"]
         Text item=ISM_LueftungLueftungsstufe            icon="qualityofservice"
         Text item=ISM_LueftungFilterwarnung             icon="siren"
         Text item=ISM_LueftungAblufttemperatur          icon="temperature_hot"
         Text item=ISM_LueftungZulufttemperatur          icon="temperature_cold"
-    Text item=ISM_LueftungLuftdurchsatzZuluft       icon="flow"
+        Text item=ISM_LueftungDurchsatzZuluft           icon="flow"
-    Text item=ISM_LueftungLuftdurchsatzAbluft       icon="flow"
+        Text item=ISM_LueftungDurchsatzAbluft           icon="flow"
+    }
+    Frame label="Wärmepumpe" {
+        Text item=ISM_HeizungChaStoerung                icon="siren"
+        Text item=ISM_HeizungChaBetriebsart             icon="radiator"
+        Text item=ISM_HeizungChaLeistungsaufnahme       icon="energy"
+        Text item=ISM_HeizungChaHeizleistung            icon="fire"
+        Text item=ISM_HeizungChaKuehlleistung           icon="fan"
+        Text item=ISM_HeizungChaKesseltemperatur        icon="temperature"
+        Text item=ISM_HeizungChaKesselsolltemperatur    icon="temperature"
+        Text item=ISM_HeizungChaRuecklauftemperatur     icon="temperature_cold"
+        Text item=ISM_HeizungChaWarmwassertemperatur    icon="temperature"
+        Text item=ISM_HeizungChaAussentemperatur        icon="temperature"
+        Text item=ISM_HeizungChaStatusHKPumpe           icon="siren"
+        Text item=ISM_HeizungChaStatusZPumpe            icon="siren"
+        Text item=ISM_HeizungChaStatusVentilHZWW        icon="siren"
+        Text item=ISM_HeizungChaStatusVentilHZK         icon="siren"
+        Text item=ISM_HeizungChaStatusEHeizung          icon="siren"
+        Text item=ISM_HeizungChaAnlagendruck            icon="pressure"
+    }
 }
 ```
 

_addons_bindings/mercedesme/readme.md

@@ -462,7 +462,7 @@ Group name: `range`
 All channels read-only.
 
 | Channel          | Type                 |  Description                    | bev | hybrid | combustion |
-|------------------|----------------------|------------------------------|-----|--------|------------|
+|------------------|----------------------|---------------------------------|-----|--------|------------|
 | mileage          | Number:Length        |  Total Mileage                  | X   | X      | X          |
 | home-distance    | Number:Length        |  Distance to Home               | X   | X      | X          |
 | soc              | Number:Dimensionless |  Battery State of Charge        | X   | X      |            |
@@ -477,6 +477,7 @@ All channels read-only.
 | radius-fuel      | Number:Length        |  Fuel Radius for Map            |     | X      | X          |
 | range-hybrid     | Number:Length        |  Hybrid Range                   |     | X      |            |
 | radius-hybrid    | Number:Length        |  Hybrid Radius for Map          |     | X      |            |
+| adblue-level     | Number:Dimensionless |  AdBlue tank level in percent   |     |        | X          |
 
 Channels with `radius` are just giving a _guess_ which radius can be reached in a map display.
 

_addons_bindings/radiothermostat/readme.md

@@ -1,9 +1,9 @@
 ---
 id: radiothermostat
-label: RadioThermostat
+label: Radio Thermostat
-title: RadioThermostat - Bindings
+title: Radio Thermostat - Bindings
 type: binding
-description: "This binding connects RadioThermostat/3M Filtrete models CT30, CT50/3M50, CT80, etc. with built-in Wi-Fi module to openHAB."
+description: "This binding connects Radio Thermostat/3M Filtrete models CT30, CT50/3M50, CT80, etc. with built-in Wi-Fi module to openHAB."
 since: 3x
 logo: images/addons/radiothermostat.png
 install: auto
@@ -13,11 +13,11 @@ install: auto
 
 {% include base.html %}
 
-# RadioThermostat Binding
+# Radio Thermostat Binding
 
 <AddonLogo />
 
-This binding connects RadioThermostat/3M Filtrete models CT30, CT50/3M50, CT80, etc. with built-in Wi-Fi module to openHAB.
+This binding connects Radio Thermostat/3M Filtrete models CT30, CT50/3M50, CT80, etc. with built-in Wi-Fi module to openHAB.
 Thermostats using a Z-Wave module are not supported but can be used via the openHAB ZWave binding.
 
 The binding retrieves and periodically updates all basic system information from the thermostat.
@@ -113,6 +113,8 @@ The thermostat information that is retrieved is available as these channels:
 | yesterday_heat_runtime | Number:Time          | The total number of minutes of heating run-time yesterday                                                                               |
 | yesterday_cool_runtime | Number:Time          | The total number of minutes of cooling run-time yesterday                                                                               |
 | message                | String (Write Only)  | Used to display a number in the upper left 'price message' area of the thermostat's screen where the time is normally displayed         |
+| next_temp              | Number:Temperature   | Displays the next scheduled thermostat set point temperature in the heating or cooling schedule                                         |
+| next_time              | DateTime             | Displays the next scheduled thermostat set point time in the heating or cooling schedule                                                |
 
 ## Full Example
 
@@ -169,7 +171,7 @@ radiothermostat:rtherm:mytherm2 "My 2nd floor thermostat" [ hostName="mythermhos
 radiotherm.items:
 
 ```java
-Number:Temperature  Therm_Temp  "Current Temperature [%.1f °F] " <temperature>  { channel="radiothermostat:rtherm:mytherm1:temperature" }
+Number:Temperature Therm_Temp     "Current Temperature [%.1f °F]" <temperature>   { channel="radiothermostat:rtherm:mytherm1:temperature" }
 // Humidity only supported on CT80
 Number Therm_Hum                  "Current Humidity [%d %%]" <humidity>           { channel="radiothermostat:rtherm:mytherm1:humidity" }
 Number Therm_Mode                 "Thermostat Mode [MAP(radiotherm.map):%s_mode]" { channel="radiothermostat:rtherm:mytherm1:mode" }
@@ -182,6 +184,8 @@ Number Therm_Status             "Status [MAP(radiotherm.map):%s_stus]"
 Number Therm_FanStatus            "Fan Status [MAP(radiotherm.map):%s_fstus]"     { channel="radiothermostat:rtherm:mytherm1:fan_status" }
 Number Therm_Override             "Override [MAP(radiotherm.map):%s_over]"        { channel="radiothermostat:rtherm:mytherm1:override" }
 Switch Therm_Hold                 "Hold"                                          { channel="radiothermostat:rtherm:mytherm1:hold" }
+Number:Temperature Therm_NextTemp "Next Set Temp [%d %unit%]" <temperature>       { channel="radiothermostat:rtherm:mytherm1:next_temp" }
+DateTime Therm_NextTime           "Next Set Time [%1$tl:%1$tM %1$tp]" <time>      { channel="radiothermostat:rtherm:mytherm1:next_time" }
 
 Number Therm_Day                  "Thermostat Day [%d]"                           { channel="radiothermostat:rtherm:mytherm1:day" }
 Number Therm_Hour                 "Thermostat Hour [%d]"                          { channel="radiothermostat:rtherm:mytherm1:hour" }
@@ -218,6 +222,8 @@ sitemap radiotherm label="My Thermostat" {
         Text item=Therm_FanStatus icon="flow"
         Text item=Therm_Override icon="smoke"
         Switch item=Therm_Hold icon="smoke"
+        Text item=Therm_NextTemp icon="temperature"
+        Text item=Therm_NextTime icon="time"
 
         // Example of overriding the thermostat's temperature reading
         Switch item=Therm_Rtemp label="Remote Temp" icon="temperature" mappings=[60="60", 75="75", 80="80", -1="Reset"]

_thing_types/org.openhab.binding.ipobserver/src/main/resources/OH-INF/thing/thing-types.xml

@@ -29,12 +29,17 @@
 			<channel id="rainForWeek" typeId="rainForWeek"/>
 			<channel id="rainForMonth" typeId="rainForMonth"/>
 			<channel id="rainForYear" typeId="rainForYear"/>
+			<channel id="rainTotal" typeId="rainTotal"/>
 			<channel id="batteryOutdoor" typeId="system.low-battery"/>
 			<channel id="batteryIndoor" typeId="system.low-battery"/>
 			<channel id="responseTime" typeId="responseTime"/>
 			<channel id="lastUpdatedTime" typeId="lastUpdatedTime"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<config-description>
 			<parameter name="address" type="text" required="true">
 				<context>network-address</context>
@@ -233,6 +238,12 @@
 		<category>Rain</category>
 		<state pattern="%.2f %unit%" readOnly="true"/>
 	</channel-type>
+	<channel-type id="rainTotal">
+		<item-type>Number:Length</item-type>
+		<label>Total Rain</label>
+		<category>Rain</category>
+		<state pattern="%.2f %unit%" readOnly="true"/>
+	</channel-type>
 	<channel-type id="lastUpdatedTime" advanced="true">
 		<item-type>DateTime</item-type>
 		<label>Last Updated Time</label>

_thing_types/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/range-channel-types.xml

@@ -53,6 +53,12 @@
 		<label>Fuel Level</label>
 		<state pattern="%d %%" readOnly="true"/>
 	</channel-type>
+	<channel-type id="adblue-level">
+		<item-type>Number:Dimensionless</item-type>
+		<label>AdBlue Level</label>
+		<description>AdBlue tank level in percent </description>
+		<state pattern="%d %%" readOnly="true"/>
+	</channel-type>
 	<channel-type id="fuel-remain">
 		<item-type>Number:Volume</item-type>
 		<label>Remaining Fuel</label>

_thing_types/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/range-conv-channel-group.xml

@@ -14,6 +14,7 @@
 			<channel id="fuel-level" typeId="fuel-level"/>
 			<channel id="fuel-remain" typeId="fuel-remain"/>
 			<channel id="fuel-open" typeId="fuel-open"/>
+			<channel id="adblue-level" typeId="adblue-level"/>
 		</channels>
 	</channel-group-type>
 </thing:thing-descriptions>

_thing_types/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-combustion.xml

@@ -28,7 +28,7 @@
 		</channel-groups>
 
 		<properties>
-			<property name="thingTypeVersion">2</property>
+			<property name="thingTypeVersion">3</property>
 		</properties>
 
 		<config-description-ref uri="thing-type:mercedesme:conv"/>

_thing_types/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/thing/thing-types.xml

@@ -32,10 +32,12 @@
 			<channel id="yesterday_heat_runtime" typeId="yesterday_heat_runtime"/>
 			<channel id="yesterday_cool_runtime" typeId="yesterday_cool_runtime"/>
 			<channel id="message" typeId="message"/>
+			<channel id="next_temp" typeId="next_temp"/>
+			<channel id="next_time" typeId="next_time"/>
 		</channels>
 
 		<properties>
-			<property name="thingTypeVersion">1</property>
+			<property name="thingTypeVersion">2</property>
 		</properties>
 
 		<config-description-ref uri="thing-type:radiothermostat:thermostatconfig"/>
@@ -197,4 +199,28 @@
 		<description>Use this channel to display a number in the price message area</description>
 	</channel-type>
 
+	<channel-type id="next_temp" advanced="true">
+		<item-type>Number:Temperature</item-type>
+		<label>Next Set Temp</label>
+		<description>Displays the next scheduled thermostat set point temperature</description>
+		<category>Temperature</category>
+		<tags>
+			<tag>Setpoint</tag>
+			<tag>Temperature</tag>
+		</tags>
+		<state readOnly="true"/>
+	</channel-type>
+
+	<channel-type id="next_time" advanced="true">
+		<item-type>DateTime</item-type>
+		<label>Next Set Time</label>
+		<description>Displays the next scheduled thermostat set point time</description>
+		<category>Time</category>
+		<tags>
+			<tag>Status</tag>
+			<tag>Timestamp</tag>
+		</tags>
+		<state readOnly="true"/>
+	</channel-type>
+
 </thing:thing-descriptions>