[homematic] Smaller fixes and conversion of properties files to UTF-8 (#10813)

* Prevent possible NPE

Signed-off-by: Martin Herbst <develop@mherbst.de>

* Spotless

Signed-off-by: Martin Herbst <develop@mherbst.de>

* Fixes missing unit information (especially for HmIP devices)

For some HmIP devices the "valueunit" attribute is empty and thus no
default unit type could be derived. Using the data point name solves
this problem (at least for the relevant data points).

Fixes #10533

Signed-off-by: Martin Herbst <develop@mherbst.de>

* Condition result was wrong because of missing brackets

Signed-off-by: Martin Herbst <develop@mherbst.de>

* Regenerated and reorganized descriptions


Signed-off-by: Martin Herbst <develop@mherbst.de>

* Encoding changed to UTF-8 and some smaller text corrections

Signed-off-by: Martin Herbst <develop@mherbst.de>

* Use default value as maximum if is greater than received max value

For some devices the data point definition retrieved from the CCU
contains default values that are higher than the maximum value. In order
to allow the configuration of these config options the allowed maximum
value needs to be set to the default value.

Fixes #10552

Signed-off-by: Martin Herbst <develop@mherbst.de>

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/parser/CommonRpcParser.java

@@ -177,12 +177,18 @@ public abstract class CommonRpcParser<M, R> implements RpcParser<M, R> {
             unit = unit.trim().replace("\ufffd", "°");
         }
         dp.setUnit(unit == null || unit.isEmpty() ? null : unit);
-        if (dp.getUnit() == null && dp.getName() != null && dp.getName().startsWith("RSSI_")) {
+
-            dp.setUnit("dBm");
+        // Bypass: For several devices the CCU does not send a unit together with the value in the data point definition
-        }
+        if (dp.getUnit() == null && dp.getName() != null) {
-        // Bypass: For at least one device the CCU does not send a unit together with the value
+            if (dp.getName().startsWith("RSSI_")) {
-        if (dp.getUnit() == null && dp.getName().startsWith(HomematicConstants.DATAPOINT_NAME_OPERATING_VOLTAGE)) {
+                dp.setUnit("dBm");
-            dp.setUnit("V");
+            } else if (dp.getName().startsWith(HomematicConstants.DATAPOINT_NAME_OPERATING_VOLTAGE)) {
+                dp.setUnit("V");
+            } else if (HomematicConstants.DATAPOINT_NAME_HUMIDITY.equals(dp.getName())) {
+                dp.setUnit("%");
+            } else if (HomematicConstants.DATAPOINT_NAME_LEVEL.equals(dp.getName())) {
+                dp.setUnit("100%");
+            }
         }
 
         HmValueType valueType = HmValueType.parse(type);

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/parser/GetDeviceDescriptionParser.java

@@ -48,7 +48,7 @@ public class GetDeviceDescriptionParser extends CommonRpcParser<Object[], GetDev
      * Returns the parsed firmware version.
      */
     public String getFirmware() {
-        return firmware;
+        return firmware == null ? "" : firmware;
     }
 
     /**

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/parser/ListBidcosInterfacesParser.java

@@ -64,7 +64,7 @@ public class ListBidcosInterfacesParser extends CommonRpcParser<Object[], ListBi
      * Returns the firmware version.
      */
     public String getFirmware() {
-        return firmware;
+        return firmware == null ? "" : firmware;
     }
 
     /**

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicTypeGeneratorImpl.java

@@ -339,7 +339,6 @@ public class HomematicTypeGeneratorImpl implements HomematicTypeGenerator {
                     builder.withLabel(MetadataUtils.getLabel(dp));
                     builder.withDefault(Objects.toString(dp.getDefaultValue(), ""));
                     builder.withDescription(MetadataUtils.getDatapointDescription(dp));
-
                     if (dp.isEnumType()) {
                         builder.withLimitToOptions(dp.isEnumType());
                         List<ParameterOption> options = MetadataUtils.generateOptions(dp,
@@ -353,8 +352,14 @@ public class HomematicTypeGeneratorImpl implements HomematicTypeGenerator {
                     }
 
                     if (dp.isNumberType()) {
+                        Number defaultValue = (Number) dp.getDefaultValue();
+                        Number maxValue = dp.getMaxValue();
+                        // some datapoints can have a default value that is greater than the maximum value
+                        if (defaultValue.doubleValue() > maxValue.doubleValue()) {
+                            maxValue = defaultValue;
+                        }
                         builder.withMinimum(MetadataUtils.createBigDecimal(dp.getMinValue()));
-                        builder.withMaximum(MetadataUtils.createBigDecimal(dp.getMaxValue()));
+                        builder.withMaximum(MetadataUtils.createBigDecimal(maxValue));
                         builder.withStepSize(MetadataUtils
                                 .createBigDecimal(dp.isFloatType() ? Float.valueOf(0.1f) : Long.valueOf(1L)));
                         builder.withUnitLabel(MetadataUtils.getUnit(dp));

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/MetadataUtils.java

@@ -310,6 +310,7 @@ public class MetadataUtils {
                         return ITEM_TYPE_NUMBER + ":Temperature";
                     case "V":
                         return ITEM_TYPE_NUMBER + ":ElectricPotential";
+                    case "100%":
                     case "%":
                         return ITEM_TYPE_NUMBER + ":Dimensionless";
                     case "mHz":
@@ -341,7 +342,6 @@ public class MetadataUtils {
                     case "day":
                     case "month":
                     case "year":
-                    case "100%":
                     default:
                         return ITEM_TYPE_NUMBER;
                 }

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/generator/CcuMetadataExtractor.java

@@ -82,7 +82,7 @@ public class CcuMetadataExtractor {
                 file.delete();
             }
             file.createNewFile();
-            BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "ISO-8859-1"));
+            BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8"));
 
             // write device descriptions
             bw.write("# -------------- generated descriptions " + new Date() + " --------------\n");
@@ -216,7 +216,7 @@ public class CcuMetadataExtractor {
         public UrlLoader(String url, String startLine, String endLine) throws IOException {
             System.out.println("Loading file " + url);
             Boolean includeLine = null;
-            BufferedReader br = new BufferedReader(new InputStreamReader(new URL(url).openStream(), "ISO-8859-1"));
+            BufferedReader br = new BufferedReader(new InputStreamReader(new URL(url).openStream(), "UTF-8"));
 
             String line;
             while ((line = br.readLine()) != null) {

bundles/org.openhab.binding.homematic/src/main/resources/homematic/extra-descriptions.properties

@@ -1,4 +1,16 @@
 GATEWAY-EXTRAS=Gateway extras, variables and scripts
+ASIR=Homematic IP Indoor Siren
+FAL230-C10=Homematic IP Floor Heating Actuator
+FAL230-C6=Homematic IP Floor Heating Actuator
+FAL24-C10=Homematic IP Floor Heating Actuator
+FAL24-C6=Homematic IP Floor Heating Actuator
+STHD=Homematic IP Temperature and Humidity Sensor with Display, indoor
+SWD=Homematic IP Window/Door Contact optical
+WRC2=Homematic IP Wall-mount Remote Control 2 buttons
+WRC6=Homematic IP Wall-mount Remote Control 6 buttons
+WS888=Wireless Weather Data Center
+WTH=Homematic IP Wall Thermostat
+
 HM-RC-4-2=Remote Control 4 buttons
 HM-LC-Sw1-Pl-2=Wireless Switch Actuator 1-channel, socket adapter
 HM-Sec-SD-2=Wireless Smoke Detector
@@ -19,12 +31,7 @@ BC-SC-Rd-WM-2=MAX! Windows sensor
 
 # Homematic IP
 HmIP-HAP=Homematic IP Access Point
-HmIP-RCV-50=Homematic IP virtual remote control
-HmIP-SWDO=Homematic IP Door-/window contact, optical
-HmIP-WTH=Homematic IP Wall thermostat with humidity sensor
 HmIP-STH=Homematic IP Wall temperature and humidity sensor
-HmIP-STHD=Homematic IP Wall temperature and humidity sensor with display
-HMIP-WRC2=Homematic IP Wall mount remote control 2 button
 HMIP-PS=Homematic IP Pluggable switch
 HMIP-PSM=Homematic IP Pluggable switch and meter
 HMIP-eTRV=Homematic IP Radiator thermostat
@@ -39,78 +46,15 @@ HmIP-RC8=Homematic IP Remote Control - 8 buttons
 HmIP-DRA=Homematic IP DIN-Rail Adapter for Multi IO Box
 HmIP-WRC6=Homematic IP Wall-mount Remote Control - 6 buttons
 HmIP-FAL24-TR=Homematic IP Transformer for Floor Heating Actuators - 24 V
-HmIP-FAL24-C6=Homematic IP Floor Heating Actuator - 6 channels, 24 V
-HmIP-FAL24-C10=Homematic IP Floor Heating Actuator - 6 channels, 24 V
 HmIP-SRH=Homematic IP Window Handle Sensor
-HmIP-WTH-B=Homematic IP Wall Thermostat - basic
-HmIP-WTH-2=Homematic IP Wall thermostat with humidity sensor
-HmIP-FAL230-C6=Homematic IP Floor Heating Actuator - 6 channels, 230 V
-HmIP-FAL230-C10=Homematic IP Floor Heating Actuator - 6 channels, 230 V
-HmIP-FALMOT-C12=Homematic IP Floor Heating Actuator - 12 channels, motorised
 HmIP-BDT=Homematic IP Dimming Actuator for brand switches
 HmIP-BSM=Homematic IP Switch Actuator and Meter for brand switches
 HmIP-FSM=Homematic IP Switch Actuator and Meter - flush-mount
 HmIP-SWSD=Homematic IP Smoke Alarm
-HmIP-ASIR=Homematic IP Alarm Siren
-HmIP-ASIR-O=Homematic IP Alarm Siren - outdoor
 HmIP-PDT-UK=Pluggable Dimmer - trailing edge (UK)
 HmIP-eTRV-UK=Radiator Thermostat (UK)
-HmIP-SWDO-I=Window / Door Contact - invisible installation
-HmIP-SWDO-PL=Homematic IP Window / Door Contact - optical, plus
-HmIP-SWO-B=Homematic IP Weather Sensor - basic
-HmIP-SWO-PL=Homematic IP Weather Sensor - plus
-HmIP-SWO-PR=Homematic IP Weather Sensor - pro
-HmIP-WGC=Homematic IP Garage Door Controller
-HmIP-WHS2=Homematic IP Switch Actuator for heating systems - 2 channels
-HmIP-WRCD=Homematic IP Wall-mount Remote Control with status display
-HmIP-WRCR=Homematic IP Rotary Button
 HmIP-BWTH=Wall Thermostat with switching output
 HmIP-BWTH24=Wall Thermostat with switching output
-HmIP-PCBS-BAT=Circuit board for battery operation
-HmIP-PCBS2=Homematic IP Switch Circuit Board - 2 channels
-HmIP-PMFS=Homematic IP Mains Failure Surveillance
-HmIP-SCI=Homematic IP Contact Interface
-HmIP-SLO=Homematic IP Light Sensor - outdoor
-HmIP-SMI55=Homematic IP Motion Detector for 55mm frames - indoor
-HmIP-SPDR=Homematic IP Passage Sensor with Direction Recognition
-HmIP-SRD=Homematic IP Rain Sensor
-HmIP-STV=Homematic IP Tilt and Vibration Sensor
-HmIP-FCI1=Homematic IP Contact Interface flush-mount - 1 channel
-HmIP-FCI6=Homematic IP Contact Interface flush-mount - 6 channels
-HmIP-FROLL=Homematic IP Wireless Blind Actuator
-HmIP-BROLL=Homematic IP Wireless Blind Actuator for brand switches
-HmIP-FSI16=Homematic IP Switch Actuator with Push-button Input (16 A) - flush-mount
-HmIP-MIO16-PCB=Homematic IP Multi IO Module Board - 4x4
-HmIP-BRC2=Homematic IP Wall-mount Remote Control for brand switches - 2 channels
-HmIP-MOD-TM=Homematic IP Garage Door Module
-HmIP-MOD-HO=Homematic IP Module for Hoermann drives
-HmIP-MOD-RC8=Homematic IP Module Board Transmitter - 8 channels
-HmIP-MP3P=Homematic IP Combination Signalling Device MP3
-HmIP-SWD=Homematic IP Water Sensor
-HmIP-SWDM=Homematic IP Window / Door Contact with magnet
-HmIP-BSL=Homematic IP Switch Actuator for brand switches – with signal lamp
-HmIP-DBB=Homematic IP Doorbell Button
-HmIP-DRBLI4=Homematic IP Blind and Shutter Actuator for DIN rail mount - 4 channels
-HmIP-DRDI3=Homematic IP Dimming Actuator for DIN rail mount - 3 channels
-HmIP-DRSI4=Homematic IP Switch Actuator for DIN rail mount - 4 channels
-HmIP-DSD-PCB=Homematic IP Doorbell Sensor
-HmIPW-DRAP=Homematic IP Wired Access Point
-HmIPW-DRBL4=Homematic IP Wired Blind and Shutter Actuator - 4 channels
-HmIPW-DRD3=Homematic IP Wired Dimming Actuator - 3 channels
-HmIPW-DRI16=Homematic IP Wired Input Module - 16 channels
-HmIPW-DRI32=Homematic IP Wired Input Module - 32 channels
-HmIPW-DRS4=Homematic IP Wired Switch Actuator - 4 channels
-HmIPW-DRS8=Homematic IP Wired Switch Actuator - 8 channels
-HmIPW-FAL230-C6=Homematic IP Wired Floor Heating Actuator - 6 channels, 230 V
-HmIPW-FAL230-C10=Homematic IP Wired Floor Heating Actuator - 10 channels, 230 V
-HmIPW-FAL24-C6=Homematic IP Wired Floor Heating Actuator - 6 channels, 24 V
-HmIPW-FAL24-C10=Homematic IP Wired Floor Heating Actuator - 10 channels, 24 V
-HmIPW-FIO6=Homematic IP Wired IO Module flush-mount - 6 channels
-HmIPW-SMI55=Homematic IP Wired Motion Detector for 55mm frames - indoor
-HmIPW-SPI=Homematic IP Wired Presence sensor - indoor
-HmIPW-STH=Homematic IP Wired Temperature and Humidity Sensor - indoor
-HmIPW-STHD=Homematic IP Wired Temperature and Humidity Sensor with display - indoor
-HmIPW-WTH=Homematic IP Wired Wall Thermostat with Humidity Sensor
 
 # virtual datapoints
 DELETE_DEVICE_MODE=Deletemode
@@ -140,7 +84,6 @@ CHANNEL_NAME=Channel
 # More examples:
 #           ROTARY_HANDLE_SENSOR|STATE|CLOSED=Window status: locked
 ##########################################################################################################
-
 RSSI_PEER=Signalstrength Peer
 INSTALL_TEST=Installationtest
 DUTY_CYCLE=Time limit
@@ -184,7 +127,25 @@ POWERMETER_IGL|METER_TYPE|UNKNOWN=Unknown
 POWERMETER_IGL|METER_TYPE|UNKOWN=Unknown
 POWERMETER_IGL|BOOT=Boot
 ROTARY_HANDLE_SENSOR|ERROR|=Unknown
-
+ROTARY_HANDLE_SENSOR|EVENT_DELAYTIME=Message delay
+WEATHER|AIR_PRESSURE=Barometric pressure
+WEATHER|BRIGHTNESS=Brightness
+WEATHER|HUMIDITY=Relative humidity
+WEATHER|RAINING=Rain
+WEATHER|RAINING|FALSE=currently not raining
+WEATHER|RAINING|TRUE=currently raining
+WEATHER|RAIN_COUNTER=Rainfall
+WEATHER|STORM_LOWER_THRESHOLD=Wind alert off threshold
+WEATHER|STORM_UPPER_THRESHOLD=Wind alert on threshold
+WEATHER|SUNSHINEDURATION=Sunshine duration
+WEATHER|SUNSHINE_THRESHOLD=Sunshine threshold
+WEATHER|TEMPERATURE=Temperature
+WEATHER|WIND_DIRECTION=Wind direction
+WEATHER|WIND_DIRECTION_RANGE=Wind direction fluctuation range
+WEATHER|WIND_SPEED=Wind velocity
+WEATHER|WIND_SPEED_RESULT_SOURCE=Type of wind velocity value
+WEATHER|WIND_SPEED_RESULT_SOURCE|AVERAGE_VALUE=Average
+WEATHER|WIND_SPEED_RESULT_SOURCE|MAX_VALUE=Maximum value
 EVENT_DELAY_UNIT|100MS=100ms
 EVENT_DELAY_UNIT|S=seconds
 EVENT_DELAY_UNIT|M=minutes
@@ -193,6 +154,8 @@ EVENT_RANDOMTIME_UNIT|100MS=100ms
 EVENT_RANDOMTIME_UNIT|S=seconds
 EVENT_RANDOMTIME_UNIT|M=minutes
 EVENT_RANDOMTIME_UNIT|H=hours
+DIMMER|LEVEL=Dimming value
+DIMMER|LEVEL_REAL=Dimming value real channel
 TX_MINDELAY_UNIT|100MS=100ms
 TX_MINDELAY_UNIT|S=seconds
 TX_MINDELAY_UNIT|M=minutes
@@ -214,7 +177,9 @@ MAINTENANCE|BATTERY_TYPE=Type of the battery
 MAINTENANCE|FIRMWARE=Version of the firmware
 SWITCH_TRANSMITTER|STATE=Switching status
 SWITCH_VIRTUAL_RECEIVER|STATE=Switching status
+ENERGIE_METER_TRANSMITTER|CURRENT=Current
 ENERGIE_METER_TRANSMITTER|TX_THRESHOLD_ENERGY=Configuration Value for the minimal ENERGY_COUNTER change for sending event in 0.1Wh
+ENERGIE_METER_TRANSMITTER|VOLTAGE=Voltage
 COND_SWITCH_TRANSMITTER|COND_TX_THRESHOLD_LO=Configuration Value for the value of the low threshold
 COND_SWITCH_TRANSMITTER|COND_TX_THRESHOLD_HI=Configuration Value for the value of the high threshold
 SHUTTER_CONTACT|STATE_CONTACT=State as contact

bundles/org.openhab.binding.homematic/src/main/resources/homematic/extra-descriptions_de.properties

@@ -1,17 +1,29 @@
 GATEWAY-EXTRAS=Gateway extras, Variablen und Scripte
+ASIR=Homematic IP Innensirene
+FAL230-C10=Homematic IP Fussbodenheizungsaktor
+FAL230-C6=Homematic IP Fussbodenheizungsaktor
+FAL24-C10=Homematic IP Fussbodenheizungsaktor
+FAL24-C6=Homematic IP Fussbodenheizungsaktor
+STHD=Homematic IP Temperatur- und Luftfeuchtigkeitssensor mit Display, innen
+SWD=Homematic IP  Fenster- und Türkontakt optisch
+WRC2=Homematic IP Wandtaster 2-fach
+WRC6=Homematic IP Wandtaster 6-fach
+WS888=Funk-Wetterstation
+WTH=Homematic IP Wandthermostat
+
 HM-RC-4-2=Funk-Handsender 4 Tasten
 HM-LC-Sw1-Pl-2=Funk-Schaltaktor 1-fach, Zwischenstecker
 HM-Sec-SD-2=Funk-Rauchmelder
 HM-WDS30-OT2-SM-2=Funk-Temperaturdifferenzsensor
-HM-Sen-MDIR-O-2=Funk-Bewegungsmelder außen
+HM-Sen-MDIR-O-2=Funk-Bewegungsmelder außen
-HM-ES-TX-WM2=Funk-Sender für Energiezähler-Sensor Version 2
+HM-ES-TX-WM2=Funk-Sender für Energiezähler-Sensor Version 2
 
 # MAX!
-BC-RT-TRX-CyN=MAX! Heizkörperthermostat Basic
+BC-RT-TRX-CyN=MAX! Heizkörperthermostat Basic
-BC-RT-TRX-CyG=MAX! Elektronischer Heizkörperthermostat
+BC-RT-TRX-CyG=MAX! Elektronischer Heizkörperthermostat
 BC-RT-TRX-CyG-2=MAX! Wandthermostat WT+
-BC-RT-TRX-CyG-3=MAX! Heizkörperthermostat
+BC-RT-TRX-CyG-3=MAX! Heizkörperthermostat
-BC-RT-TRX-CyG-4=MAX! Heizkörperthermostat+
+BC-RT-TRX-CyG-4=MAX! Heizkörperthermostat+
 BC-TS-Sw-Pl=MAX! Zwischenstecker
 BC-PB-2-WM-2=MAX! Eco Taster
 BC-TC-C-WM-4=MAX! Wandthermostat+
@@ -19,135 +31,67 @@ BC-SC-Rd-WM-2=MAX! Fensterkontakt
 
 # Homematic IP
 HmIP-HAP=Homematic IP Access Point
-HmIP-RCV-50=Homematic IP virtuelle Fernbedienung
-HmIP-SWDO=Homematic IP Fenster- und Türkontakt, optisch
-HmIP-WTH=Homematic IP Wandthermostat mit Luftfeuchtigkeitssensor
 HmIP-STH=Homematic IP Temperatur- und Luftfeuchtigkeitssensor - innen
-HmIP-STHD=Homematic IP Temperatur- und Luftfeuchtigkeitssensor mit Display - innen
-HMIP-WRC2=Homematic IP Wandtaster, 2-fach
 HMIP-PS=Homematic IP Schaltsteckdose
 HMIP-PSM=Homematic IP Schalt-Mess-Steckdose
-HMIP-eTRV=Homematic IP Heizkörperthermostat
+HMIP-eTRV=Homematic IP Heizkörperthermostat
-HMIP-eTRV-2=Homematic IP Heizkörperthermostat
+HMIP-eTRV-2=Homematic IP Heizkörperthermostat
-HMIP-eTRV-B=Homematic IP Heizkörperthermostat Basis
+HMIP-eTRV-B=Homematic IP Heizkörperthermostat Basis
-HMIP-eTRV-C=Homematic IP Heizkörperthermostat kompakt
+HMIP-eTRV-C=Homematic IP Heizkörperthermostat kompakt
-HmIP-eTRV-C-2=Homematic IP Heizkörperthermostat kompakt
+HmIP-eTRV-C-2=Homematic IP Heizkörperthermostat kompakt
-HmIP-SMI=Homematic IP Bewegungsmelder mit Dämmerungssensor
+HmIP-SMI=Homematic IP Bewegungsmelder mit Dämmerungssensor
-HmIP-SMO=Homematic IP Bewegungsmelder mit Dämmerungssensor außen
+HmIP-SMO=Homematic IP Bewegungsmelder mit Dämmerungssensor außen
-HmIP-KRC4=Homematic IP Schlüsselbundfernbedienung - 4 Tasten
+HmIP-KRC4=Homematic IP Schlüsselbundfernbedienung - 4 Tasten
 HmIP-RC8=Homematic IP Fernbedienung - 8 Tasten
-HmIP-DRA=Homematic IP Hutschienenadapter für Multi IO Box
+HmIP-DRA=Homematic IP Hutschienenadapter für Multi IO Box
 HmIP-WRC6=Homematic IP Wandtaster - 6-fach
-HmIP-FAL24-TR=Homematic IP Trafo für Fußbodenheizungsaktoren - 24 V
+HmIP-FAL24-TR=Homematic IP Trafo für Fußbodenheizungsaktoren - 24 V
-HmIP-FAL24-C6=Homematic IP Fußbodenheizungsaktor - 6-fach, 24 V
-HmIP-FAL24-C10=Homematic IP Fußbodenheizungsaktor - 6-fach, 24 V
 HmIP-SRH=Homematic IP Fenstergriffsensor
-HmIP-WTH-B=Homematic IP Wandthermostat - basic
+HmIP-BDT=Homematic IP Dimmaktor für Markenschalter
-HmIP-WTH-2=Homematic IP Wandthermostat mit Luftfeuchtigkeitssensor
+HmIP-BSM=Homematic IP Schalt-Mess-Aktor für Markenschalter
-HmIP-FAL230-C6=Homematic IP Fußbodenheizungsaktor - 6-fach, 230 V
-HmIP-FAL230-C10=Homematic IP Fußbodenheizungsaktor - 6-fach, 230 V
-HmIP-FALMOT-C12=Homematic IP Fußbodenheizungsaktor - 12-fach, motorisch
-HmIP-BDT=Homematic IP Dimmaktor für Markenschalter
-HmIP-BSM=Homematic IP Schalt-Mess-Aktor für Markenschalter
 HmIP-FSM=Homematic IP Schalt-Mess-Aktor - Unterputz
 HmIP-SWSD=Homematic IP Rauchwarnmelder
-HmIP-ASIR=Homematic IP Alarmsirene
-HmIP-ASIR-O=Homematic IP Alarmsirene - außen
 HmIP-PDT-UK=Dimmer-Steckdose - Phasenabschnitt (UK-Version)
-HmIP-eTRV-UK=Heizkörperthermostat (UK-Version)
+HmIP-eTRV-UK=Heizkörperthermostat (UK-Version)
-HmIP-SWDO-I=Fenster- und Türkontakt - verdeckten Einbau
-HmIP-SWDO-PL=Homematic IP Fenster- und Türkontakt - optisch, plus
-HmIP-SWO-B=Homematic IP Wettersensor - basic
-HmIP-SWO-PL=Homematic IP Wettersensor - plus
-HmIP-SWO-PR=Homematic IP Wettersensor - pro
-HmIP-WGC=Homematic IP Garagentortaster
-HmIP-WHS2=Homematic IP Schaltaktor für Heiz-Systeme - 2 Kanal
-HmIP-WRCD=Homematic IP Wandtaster mit Statusdisplay
-HmIP-WRCR=Homematic IP Drehtaster
 HmIP-BWTH=Wandthermostat mit Schaltausgang
 HmIP-BWTH24=Wandthermostat mit Schaltausgang
-HmIP-PCBS-BAT=Schaltplatine für Batteriebetrieb
-HmIP-PCBS2=Homematic IP Schaltplatine - 2-fach
-HmIP-PMFS=Homematic IP Netzausfallüberwachung
-HmIP-SCI=Homematic IP Kontakt-Schnittstelle
-HmIP-SLO=Homematic IP Lichtsensor - außen
-HmIP-SMI55=Homematic IP Bewegungsmelder für 55er Rahmen - innen
-HmIP-SPDR=Homematic IP Durchgangssensor mit Richtungserkennung
-HmIP-SRD=Homematic IP Regensensor
-HmIP-STV=Homematic IP Neigungs- und Erschütterungssensor
-HmIP-FCI1=Homematic IP Kontakt-Schnittstelle Unterputz - 1-fach
-HmIP-FCI6=Homematic IP Kontakt-Schnittstelle Unterputz - 6-fach
-HmIP-FROLL=Homematic IP Rolladenaktor
-HmIP-BROLL=Homematic IP Rolladenaktor für Markenschalter
-HmIP-FSI16=Homematic IP Schaltaktor mit Tastereingang (16 A) - Unterputz
-HmIP-MIO16-PCB=Homematic IP Multi IO Modulpatine - 4x4
-HmIP-BRC2=Homematic IP Wandtaster für Markenschalter - 2-fach
-HmIP-MOD-TM=Homematic IP Tormatic Modul
-HmIP-MOD-HO=Homematic IP Modul für Hörmann-Antriebe
-HmIP-MOD-RC8=Homematic IP Modulplatine Sender - 8-fach
-HmIP-MP3P=Homematic IP MP3 Kombisignalgeber
-HmIP-SWD=Homematic IP Wassersensor
-HmIP-SWDM=Homematic IP Fenster- und Türkontakt mit Magnet
-HmIP-BSL=Homematic IP Schaltaktor für Markenschalter mit Signalleuchte
-HmIP-DBB=Homematic IP Türklingeltaster
-HmIP-DRBLI4=Homematic IP Jalousie- u. Rollladenaktor für Hutschienenmontage  - 4-fach
-HmIP-DRDI3=Homematic IP Dimmaktor für Hutschienenmontage - 3-fach
-HmIP-DRSI4=Homematic IP Schaltaktor für Hutschienenmontage - 4-fach
-HmIP-DSD-PCB=Homematic IP Klingelsignalsensor
-HmIPW-DRAP=Homematic IP Wired Access Point
-HmIPW-DRBL4=Homematic IP Wired Jalousie- u. Rollladenaktor - 4-fach
-HmIPW-DRD3=Homematic IP Wired Dimmaktor - 3-fach
-HmIPW-DRI16=Homematic IP Wired Eingangsmodul - 16-fach
-HmIPW-DRI32=Homematic IP Wired Eingangsmodul - 32-fach
-HmIPW-DRS4=Homematic IP Wired Schaltaktor - 4-fach
-HmIPW-DRS8=Homematic IP Wired Schaltaktor - 8-fach
-HmIPW-FAL230-C6=Homematic IP Wired Fußbodenheizungsaktor - 6-fach, 230 V
-HmIPW-FAL230-C10=Homematic IP Wired Fußbodenheizungsaktor - 10-fach, 230 V
-HmIPW-FAL24-C6=Homematic IP Wired Fußbodenheizungsaktor - 6-fach, 24 V
-HmIPW-FAL24-C10=Homematic IP Wired Fußbodenheizungsaktor - 10-fach, 24 V
-HmIPW-FIO6=Homematic IP Wired IO Modul Unterputz - 6-fach
-HmIPW-SMI55=Homematic IP Wired Bewegungsmelder für 55er Rahmen - innen
-HmIPW-SPI=Homematic IP Wired Präsenzmelder - innen
-HmIPW-STH=Homematic IP Wired Temperatur- und Luftfeuchtigkeitssensor - innen
-HmIPW-STHD=Homematic IP Wired Temperatur- und Luftfeuchtigkeitssensor mit Display - innen
-HmIPW-WTH=Homematic IP Wired Wandthermostat mit Luftfeuchtigkeitssensor
 
 # Virtuelle Datenpunkte
-DELETE_DEVICE_MODE=Löschmodus
+DELETE_DEVICE_MODE=Löschmodus
-DELETE_DEVICE=Gerät löschen
+DELETE_DEVICE=Gerät löschen
-DISPLAY_OPTIONS=Zeige optionen am Display an
+DISPLAY_OPTIONS=Zeige Optionen am Display an
 ON_TIME_AUTOMATIC=Automatische Einschaltdauer
 INSTALL_MODE_DURATION=Dauer des Anlernmodus
-INSTALL_MODE=Gerät anlernen
+INSTALL_MODE=Gerät anlernen
 RELOAD_ALL_FROM_GATEWAY=Alle Daten vom Gateway neu laden
 
-MAINTENANCE|DELETE_DEVICE_MODE|LOCKED=Löschen gesperrt
+MAINTENANCE|DELETE_DEVICE_MODE|LOCKED=Löschen gesperrt
-MAINTENANCE|DELETE_DEVICE_MODE|RESET=Löschen und Gerät auf Werkseinstellunen zurücksetzen
+MAINTENANCE|DELETE_DEVICE_MODE|RESET=Löschen und Gerät auf Werkseinstellungen zurücksetzen
-MAINTENANCE|DELETE_DEVICE_MODE|FORCE=Löschen, auch wenn das Geerät nicht erreichbar ist
+MAINTENANCE|DELETE_DEVICE_MODE|FORCE=Löschen, auch wenn das Gerät nicht erreichbar ist
-MAINTENANCE|DELETE_DEVICE_MODE|DEFER=Bei nächster Gelegenheit löschen
+MAINTENANCE|DELETE_DEVICE_MODE|DEFER=Bei nächster Gelegenheit löschen
 
 CHANNEL_NAME=Kanal
 
 ####################################### Datenpunkt Beschreibungen ##########################################
-# Du kannst hier Datenpunkt Beschreibungen hinzufügen im Format:
+# Du kannst hier Datenpunkt Beschreibungen hinzufügen im Format:
 # KANAL_TYP|DATENPUNKT_NAME|OPTIONS_WERT
 #
-# Beispiel: Eine allgemeine Beschreibung für den LEVEL Datenpunkt:
+# Beispiel: Eine allgemeine Beschreibung für den LEVEL Datenpunkt:
 #           LEVEL=Level Beschreibung
-# Jedoch wird LEVEL in div. Geräten verwendet und hat eine unterschiedliche Bedeutung, daher kannst Du den Kanaltyp voranstellen:
+# Jedoch wird LEVEL in div. Geräten verwendet und hat eine unterschiedliche Bedeutung, daher kannst Du den Kanaltyp voranstellen:
 #           DIMMER|LEVEL=Dimmwert
-#           BLIND|LEVEL=Behanghöhe
+#           BLIND|LEVEL=Behanghöhe
 # Weiteres Beispiel:
 #           ROTARY_HANDLE_SENSOR|STATE|CLOSED=Fensterzustand: verriegelt
 ##########################################################################################################
-RSSI_PEER=Signalstärke Peer
+RSSI_PEER=Signalstärke Peer
 INSTALL_TEST=Installationstest
 DUTY_CYCLE=Sendezeitbegrenzung
 SWITCH|STATE=Schaltzustand
 WORKING=In Betrieb
 BLIND|DIRECTION=Laufrichtung
-AES_ACTIVE=AES-Verschlüsselung
+AES_ACTIVE=AES-VerSchlüsselung
-AES_KEY=AES-Schlüssel
+AES_KEY=AES-Schlüssel
 DUTYCYCLE=Sendezeitbegrenzung
 SMOKE_DETECTOR|STATE=Raucherkennung
 SMOKE_DETECTOR_TEAM|STATE=Team Raucherkennung
@@ -155,22 +99,22 @@ DIMMER|DIRECTION=Dimmrichtung
 PRESS_CONT=Tastendruck durchgehend
 PRESS_LONG_RELEASE=Tastendruck lang ende
 ROTARY_HANDLE_SENSOR|STATE=Fensterposition
-SENSOR=Ereignisauslösung
+SENSOR=Ereignisauslösung
 DISPLAY|UNIT=Einheit
 DISPLAY|BEEP=Ton
-POWERMETER_IGL|METER_CONSTANT_GAS=Gas-Zählerkonstante
+POWERMETER_IGL|METER_CONSTANT_GAS=Gas-Zählerkonstante
-POWERMETER_IGL|METER_CONSTANT_LED=LED-Zählerkonstante
+POWERMETER_IGL|METER_CONSTANT_LED=LED-Zählerkonstante
-POWERMETER_IGL|METER_CONSTANT_IR=IR-Zählerkonstante
+POWERMETER_IGL|METER_CONSTANT_IR=IR-Zählerkonstante
 POWERMETER_IGL|METER_TYPE=Sensor-Typ
 POWERMETER_IGL|METER_SENSIBILITY_IR=IR-Empfindlichkeitsschwelle
-COND_TX_THRESHOLD_HI_CURRENT=Ein Wert wird gesendet, wenn sich seit der letzten Sendung der Strom geändert hat
+COND_TX_THRESHOLD_HI_CURRENT=Ein Wert wird gesendet, wenn sich seit der letzten Sendung der Strom geändert hat
-COND_TX_THRESHOLD_LO_CURRENT=Ein Wert wird gesendet, wenn sich seit der letzten Sendung der Strom geändert hat
+COND_TX_THRESHOLD_LO_CURRENT=Ein Wert wird gesendet, wenn sich seit der letzten Sendung der Strom geändert hat
-COND_TX_THRESHOLD_LO_FREQUENCY=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
+COND_TX_THRESHOLD_LO_FREQUENCY=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
-COND_TX_THRESHOLD_HI_FREQUENCY=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
+COND_TX_THRESHOLD_HI_FREQUENCY=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
-COND_TX_THRESHOLD_HI_VOLTAGE=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
+COND_TX_THRESHOLD_HI_VOLTAGE=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
-COND_TX_THRESHOLD_LO_VOLTAGE=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
+COND_TX_THRESHOLD_LO_VOLTAGE=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Spannung geändert hat
-COND_TX_THRESHOLD_HI_POWER=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Leistung geändert hat
+COND_TX_THRESHOLD_HI_POWER=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Leistung geändert hat
-COND_TX_THRESHOLD_LO_POWER=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Leistung geändert hat
+COND_TX_THRESHOLD_LO_POWER=Ein Wert wird gesendet, wenn sich seit der letzten Sendung die Leistung geändert hat
 DIRECTION|NONE=Keine
 DIRECTION|UP=Hoch
 DIRECTION|DOWN=Runter
@@ -183,7 +127,25 @@ POWERMETER_IGL|METER_TYPE|UNKNOWN=Unbekannt
 POWERMETER_IGL|METER_TYPE|UNKOWN=Unbekannt
 POWERMETER_IGL|BOOT=Boot
 ROTARY_HANDLE_SENSOR|ERROR|=Unbekannt
-
+ROTARY_HANDLE_SENSOR|EVENT_DELAYTIME=Meldeverzögerung
+WEATHER|AIR_PRESSURE=Luftdruck
+WEATHER|BRIGHTNESS=Helligkeit
+WEATHER|HUMIDITY=Rel. Luftfeuchte
+WEATHER|RAINING=Regen
+WEATHER|RAINING|FALSE=aktuell kein Regen
+WEATHER|RAINING|TRUE=aktuell Regen
+WEATHER|RAIN_COUNTER=Regenmenge
+WEATHER|STORM_LOWER_THRESHOLD=Windalarm-Ausschaltschwelle
+WEATHER|STORM_UPPER_THRESHOLD=Windalarm-Einschaltschwelle
+WEATHER|SUNSHINEDURATION=Sonnenscheindauer
+WEATHER|SUNSHINE_THRESHOLD=Sonnenscheinschwelle
+WEATHER|TEMPERATURE=Temperatur
+WEATHER|WIND_DIRECTION=Windrichtung
+WEATHER|WIND_DIRECTION_RANGE=Windrichtung Schwankungsbreite
+WEATHER|WIND_SPEED=Windgeschwindigkeit
+WEATHER|WIND_SPEED_RESULT_SOURCE=Art des Windgeschwindigkeitswertes
+WEATHER|WIND_SPEED_RESULT_SOURCE|AVERAGE_VALUE=Mittelwert
+WEATHER|WIND_SPEED_RESULT_SOURCE|MAX_VALUE=Maximalwert
 EVENT_DELAY_UNIT|100MS=100ms
 EVENT_DELAY_UNIT|S=Sekunden
 EVENT_DELAY_UNIT|M=Minuten
@@ -192,30 +154,34 @@ EVENT_RANDOMTIME_UNIT|100MS=100ms
 EVENT_RANDOMTIME_UNIT|S=Sekunden
 EVENT_RANDOMTIME_UNIT|M=Minuten
 EVENT_RANDOMTIME_UNIT|H=Stunden
+DIMMER|LEVEL=Dimmwert
+DIMMER|LEVEL_REAL=Dimmwert Realkanal
 TX_MINDELAY_UNIT|100MS=100ms
 TX_MINDELAY_UNIT|S=Sekunden
 TX_MINDELAY_UNIT|M=Minuten
 TX_MINDELAY_UNIT|H=Stunden
 MAINTENANCE|ENABLE_ROUTING=Konfigurationswert zum aktivieren / deaktivieren des Routings
-MAINTENANCE|CYCLIC_INFO_MSG_OVERDUE_THRESHOLD=Anzahl der erlaubten überfällig zyklischen Info-Meldungen, bis ein UNREACH Ereignis ausgelöst wird
+MAINTENANCE|CYCLIC_INFO_MSG_OVERDUE_THRESHOLD=Anzahl der erlaubten überfälligen zyklischen Info-Meldungen, bis ein UNREACH Ereignis ausgelöst wird
-MAINTENANCE|DUTYCYCLE_LIMIT=Konfigurationswert für die Dutycycle Grenze
+MAINTENANCE|DUTYCYCLE_LIMIT=Konfigurationswert für die Dutycycle Grenze
-MAINTENANCE|LOCAL_RESET_DISABLED=Konfigurationswert um den lokale Reset des Geräts zu deaktivieren
+MAINTENANCE|LOCAL_RESET_DISABLED=Konfigurationswert um den lokalen Reset des Geräts zu deaktivieren
-MAINTENANCE|CYCLIC_INFO_MSG_DIS_UNCHANGED=Anzahl der zu überspringenden zyklischen Info-Meldungen durch ein Gerät, damit der Status unverändert bleibt
+MAINTENANCE|CYCLIC_INFO_MSG_DIS_UNCHANGED=Anzahl der zu überspringenden zyklischen Info-Meldungen durch ein Gerät, damit der Status unverändert bleibt
-MAINTENANCE|ARR_TIMEOUT=Konfigurationswert für das Antwort-Timeout der Anwendung in Sekunden
+MAINTENANCE|ARR_TIMEOUT=Konfigurationswert für das Antwort-Timeout der Anwendung in Sekunden
 MAINTENANCE|UPDATE_PENDING=Zeigt eine ausstehende Aktualisierung an
-MAINTENANCE|UNREACH=Gerätekommunikationsstatus
+MAINTENANCE|UNREACH=Gerätekommunikationsstatus
-MAINTENANCE|STICKY_UNREACH=Gerätekommunikationsstatus
+MAINTENANCE|STICKY_UNREACH=Gerätekommunikationsstatus
-MAINTENANCE|CONFIG_PENDING=Zeigt eine ausstehende Konfigurations Aktualisierung an
+MAINTENANCE|CONFIG_PENDING=Zeigt eine ausstehende Konfigurationsaktualisierung an
-MAINTENANCE|DEVICE_IN_BOOTLOADER=Gerät im bootloader
+MAINTENANCE|DEVICE_IN_BOOTLOADER=Gerät im Bootloader
-MAINTENANCE|RSSI_DEVICE=Empfangsstärke
+MAINTENANCE|RSSI_DEVICE=Empfangsstärke
-MAINTENANCE|RSSI=Vereinheitlichte Empfangsstärke
+MAINTENANCE|RSSI=Vereinheitlichte Empfangsstärke
 MAINTENANCE|BATTERY_TYPE=Typ der Batterie
 MAINTENANCE|FIRMWARE=Version der Firmware
 SWITCH_TRANSMITTER|STATE=Schaltstatus
 SWITCH_VIRTUAL_RECEIVER|STATE=Schaltstatus
-ENERGIE_METER_TRANSMITTER|TX_THRESHOLD_ENERGY=Konfigurationswert für die minimale Änderung des Energie-Zählers, um ein Ereignis in 0.1Wh zu senden
+ENERGIE_METER_TRANSMITTER|CURRENT=Strom
+ENERGIE_METER_TRANSMITTER|TX_THRESHOLD_ENERGY=Konfigurationswert für die minimale Änderung des Energie-Zählers, um ein Ereignis in 0.1Wh zu senden
+ENERGIE_METER_TRANSMITTER|VOLTAGE=Spannung
 COND_SWITCH_TRANSMITTER|COND_TX_THRESHOLD_LO=Konfigurationswert der unteren Schwelle
-COND_SWITCH_TRANSMITTER|COND_TX_THRESHOLD_HI=Konfigurationswert der hohen Schwelle
+COND_SWITCH_TRANSMITTER|COND_TX_THRESHOLD_HI=Konfigurationswert der oberen Schwelle
 SHUTTER_CONTACT|STATE_CONTACT=Schaltzustand als Kontakt
 
 KEY|DISPLAY_LINE_1=Display Zeile 1
@@ -224,22 +190,22 @@ KEY|DISPLAY_LINE_3=Display Zeile 3
 KEY|DISPLAY_LINE_4=Display Zeile 4
 KEY|DISPLAY_LINE_5=Display Zeile 5
 
-KEY|DISPLAY_COLOR_1=Farbe für Zeile 1
+KEY|DISPLAY_COLOR_1=Farbe für Zeile 1
-KEY|DISPLAY_COLOR_2=Farbe für Zeile 2
+KEY|DISPLAY_COLOR_2=Farbe für Zeile 2
-KEY|DISPLAY_COLOR_3=Farbe für Zeile 3
+KEY|DISPLAY_COLOR_3=Farbe für Zeile 3
-KEY|DISPLAY_COLOR_4=Farbe für Zeile 4
+KEY|DISPLAY_COLOR_4=Farbe für Zeile 4
-KEY|DISPLAY_COLOR_5=Farbe für Zeile 5
+KEY|DISPLAY_COLOR_5=Farbe für Zeile 5
 
-KEY|DISPLAY_ICON_1=Icon für Zeile 1
+KEY|DISPLAY_ICON_1=Icon für Zeile 1
-KEY|DISPLAY_ICON_2=Icon für Zeile 2
+KEY|DISPLAY_ICON_2=Icon für Zeile 2
-KEY|DISPLAY_ICON_3=Icon für Zeile 3
+KEY|DISPLAY_ICON_3=Icon für Zeile 3
-KEY|DISPLAY_ICON_4=Icon für Zeile 4
+KEY|DISPLAY_ICON_4=Icon für Zeile 4
-KEY|DISPLAY_ICON_5=Icon für Zeile 5
+KEY|DISPLAY_ICON_5=Icon für Zeile 5
 
 KEY|DISPLAY_BEEPCOUNT=Anzahl Beeps (0 = unendlich)
 KEY|DISPLAY_BEEPINTERVAL=Abstand zwischen zwei Beeps in Schritten von 10s (10 - 160s)
 
-KEY|DISPLAY_SUBMIT=Displaynachricht übertragen
+KEY|DISPLAY_SUBMIT=Displaynachricht übertragen
 
 NONE=Keine
 OFF=Aus
@@ -250,15 +216,15 @@ OK=OK
 INFO=Info
 NEW_MESSAGE=Neue Nachricht
 SERVICE=Service
-SIGNAL_GREEN=Grünes Signal
+SIGNAL_GREEN=Grünes Signal
 SIGNAL_YELLOW=Gelbes Signal
 SIGNAL_RED=Rotes Signal
 
-WHITE=Weiß
+WHITE=Weiß
 RED=Rot
 ORANGE=Orange
 YELLOW=Gelb
-GREEN=Grün
+GREEN=Grün
 BLUE=Blau
 
 DISPLAY_BEEPER|LONG_LONG=Lang lang

bundles/org.openhab.binding.homematic/src/main/resources/homematic/generated-descriptions.properties

@@ -1,4 +1,4 @@
-# -------------- generated descriptions Fri Jul 21 16:59:59 CEST 2017 --------------
+# -------------- generated descriptions Sun Apr 25 19:44:22 CEST 2021 --------------
 # DON'T CHANGE THIS FILE!
 
 263_130=Wireless Switch Actuator 1-channel, flush-mount
@@ -11,25 +11,20 @@
 263_145=Wireless Push-button interface 4-channel, flush-mount
 263_146=Wireless Blind Actuator 1-channel, flush-mount
 263_147=Wireless Shutter Actuator 1-channel, surface-mount
-263_149_/_263_150=engl Schüco  WCS-TipTronic-Platine
+263_149_/_263_150=engl Schüco  WCS-TipTronic-Platine
 263_155=Wireless Display Push-button 2-channel, surface-mount
-263_157=Wireless Temperature Sensor, indoor
+263_157=Wireless Temperature Sensor - indoor
 263_158=Wireless Temperature/Humidity Sensor, outdoor
 263_160=Wireless Sensor for Carbon Dioxide
-263_162=Wireless Motion Detector, indoor
+263_162=Wireless Motion Detector - indoor
 263_167=Wireless Smoke Detector
 263_167_Gruppe=Wireless Smoke Detector (Group)
 ALPHA-IP-RBG=Room Control Unit Display
 ALPHA-IP-RBGa=Room Control Unit Analogue
-ASIR=Homematic IP Indoor Siren
 BDT=Homematic IP Dimming Actuator for brand switch systems, flush-mount
 BRC-H=Remote Control DORMA, 4-channel
 BSM=Homematic IP Switch Actuator with power measurement
 DEVICE=Unknown device
-FAL230-C10=Homematic IP Floor Heating Actuator
-FAL230-C6=Homematic IP Floor Heating Actuator
-FAL24-C10=Homematic IP Floor Heating Actuator
-FAL24-C6=Homematic IP Floor Heating Actuator
 FDT=Homematic IP Dimming Actuator, flush-mount
 FSM=Homematic IP Switch Actuator with power measurement, flush-mount
 FSM16=Homematic IP Switch Actuator with power measurement, flush-mount
@@ -38,7 +33,7 @@ HM-CC-SCD=Wireless Sensor for Carbon Dioxide
 HM-CC-TC=Wireless Wall Thermostat
 HM-CC-VD=Wireless Valve Drive
 HM-CC-VG-1=Group heating control
-HM-CCU-1=HomeMatic Central Control Unit
+HM-CCU-1=Homematic Central Control Unit
 HM-DW-WM=Wireless Dimming Actuator 2-channel PWM LED
 HM-Dis-EP-WM55=Display Status Monitor with E-Paper-Display
 HM-Dis-TD-T=Wireless Status Monitor
@@ -139,18 +134,19 @@ HM-SCI-3-FM=Wireless Shutter Contact Interface 3-channel, flush-mount
 HM-Sec-Key=KeyMatic
 HM-Sec-Key-O=KeyMatic
 HM-Sec-Key-S=KeyMatic
-HM-Sec-MDIR=Wireless Motion Detector, indoor
+HM-Sec-MDIR=Wireless Motion Detector - indoor
 HM-Sec-RHS=Wireless Window Rotary Handle Sensor
 HM-Sec-SC=Wireless Door/Window Contact
 HM-Sec-SC-2=Wireless Door/Window Contact
 HM-Sec-SCo=Wireless Door/Window Contact optical
 HM-Sec-SD=Wireless Smoke Detector
+HM-Sec-SD-Team=Wireless Smoke Detector (Group)
 HM-Sec-SFA-SM=Wireless Siren/Flash Actuator
 HM-Sec-Sir-WM=Wireless Indoor Siren
 HM-Sec-TiS=Wireless Tilt Sensor
 HM-Sec-WDS=Wireless Water Detection Sensor
+HM-Sec-WDS-2=Wireless Water Detection Sensor
 HM-Sec-Win=WinMatic
-HM-Sec_SD-Team=Wireless Smoke Detector (Group)
 HM-Sen-DB-PCB=Wireless Doorbell Sensor
 HM-Sen-EP=Wireless sensor for electrical pulses
 HM-Sen-LI-O=Wireless Light Intensity Sensor, outdoor
@@ -167,10 +163,10 @@ HM-WDS10-TH-O=Wireless Temperature/Humidity Sensor, outdoor
 HM-WDS100-C6-O=Wireless Weather Data Sensor OC 3
 HM-WDS30-OT2-SM=Wireless Temperature Difference Sensor
 HM-WDS30-T-O=Wireless Temperature Sensor, outdoor
-HM-WDS40-TH-I=Wireless Temperature Sensor, indoor
+HM-WDS40-TH-I=Wireless Temperature Sensor - indoor
 HM-WS550-US=Wireless Weather Data Center USA
 HM-WS550ST-IO=Wireless Temperature Sensor, outdoor
-HM-WS550STH-I=Wireless Temperature Sensor, indoor
+HM-WS550STH-I=Wireless Temperature Sensor - indoor
 HM-WS550STH-O=Wireless Temperature/Humidity Sensor, outdoor
 HMW-IO-12-FM=Wired RS485 I/O Module 12-channel, flush-mount
 HMW-IO-12-Sw14-DR=Wired RS485 I/O Module with 12 inputs, 14 outputs, DIN rail mount
@@ -186,15 +182,96 @@ HMW-Sen-SC-12-FM=Wired RS485 Shutter Contact 12-channel, flush-mount
 HMW-Sys-PS7-DR=Wired RS485 Power Supply 7 VA, DIN rail mount
 HMW-WSE-SM=Wired RS485 Light Sensor, surface mount
 HMW-WSTH-SM=Wired RS485 Temperature/Humidity Sensor
-HmIP-BBL=Homematic IP Jalousieaktor for brand switch systems, flush-mount
+HmIP-ASIR=Homematic IP Alarm Siren
+HmIP-ASIR-O=Homematic IP Alarm Siren - outdoor
+HmIP-BBL=Homematic IP Blinds Actuator for brand switches
+HmIP-BRC2=Homematic IP Remote Control for brand switches - 2 channels
 HmIP-BROLL=Homematic IP Blind Actuator for brand switch systems, flush-mount
-HmIP-FBL=Homematic IP Jalousieaktor, flush-mount
+HmIP-BSL=Homematic IP Switch Actuator with Signal Lamp - for brand switches
+HmIP-CCU3=Homematic IP Central Control Unit CCU3
+HmIP-DBB=Homematic IP Doorbell Button
+HmIP-DLD=Homematic IP Door Lock Drive
+HmIP-DRBLI4=Homematic IP Blind and Shutter Actuator for DIN rail mount - 4 channels
+HmIP-DRDI3=Homematic IP Dimming Actuator for DIN rail mount - 3 channels
+HmIP-DRS4=Homematic IP Switch Actuator for DIN rail mount - 4-fach
+HmIP-DRSI1=Homematic IP Switch Actuator for DIN rail mount - 1 channel
+HmIP-DRSI4=Homematic IP Switch Actuator for DIN rail mount - 4 channels
+HmIP-DSD-PCB=Homematic IP Doorbell Sensor
+HmIP-FAL230-C10=Homematic IP Floor Heating Actuator - 10 channels 230 V
+HmIP-FAL230-C6=Homematic IP Floor Heating Actuator - 6 channels 230 V
+HmIP-FAL24-C10=Homematic IP Floor Heating Actuator - 10 channels 24 V
+HmIP-FAL24-C6=Homematic IP Floor Heating Actuator - 6 channels 24 V
+HmIP-FALMOT-C12=Homematic IP Floor Heating Actuator - 12 channels, motorised
+HmIP-FBL=Homematic IP Blinds Actuator - flush-mount
+HmIP-FCI1=Homematic IP Contact Interface flush-mount - 1 channel
+HmIP-FCI6=Homematic IP Contact Interface flush-mount - 6 channels
 HmIP-FROLL=Homematic IP Blind Actuator, flush-mount
+HmIP-FSI16=Homematic IP Switch Actuator with Push-button Input (16 A) - flush-mount
+HmIP-HAP=LAN ROUTER
+HmIP-KRCK=Homematic IP Key Ring Remote Control - access control
+HmIP-MIO16-PCB=Homematic IP Multi IO Module Board - 4x4
+HmIP-MOD-HO=Homematic IP Module for Hoermann drives
 HmIP-MOD-OC8=Homematic IP Switch Actuator with OC-Output
-HmIP-PCBS=Homematic IP Wireless Switch Actuator 1-channel, PCB
+HmIP-MOD-RC8=Homematic IP Module Board Transmitter - 8 channels
+HmIP-MOD-TM=Homematic IP Tormatic Module
+HmIP-MP3P=Homematic IP Combination Signalling Device MP3
+HmIP-PCBS=Homematic IP Switch Circuit Board
+HmIP-PCBS-BAT=Homematic IP Switch Circuit for battery operation
+HmIP-PCBS2=Homematic IP Switch Circuit Board - 2 channels
+HmIP-PMFS=Homematic IP Mains Failure Surveillance
+HmIP-RCV-50=Virtual Remote Control
 HmIP-SAM=Homematic IP Acceleration Sensor
-HmIP-SPI=Homematic IP Presence sensor, indoor
+HmIP-SCI=Homematic IP Contact Interface
-HmIP-STHO=Homematic IP Temperature and Humidity Sensor – outdoor
+HmIP-SCTH230=Homematic IP CO2 Sensor, 230 V
+HmIP-SFD=Homematic IP Particulate Matter Sensor
+HmIP-SLO=Homematic IP Light Sensor - outdoor
+HmIP-SMI55=Homematic IP Motion Detector for 55mm frames - indoor
+HmIP-SPDR=Homematic IP Passage Sensor with Direction Recognition
+HmIP-SPI=Homematic IP Presence sensor - indoor
+HmIP-SRD=Homematic IP Rain Sensor
+HmIP-STE1-PCB=Homematic IP Temperature Sensor with external probe - 1 channels
+HmIP-STE2-PCB=Homematic IP Temperature Sensor with external probes - 2 channels
+HmIP-STHD=Homematic IP Temperature and Humidity Sensor with Display - indoor
+HmIP-STHO=Homematic IP Temperature and Humidity Sensor - outdoor
+HmIP-STV=Homematic IP Tilt and Vibration Sensor
+HmIP-SWD=Homematic IP Water Sensor
+HmIP-SWDM=Homematic IP Window / Door Contact with magnet
+HmIP-SWDO=Homematic IP Window / Door Contact - optical
+HmIP-SWDO-I=Homematic IP Window / Door Contact - invisible installation
+HmIP-SWDO-PL=Homematic IP Window / Door Contact - optical, plus
+HmIP-SWO-B=Homematic IP Weather Sensor - basic
+HmIP-SWO-PL=Homematic IP Weather Sensor - plus
+HmIP-SWO-PR=Homematic IP Weather Sensor - pro
+HmIP-USBSM=Homematic IP Switch Actuator and Meter for USB
+HmIP-WGC=Homematic IP Garage Door Controller
+HmIP-WHS2=Homematic IP Switch Actuator for heating systems - 2 channels
+HmIP-WRC2=Homematic IP Wall-mount Remote Control 2 buttons
+HmIP-WRCC2=Homematic IP  Wall-mount Remote Control - flat
+HmIP-WRCD=Homematic IP Wall-mount Remote Control with status display
+HmIP-WRCR=Homematic IP Rotary Button
+HmIP-WTH=Homematic IP Wall Thermostat
+HmIP-WTH-2=Homematic IP Wall Thermostat with Humidity Sensor
+HmIP-WTH-B=Homematic IP Wall Thermostat - basic
+HmIPW-BRC2=Homematic IP Wired Remote Control for brand switches - 2 channels
+HmIPW-DRAP=Homematic IP Wired Access Point
+HmIPW-DRBL4=Homematic IP Wired Blind and Shutter Actuator - 4 channels
+HmIPW-DRD3=Homematic IP Wired Dimming Actuator - 3 channels
+HmIPW-DRI16=Homematic IP Wired Input Module - 16 channels
+HmIPW-DRI32=Homematic IP Wired Input Module - 32 channels
+HmIPW-DRS4=Homematic IP Wired Switch Actuator - 4 channels
+HmIPW-DRS8=Homematic IP Wired Switch Actuator - 8 channels
+HmIPW-FAL230-C10=Homematic IP Wired Floor Heating Actuator - 10 channels, 230 V
+HmIPW-FAL230-C6=Homematic IP Wired Floor Heating Actuator - 6 channels, 230 V
+HmIPW-FAL24-C10=Homematic IP Wired Floor Heating Actuator - 10 channels, 24 V
+HmIPW-FAL24-C6=Homematic IP Wired Floor Heating Actuator - 6 channels, 24 V
+HmIPW-FIO6=Homematic IP Wired IO Module flush-mount - 6 channels
+HmIPW-SMI55=Homematic IP Wired Motion Detector for 55mm frames - indoor
+HmIPW-SPI=Homematic IP Wired Presence sensor - indoor
+HmIPW-STH=Homematic IP Wired Temperature and Humidity Sensor - indoor
+HmIPW-STHD=Homematic IP Wired Temperature and Humidity Sensor with display - indoor
+HmIPW-WRC2=Homematic IP Wired Wall-mount Remote Control - 2 buttons
+HmIPW-WRC6=Homematic IP Wired Wall-mount Remote Control - 6 buttons
+HmIPW-WTH=Homematic IP Wired Wall Thermostat with Humidity Sensor
 KRC4=Homematic IP Key Ring Remote Control - 4 buttons
 KRCA=Homematic IP Key Ring Remote Control - 4 buttons Alarm
 KS550=Wireless Weather Data Sensor 550
@@ -208,20 +285,24 @@ PSM-IT=Homematic IP Pluggable Switch and Meter IT
 PSM-PE=Homematic IP Pluggable Switch and Meter Pin Earth
 PSM-UK=Homematic IP Pluggable Switch and Meter UK
 RC8=Homematic IP Remote Contro, 8-channel
-SMI=Homematic IP Motion Detector, indoor
+RPI-RF-MOD=CO-PROCESSOR
+SMI=Homematic IP Motion Detector - indoor
 SMO=Homematic IP Motion Detector, outdoor
 SRH=Homematic IP Rotary Handle Sensor
-STH=Homematic IP Temperature and Humidity Sensor, indoor
+STH=Homematic IP Temperature and Humidity Sensor - indoor
-STHD=Homematic IP Temperature and Humidity Sensor with Display, indoor
-SWD=Homematic IP Window/Door Contact optical
 SWSD=Homematic IP Smoke Detector
 TRV=Homematic IP Radiator Thermostat
+TRV-B=Homematic IP Radiator Thermostat - basic
+TRV-B-UK=Homematic IP Radiator Thermostat - basic UK
+TRV-C=Homematic IP Radiator Thermostat - compact
+TRV-E=Homematic IP Radiator Thermostat - Evo
 TRV-UK=Homematic IP Radiator Thermostat UK
+The END=
+VIR-HUE-GTW=Philips-Hue Gateway
 VIR-OL-GTW=OSRAM-Lightify Gateway
-WRC2=Homematic IP Wall-mount Remote Control 2 buttons
 WRC6=Homematic IP Wall-mount Remote Control 6 buttons
 WS888=Wireless Weather Data Center
-WTH=Homematic IP Wall Thermostat
+WT=Homematic IP Wall Thermostat
 ZEL_STG_RM_DWT_10=Wireless Display Push-button 2-channel, surface-mount
 ZEL_STG_RM_FDK=Wireless Window Rotary Handle Sensor
 ZEL_STG_RM_FEP_230V=Wireless Blind Actuator 1-channel, flush-mount
@@ -240,7 +321,7 @@ atent=Remote Control DORMA
 
 ACCELERATION_TRANSCEIVER=Vibration/Acceleration Sensor
 ACCELERATION_TRANSCEIVER|MOTION|FALSE=no motion/horizontal
-ACCELERATION_TRANSCEIVER|MOTION|TRUE=motion detected/vertical
+ACCELERATION_TRANSCEIVER|MOTION|TRUE=motion detected/tilted
 ACCELERATION_TRANSCEIVER|MSG_FOR_POS_A=Message in position vertical
 ACCELERATION_TRANSCEIVER|MSG_FOR_POS_A|CLOSED=closed
 ACCELERATION_TRANSCEIVER|MSG_FOR_POS_A|NO_MSG=no message
@@ -249,6 +330,8 @@ ACCELERATION_TRANSCEIVER|MSG_FOR_POS_B=Message in position horizontal
 ACCELERATION_TRANSCEIVER|MSG_FOR_POS_B|CLOSED=closed
 ACCELERATION_TRANSCEIVER|MSG_FOR_POS_B|NO_MSG=no message
 ACCELERATION_TRANSCEIVER|MSG_FOR_POS_B|OPEN=open
+ACOUSTIC_ALARM_ACTIVE|FALSE=Acoustic signal deactivated
+ACOUSTIC_ALARM_ACTIVE|TRUE=Acoustic signal activated
 ACOUSTIC_ALARM_SELECTION|DELAYED_EXTERNALLY_ARMED=Absence mode delayed
 ACOUSTIC_ALARM_SELECTION|DELAYED_INTERNALLY_ARMED=Presence mode delayed
 ACOUSTIC_ALARM_SELECTION|DISABLE_ACOUSTIC_SIGNAL=No acoustic signal
@@ -267,8 +350,10 @@ ACOUSTIC_ALARM_SELECTION|FREQUENCY_RISING=Frequency increasing
 ACOUSTIC_ALARM_SELECTION|FREQUENCY_RISING_AND_FALLING=Frequency increasing/dropping
 ACOUSTIC_ALARM_SELECTION|INTERNALLY_ARMED=Presence mode
 ACOUSTIC_ALARM_SELECTION|LOW_BATTERY=Battery empty
+ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER=MP3-Player
 ACTUAL_HUMIDITY=Relative humidity
 ACTUAL_TEMPERATURE=Actual temperature
+AIR_PRESSURE=Barometric pressure
 AKKU|LEVEL=Charging status
 AKKU|STATUS|CHARGE=Loading
 AKKU|STATUS|DISCHARGE=Battery supplied
@@ -284,6 +369,8 @@ ALARMTIME_MAX=Max. alarm duration
 ALARM_SWITCH_VIRTUAL_RECEIVER=Alarm siren
 ALL_LEDS=Set all channels
 ANALOG_INPUT=Analog
+ANALOG_INPUT_TRANSMITTER|FILTER_SIZE=Number of measurements used for the average value of the input voltage.
+ANALOG_INPUT_TRANSMITTER|VOLTAGE=Input voltage
 ANALOG_OUTPUT=Analog
 ANALOG_OUTPUT_TRANSCEIVER=Analogue output
 ANALOG_OUTPUT_TRANSCEIVER|LEVEL=Output level
@@ -305,9 +392,12 @@ ARMSTATE|ALLSENS_ARMED=All sensors armed, (absence mode)
 ARMSTATE|DISARMED=Protection deactivated
 ARMSTATE|EXTSENS_ARMED=Outdoor sensors armed, (presence mode)
 ARR_TIMEOUT=Time-out for bidirectional communication
+ATC_ADAPTION_INTERVAL=Interval for temperature compensation of the sensors
+ATC_MODE=Temperature compensation of the sensors
 ATC_OFF=Off
 ATC_ON=On
 AUTO_MODE=Auto mode
+AVERAGE_ILLUMINATION=Average level of brightness
 BACKLIGHT_AT_CHARGE=Back light while device is in charging station
 BACKLIGHT_AT_KEYSTROKE=Back light at button press
 BACKLIGHT_AT_MOTION=Back light at movement/vibration
@@ -316,10 +406,23 @@ BATTERY_POWERED=Battery operation
 BATTERY_STATE=Battery status
 BAT_DEFECT_LIMIT=Defect battery threshold
 BLIND=Blind actuator
+BLIND_TRANSMITTER|ACTIVITY_STATE|DOWN=Blind moves down
+BLIND_TRANSMITTER|ACTIVITY_STATE|STABLE=Blind not moving
+BLIND_TRANSMITTER|ACTIVITY_STATE|UNKNOWN=Blind activity unknown
+BLIND_TRANSMITTER|ACTIVITY_STATE|UP=Blind moves up
 BLIND_TRANSMITTER|LEVEL=Blind level
 BLIND_TRANSMITTER|LEVEL_2=Slats position
+BLIND_TRANSMITTER|PROCESS|NOT_STABLE=Blind moves
+BLIND_TRANSMITTER|PROCESS|STABLE=Blind not moving
+BLIND_VIRTUAL_RECEIVER=Blind actuator
+BLIND_VIRTUAL_RECEIVER|ACTIVITY_STATE|DOWN=Blind moves down
+BLIND_VIRTUAL_RECEIVER|ACTIVITY_STATE|STABLE=Blind not moving
+BLIND_VIRTUAL_RECEIVER|ACTIVITY_STATE|UNKNOWN=Blind activity unknown
+BLIND_VIRTUAL_RECEIVER|ACTIVITY_STATE|UP=Blind moves up
 BLIND_VIRTUAL_RECEIVER|LEVEL=Blind level
 BLIND_VIRTUAL_RECEIVER|LEVEL_2=Slats position
+BLIND_VIRTUAL_RECEIVER|PROCESS|NOT_STABLE=Blind moves
+BLIND_VIRTUAL_RECEIVER|PROCESS|STABLE=Blind not moving
 BLIND_VIRTUAL_RECEIVER|STOP=Stop
 BLIND|CHANGE_OVER_DELAY=Blind direction switch-over time
 BLIND|LEVEL=Blind level
@@ -327,12 +430,16 @@ BLIND|REFERENCE_RUNNING_TIME_BOTTOM_TOP=Running time bottom to top
 BLIND|REFERENCE_RUNNING_TIME_TOP_BOTTOM=Running time top to bottom
 BLIND|REFERENCE_RUN_COUNTER=Number of runs until automatic calibration drive
 BLIND|STOP=Stop
+BLOCKING_PERIOD_UNIT=Time interval unit
+BLOCKING_PERIOD_VALUE=Time interval value
 BOOST_MODE=Boost function
 BOOST_MODE|FALSE=Boost mode OFF
 BOOST_MODE|TRUE=Boost mode ON
-BOOST_STATE=Boost duration
+BOOST_STATE=Boost state
+BOOST_TIME=Boost duration
 BRIGHTNESS=Brightness
 BRIGHTNESS_FILTER=Brightness filter
+BRIGHTNESS_TRANSMITTER|FILTER_SIZE=Number of last brightness values used for calculation of brightness
 BURST_RX=Wake on radio
 BUTTON_LOCK=Keypad lock
 BUTTON_RESPONSE_WITHOUT_BACKLIGHT=Immediate reaction to keypress without previous display backlight
@@ -382,11 +489,19 @@ CLIMATECONTROL_FLOOR_DIRECT_TRANSMITTER|HUMIDITY_LIMIT_DISABLE=Humidity threshol
 CLIMATECONTROL_FLOOR_DIRECT_TRANSMITTER|HUMIDITY_LIMIT_VALUE=Humidity threshold
 CLIMATECONTROL_FLOOR_DIRECT_TRANSMITTER|MINIMAL_FLOOR_TEMPERATURE=Minimum floor temperature
 CLIMATECONTROL_FLOOR_PUMP_TRANSCEIVER=Floor heating/Pump control
+CLIMATECONTROL_FLOOR_PUMP_TRANSCEIVER|EMERGENCY_OPERATION|FALSE=Connection with room control unit OK
+CLIMATECONTROL_FLOOR_PUMP_TRANSCEIVER|EMERGENCY_OPERATION|TRUE=Connection failure with room control unit
 CLIMATECONTROL_FLOOR_TRANSCEIVER=Floor heating
+CLIMATECONTROL_FLOOR_TRANSCEIVER|EMERGENCY_OPERATION|FALSE=Connection with room control unit OK
+CLIMATECONTROL_FLOOR_TRANSCEIVER|EMERGENCY_OPERATION|TRUE=Connection failure with room control unit
 CLIMATECONTROL_FLOOR_TRANSMITTER=Room thermostat
+CLIMATECONTROL_FLOOR_TRANSMITTER|EMERGENCY_OPERATION|FALSE=Connection with room control unit OK
+CLIMATECONTROL_FLOOR_TRANSMITTER|EMERGENCY_OPERATION|TRUE=Connection failure with room control unit
 CLIMATECONTROL_HEAT_DEMAND_BOILER_TRANSMITTER=Channel heating demand
 CLIMATECONTROL_HEAT_DEMAND_PUMP_TRANSMITTER=Channel heating demand
 CLIMATECONTROL_HEAT_DEMAND_TRANSMITER=Channel heating demand
+CLIMATECONTROL_INPUT_RECEIVER=Channel heating/cooling
+CLIMATECONTROL_INPUT_TRANSMITTER=Input channel
 CLIMATECONTROL_RECEIVER=Radiator Thermostat (Receiver wall mounted thermostat)
 CLIMATECONTROL_REGULATOR=Radiator thermostat
 CLIMATECONTROL_REGULATOR|ADJUSTING_COMMAND=Adjustment command
@@ -440,14 +555,24 @@ CLIMATECONTROL_VENT_DRIVE|ERROR|VALVE_DRIVE_LOOSE=The valve drive is not install
 CLIMATECONTROL_VENT_DRIVE|VALVE_ERROR_POSITION=Valve drive fault position
 CLIMATECONTROL_VENT_DRIVE|VALVE_OFFSET_VALUE=Valve drive offset position
 CLIMATECONTROL_VENT_DRIVE|VALVE_STATE=Valve drive position
+COLOR|LEVEL=Brightness
+COMBINED_PARAMETER=Channel action
 COMFORT_MODE=Comfort temperature
 COMPATIBILITY_MODE=Compatibility mode
 CONDITION_CURRENT=Current sensor
 CONDITION_FREQUENCY=Frequency sensor
 CONDITION_POWER=Power sensor
 CONDITION_VOLTAGE=Voltage sensor
-COND_TX_CYCLIC_ABOVE=Send decision value cyclically if upper limit is exceeded
+COND_SWITCH_TRANSMITTER=Transmitter decision value
-COND_TX_CYCLIC_BELOW=Send decision value cyclically if lower limit falls below threshold
+COND_SWITCH_TRANSMITTER_BRIGHTNESS=Brightness sensor
+COND_SWITCH_TRANSMITTER_HUMIDITY=Humidity sensor
+COND_SWITCH_TRANSMITTER_RAIN_DROP=Rain sensor
+COND_SWITCH_TRANSMITTER_RAIN_QUANTITY=Sensor rainfall volume
+COND_SWITCH_TRANSMITTER_TEMPERATURE=Temperature sensor
+COND_SWITCH_TRANSMITTER_WIND_DIRECTION=Wind direction sensor
+COND_SWITCH_TRANSMITTER_WIND_SPEED=Wind velocity sensor
+COND_TX_CYCLIC_ABOVE=Send decision value cyclically
+COND_TX_CYCLIC_BELOW=Send decision value cyclically
 COND_TX_DECISION_ABOVE=Sent decision value if upper limit is exceeded
 COND_TX_DECISION_BELOW=Sent decision value if lower limit falls below threshold
 COND_TX_FALLING=Send decision value if lower limit falls below threshold  +
@@ -462,13 +587,17 @@ CONTROL_MODE|AUTO-MODE=Auto mode
 CONTROL_MODE|BOOST-MODE=Boost function
 CONTROL_MODE|MANU-MODE=Manu mode
 CONTROL_MODE|PARTY-MODE=Holiday mode
+CURRENT=Current
 CURRENTDETECTION_BEHAVIOR=Response
 CURRENTDETECTION_BEHAVIOR|"CURRENTDETECTION_ACTIVE"=Two-way circuit
 CURRENTDETECTION_BEHAVIOR|"CURRENTDETECTION_INACTIVE_VALUE_OUTPUT_1"=Output 1 active
 CURRENTDETECTION_BEHAVIOR|"CURRENTDETECTION_INACTIVE_VALUE_OUTPUT_2"=Output 2 active
+CURRENT_ILLUMINATION=Unfiltered, current level of brightness
+CURRENT_PASSAGE_DIRECTION|FALSE=Passage detected: No
+CURRENT_PASSAGE_DIRECTION|TRUE=Passage detected: Yes
 CYCLIC_INFO_MSG=Cyclically status message
 CYCLIC_INFO_MSG_DIS=Number of messages that are left out
-CYCLIC_INFO_MSG_DIS_UNCHANGED=Number of unchangeable status messages that are left out
+CYCLIC_INFO_MSG_DIS_UNCHANGED=Number of unchanged status messages that are left out
 CYCLIC_INFO_MSG_OVERDUE_THRESHOLD=Number of missed status messages until 'unreach' is flagged
 CYCLIC_INFO_MSG_PAUSE=Interval for cyclically status messages
 DATE_TIME_UNKNOWN|FALSE=Correct time known
@@ -501,7 +630,19 @@ DIGITAL_OUTPUT=Digital
 DIGITAL_OUTPUT|STATE|FALSE=Switching status: off
 DIGITAL_OUTPUT|STATE|TRUE=Switching status: on
 DIMMER=Dimming actuator
+DIMMER_TRANSMITTER|ACTIVITY_STATE|DOWN=Ramp down
+DIMMER_TRANSMITTER|ACTIVITY_STATE|STABLE=Level stable
+DIMMER_TRANSMITTER|ACTIVITY_STATE|UNKNOWN=Dimmer activity unknown
+DIMMER_TRANSMITTER|ACTIVITY_STATE|UP=Ramp up
+DIMMER_TRANSMITTER|PROCESS|NOT_STABLE=Ramp active
+DIMMER_TRANSMITTER|PROCESS|STABLE=Level stable
 DIMMER_VIRTUAL_RECEIVER=Dimming actuator
+DIMMER_VIRTUAL_RECEIVER|ACTIVITY_STATE|DOWN=Ramp down
+DIMMER_VIRTUAL_RECEIVER|ACTIVITY_STATE|STABLE=Level stable
+DIMMER_VIRTUAL_RECEIVER|ACTIVITY_STATE|UNKNOWN=Dimmer activity unknown
+DIMMER_VIRTUAL_RECEIVER|ACTIVITY_STATE|UP=Ramp up
+DIMMER_VIRTUAL_RECEIVER|PROCESS|NOT_STABLE=Ramp active
+DIMMER_VIRTUAL_RECEIVER|PROCESS|STABLE=Level stable
 DIMMER|CHARACTERISTIC=Output characteristic
 DIMMER|ERROR_OVERHEAT=Overheat
 DIMMER|ERROR_OVERLOAD=Overload
@@ -521,12 +662,15 @@ DIMMER|RAMP_TIME=Dimming time
 DIMMER|REDUCE_LEVEL=Reducing level over temperature
 DIMMER|REDUCE_TEMP_LEVEL=Reducing threshold over temperature
 DIMMER|RELAY_OFFDELAY_TIME=Relay time for switch off delay
+DISABLE_ACOUSTIC_CHANNELSTATE=Deactivate buzzer
+DISABLE_ACOUSTIC_SENDSTATE=Deactivate acoustic confirmation of button press
 DISPLAY_BACKLIGHT_MODE=Display back light mode
 DISPLAY_BACKLIGHT_MODE|AUTO=automatic
 DISPLAY_BACKLIGHT_MODE|OFF=off
 DISPLAY_BACKLIGHT_MODE|ON=on
 DISPLAY_BACKLIGHT_TIME=Display back light time
 DISPLAY_BRIGHTNESS=Display brightness
+DISPLAY_CONTRAST=Display contrast
 DISPLAY_ENERGYOPTIONS=The display will be switched off after
 DISPLAY_INVERTING=Display inverting
 DISPLAY|ALARM_COUNT=Number alarm messages
@@ -590,6 +734,16 @@ DISPLAY|UNIT|NONE=No unit
 DISPLAY|UNIT|PERCENT=Unit percentage
 DISPLAY|UNIT|WATT=Unit watt
 DISPLAY|WINDOW=Window symbol
+DOOR_COMMAND|CLOSE=Closing the garage door
+DOOR_COMMAND|NOP=No action
+DOOR_COMMAND|OPEN=Opening the garage door
+DOOR_COMMAND|PARTIAL_OPEN=Ventilation position
+DOOR_COMMAND|STOP=Stop movement
+DOOR_RECEIVER=Door-/garage door opener
+DOOR_STATE|CLOSED=Position closed
+DOOR_STATE|OPEN=Position opened
+DOOR_STATE|POSITION_UNKNOWN=Position unknown
+DOOR_STATE|VENTILATION_POSITION=Ventilation position
 DUAL_WHITE_BRIGHTNESS=Dual White Controller (dimmer)
 DUAL_WHITE_COLOR=Dual White Controller (colour)
 DUAL_WHITE_COLOR|LEVEL=Colour value
@@ -598,6 +752,7 @@ DUAL_WHITE_COLOR|OLD_LEVEL=Last value
 DUAL_WHITE_COLOR|RAMP_STOP=Stop colour change
 DUAL_WHITE_COLOR|RAMP_TIME=Ramp time for colour change
 DURATION_UNIT=Unit duration
+DURATION_UNIT|10MS=Unit duration: 10 mS
 DURATION_UNIT|D=Unit duration: Days
 DURATION_UNIT|H=Unit duration: Hours
 DURATION_UNIT|M=Unit duration: Minutes
@@ -610,29 +765,67 @@ EMERGENCY_OPERATION|FALSE=Connection with room control unit OK
 EMERGENCY_OPERATION|TRUE=Connection failure with room control unit
 ENABLE_ROUTING=Routing active
 ENERGIE_METER_TRANSMITTER|AVERAGING=Averaging via
-ENERGIE_METER_TRANSMITTER|CURRENT=Current
 ENERGIE_METER_TRANSMITTER|ENERGY_COUNTER=Energy counter device
 ENERGIE_METER_TRANSMITTER|ENERGY_COUNTER_OVERFLOW|FALSE=no transfer
 ENERGIE_METER_TRANSMITTER|ENERGY_COUNTER_OVERFLOW|TRUE=Transfer
 ENERGIE_METER_TRANSMITTER|FREQUENCY=Frequency
 ENERGIE_METER_TRANSMITTER|POWER=Power
 ENERGIE_METER_TRANSMITTER|TX_THRESHOLD_POWER=TX Difference Power
-ENERGIE_METER_TRANSMITTER|VOLTAGE=Voltage
 ERROR=Error
+ERROR_BAD_RECHARGEABLE_BATTERY_HEALTH=Battery status: Not OK
+ERROR_BAD_RECHARGEABLE_BATTERY_HEALTH|FALSE=Battery status: OK
+ERROR_BAD_RECHARGEABLE_BATTERY_HEALTH|TRUE=Battery status: Not OK
+ERROR_BUS_CONFIG_MISMATCH=The actual Bus topology is different to the configured Bus topology.
+ERROR_BUS_CONFIG_MISMATCH|FALSE=The actual bus topology corresponds to the configured bus topology.
+ERROR_BUS_CONFIG_MISMATCH|TRUE=The actual Bus topology is different to the configured Bus topology.
 ERROR_CODE=Error code
+ERROR_COPROCESSOR=The channel is not accessible. Please check the power supply of the channel or deactivate it in the WebUI.
+ERROR_COPROCESSOR|FALSE=Fehler CoProcessor: Nein
+ERROR_COPROCESSOR|TRUE=Fehler CoProcessor: Ja
+ERROR_NON_FLAT_POSITIONING=Error position detection
+ERROR_NON_FLAT_POSITIONING|FALSE=Angle for position detection exceeded: No
+ERROR_NON_FLAT_POSITIONING|TRUE=Angle for position detection exceeded: Yes
+ERROR_OVERHEAT=Overheat: Yes
 ERROR_OVERHEAT|FALSE=Overheat: No
 ERROR_OVERHEAT|TRUE=Overheat: Yes
+ERROR_OVERLOAD=Current overload: Yes
 ERROR_OVERLOAD|FALSE=Current overload: No
 ERROR_OVERLOAD|TRUE=Current overload: Yes
+ERROR_POWER_FAILURE=Power supply error
+ERROR_POWER_FAILURE|FALSE=Power supply OK
+ERROR_POWER_FAILURE|TRUE=Power supply error
+ERROR_POWER_SHORT_CIRCUIT_BUS_1=A short circuit between the power lines of Bus 1 was detected.
+ERROR_POWER_SHORT_CIRCUIT_BUS_1|FALSE=No short circuit between the power lines of Bus 1 detected.
+ERROR_POWER_SHORT_CIRCUIT_BUS_1|TRUE=A short circuit between the power lines of Bus 1 was detected.
+ERROR_POWER_SHORT_CIRCUIT_BUS_2=A short circuit between the power lines of Bus 2 was detected.
+ERROR_POWER_SHORT_CIRCUIT_BUS_2|FALSE=No short circuit between the power lines of Bus 2 detected.
+ERROR_POWER_SHORT_CIRCUIT_BUS_2|TRUE=A short circuit between the power lines of Bus 2 was detected.
 ERROR_POWER|FALSE=Power supply error
 ERROR_POWER|TRUE=Power supply voltage OK
 ERROR_REDUCED|FALSE=Full power possible
 ERROR_REDUCED|TRUE=reduced power
+ERROR_RESTART_NEEDED=The device must be restarted.
+ERROR_RESTART_NEEDED|FALSE=Neustart nötig: Nein
+ERROR_RESTART_NEEDED|TRUE=Neustart nötig: Ja
 ERROR_SABOTAGE|FALSE=Sabotage triggered
 ERROR_SABOTAGE|TRUE=Sabotage OK
+ERROR_SHORT_CIRCUIT_DATA_LINE_BUS_1=A short circuit between 24V line and the Data line A and/or B of Bus 1 was detected.
+ERROR_SHORT_CIRCUIT_DATA_LINE_BUS_1|FALSE=No short circuit between 24V line and the Data line A and/or B of Bus 1 detected.
+ERROR_SHORT_CIRCUIT_DATA_LINE_BUS_1|TRUE=A short circuit between 24V line and the Data line A and/or B of Bus 1 was detected.
+ERROR_SHORT_CIRCUIT_DATA_LINE_BUS_2=A short circuit between 24V line and the Data line A and/or B of Bus 2 was detected.
+ERROR_SHORT_CIRCUIT_DATA_LINE_BUS_2|FALSE=No short circuit between 24V line and the Data line A and/or B of Bus 2 detected.
+ERROR_SHORT_CIRCUIT_DATA_LINE_BUS_2|TRUE=A short circuit between 24V line and the Data line A and/or B of Bus 2 was detected.
+ERROR_UNDERVOLTAGE=Operating voltage not OK
+ERROR_UNDERVOLTAGE|FALSE=Operating voltage OK
+ERROR_UNDERVOLTAGE|TRUE=Operating voltage not OK
 ERROR_UPDATE|FALSE=Error device update: no
 ERROR_UPDATE|TRUE=Error device update: Yes
+ERROR_WIND_COMMUNICATION|FALSE=Sensor wind directionCommunication OK
+ERROR_WIND_COMMUNICATION|TRUE=Sensor wind directionCommunication error
+ERROR_WIND_NORTH|FALSE=Sensor wind directionNorth direction calibrated
+ERROR_WIND_NORTH|TRUE=Sensor wind directionNorth direction not calibrated
 ERROR|NO_ERROR=No error
+EVENT_DELAYTIME=Message delay
 EVENT_DELAY_UNIT=Unit of event delay
 EVENT_DELAY_VALUE=Value event delay
 EVENT_FILTER_NUMBER=Sensitivity
@@ -642,7 +835,16 @@ EVENT_RANDOMTIME_VALUE=Status messages random part
 EXPECT_AES=AES encryption
 EXTERNAL_CLOCK|FALSE=Energy-saving temperature mode inactive
 EXTERNAL_CLOCK|TRUE=Energy-saving temperature mode active
+FREQUENCY_ALTERNATING_LOW_HIGH=Frequency low/high
+FREQUENCY_ALTERNATING_LOW_MID_HIGH=Frequency low/average/high
+FREQUENCY_FALLING=Frequency dropping
+FREQUENCY_HIGHON_LONGOFF=Frequency high on, long off
+FREQUENCY_HIGHON_OFF=Frequency high on/off
 FREQUENCY_INPUT=Analog
+FREQUENCY_LOWON_LONGOFF_HIGHON_LONGOFF=Frequency low on - long off, high on - long off
+FREQUENCY_LOWON_OFF_HIGHON_OFF=Frequency low on/off, high on/off
+FREQUENCY_RISING=Frequency increasing
+FREQUENCY_RISING_AND_FALLING=Frequency increasing/dropping
 FROST_PROTECTION_TEMPERATURE=Frost protection temperature
 FROST_PROTECTION|FALSE=Frost protection inactive
 FROST_PROTECTION|TRUE=Frost protection active
@@ -657,7 +859,7 @@ HEATING_CLIMATECONTROL_TRANSCEIVER|ACTIVE_PROFILE=Active profile
 HEATING_CLIMATECONTROL_TRANSCEIVER|CONTROL_MODE=Auto/manu/party mode
 HEATING_CLIMATECONTROL_TRANSCEIVER|FROST_PROTECTION|FALSE=Frost protection inactive
 HEATING_CLIMATECONTROL_TRANSCEIVER|FROST_PROTECTION|TRUE=Frost protection active
-HEATING_CLIMATECONTROL_TRANSCEIVER|HUMIDITY=Humidity
+HEATING_CLIMATECONTROL_TRANSCEIVER|HUMIDITY=Relative humidity
 HEATING_CLIMATECONTROL_TRANSCEIVER|LEVEL=Valve opening
 HEATING_CLIMATECONTROL_TRANSCEIVER|PARTY_MODE|FALSE=Holiday mode inactive
 HEATING_CLIMATECONTROL_TRANSCEIVER|PARTY_MODE|TRUE=Holiday mode active
@@ -673,11 +875,18 @@ HEATING_KEY_RECEIVER=Receiver thermostat
 HEATING_ROOM_TH_RECEIVER=Receiver thermostat
 HEATING_ROOM_TH_TRANSCEIVER=Transmitter thermostat
 HEATING_SHUTTER_CONTACT_RECEIVER=Receiver thermostat
+HIGHEST_ILLUMINATION=Maximum level of brightness
 HUMIDITY=Relative humidity
 HUMIDITY_ALARM|FALSE=Humidity not exceeded
 HUMIDITY_ALARM|TRUE=Humidity exceeded
 HUMIDITY_LIMITER|FALSE=Operating mode humidity limit inactive
 HUMIDITY_LIMITER|TRUE=Operating mode humidity limit active
+IDENTIFICATION_MODE_KEY_VISUAL|FALSE=Lighting system button: OFF
+IDENTIFICATION_MODE_KEY_VISUAL|TRUE=Lighting system button: ON
+IDENTIFICATION_MODE_LCD_BACKLIGHT|FALSE=Lighting Display: OFF
+IDENTIFICATION_MODE_LCD_BACKLIGHT|TRUE=Lighting Display: ON
+IDENTIFY_DURATION=Duration of lighting
+IDENTIFY_TARGET_LEVEL=Brightness value of lighting
 ILLUMINATION=Brightness
 INHIBIT=Lock
 INHIBIT|FALSE=Lock inactive
@@ -732,6 +941,11 @@ KEYMATIC|STATE|FALSE=Lock locked
 KEYMATIC|STATE|TRUE=Lock unlocked
 KEYPRESS_SIGNAL=Button sound
 KEY_TRANSCEIVER=Push button
+KEY_TRANSCEIVER|CHANNEL_OPERATION_MODE=Channel behaviour
+KEY_TRANSCEIVER|CHANNEL_OPERATION_MODE|BINARY_BEHAVIOR=Contact
+KEY_TRANSCEIVER|CHANNEL_OPERATION_MODE|INACTIVE=not active
+KEY_TRANSCEIVER|CHANNEL_OPERATION_MODE|KEY_BEHAVIOR=Button
+KEY_TRANSCEIVER|CHANNEL_OPERATION_MODE|SWITCH_BEHAVIOR=Switch
 KEY_TRANSCEIVER|DBL_PRESS_TIME=Double-click time (keypad lock)
 KEY_TRANSCEIVER|LONG_PRESS_TIME=Minimum duration for long button press
 KEY|CHANNEL_FUNCTION=Channel function
@@ -763,7 +977,10 @@ KEY|TEXTLINE_2=Text line
 LANGUAGE=Language
 LANGUAGE|ENGLISH=English
 LANGUAGE|GERMAN=German
+LAST_PASSAGE_DIRECTION|FALSE=Last passage detected: No
+LAST_PASSAGE_DIRECTION|TRUE=Last passage detected: Yes
 LED_DISABLE_CHANNELSTATE=Deactivate device LED
+LED_DISABLE_LED_DISABLE_SENDSTATE=Deactivate visual confirmation of button press
 LED_ONTIME=LED on time (gn/rd)
 LED_SLEEP_MODE|OFF=Wake up display from standby mode
 LED_SLEEP_MODE|ON=Bring system to standby mode
@@ -771,8 +988,8 @@ LED_STATUS|GREEN=Display green
 LED_STATUS|OFF=Display off
 LED_STATUS|ORANGE=Display orange
 LED_STATUS|RED=Display red
-LEVEL=Dimming value
+LEVEL=Value
-LEVEL_REAL=Dimming value real channel
+LEVEL_REAL=Value
 LIVE_MODE_RX=Live mode
 LOCAL_RESET_DISABLE=Lock reset via device button
 LOCAL_RESET_DISABLED=Lock reset via device button
@@ -802,9 +1019,15 @@ LOGIC_PLUSINVERS=PLUS_INVERS (PLUS with previous inverting of level)
 LOGIC_XOR=XOR (equal to OR, but if both levels > 0. the result is 0)
 LOWBAT_SIGNAL=Low bat. signal
 LOWERING_MODE=Reduction temperature
+LOWEST_ILLUMINATION=Minimum level of brightness
 MAINS_POWERED=Mains operation
 MAINTENANCE|ERROR_OVERHEAT=Overheat: Yes
+MAINTENANCE|ON_MIN_LEVEL=Valve position changeover value
+MAINTENANCE|PWM_AT_LOW_VALVE_POSITION=Automatic changeover from continuous to PWM (with small valve positions)
 MANU_MODE=Manu mode
+MASS_CONCENTRATION_PM_1=Mass concentration PM1.0
+MASS_CONCENTRATION_PM_10=Mass concentration PM10
+MASS_CONCENTRATION_PM_2_5=Mass concentration PM2.5
 MIN_MAX_VALUE_NOT_RELEVANT_FOR_MANU_MODE=Ignore min./max. temperature in manu mode
 MIOB_DIN_CONFIG=Digital input mode
 MODUS_BUTTON_LOCK=Mode operating lock
@@ -827,6 +1050,8 @@ MOD_EM8BIT_TRANSMITTER|DATA_TRANSMISSION_CONDITION|NEW_DATA_SEND_IMMEDIATELY_DEF
 MOD_EM8BIT_TRANSMITTER|DATA_TRANSMISSION_CONDITION|NEW_DATA_STABLE_FOR_TIME_DEFAULT_DISABLE=Mode 6
 MOD_EM8BIT_TRANSMITTER|DATA_TRANSMISSION_CONDITION|NEW_DATA_STABLE_FOR_TIME_DEFAULT_ENABLE=Mode 4
 MOD_EM8BIT_TRANSMITTER|STATE=Value of data input
+MOISTURE_DETECTED|FALSE=Humidity detected: No
+MOISTURE_DETECTED|TRUE=Water level detected: Yes
 MOTIONDETECTOR_TRANSCEIVER=Motion detector
 MOTION_ACTIVE_TIME=Time after which the detected movement is reset
 MOTION_DETECTION_ACTIVE|FALSE=Motion detector inactive
@@ -837,11 +1062,19 @@ MOTION_DETECTOR|ERROR|SABOTAGE=Sabotage
 MOTION_DETECTOR|MIN_INTERVAL=Minimum transmission interval
 MOTION|FALSE=no motion
 MOTION|TRUE=motion detected
+MULTICAST_ROUTER_MODULE_ENABLED=MultiCast Routing
+MULTI_MODE_INPUT_TRANSMITTER=Input Module
 NOT_USED=Unused
+NUMBER_CONCENTRATION_PM_1=Quantity concentration PM1.0
+NUMBER_CONCENTRATION_PM_10=Quantity concentration PM10
+NUMBER_CONCENTRATION_PM_2_5=Quantity concentration PM2.5
 OLD_LEVEL=Last dimming value
 ON_TIME=Switch-on time
-OPERATING_VOLTAGE=Operating voltage in V:
+OPERATING_VOLTAGE=Operating voltage in V
-OPTICAL_ALARM_SELECTION|BLINKING_ALTERNATELY_REPEATING=Alternating, slow flashing
+OPERATING_VOLTAGE_STATUS=Operating voltage in V
+OPTICAL_ALARM_ACTIVE|FALSE=Visual signal deactivated
+OPTICAL_ALARM_ACTIVE|TRUE=Visual signal activated
+OPTICAL_ALARM_SELECTION|BLINKING_ALTERNATELY_REPEATING=Alternating slow flashing
 OPTICAL_ALARM_SELECTION|BLINKING_BOTH_REPEATING=Simultaneous slow flashing
 OPTICAL_ALARM_SELECTION|CONFIRMATION_SIGNAL_0=Confirmation signal 0 - long long
 OPTICAL_ALARM_SELECTION|CONFIRMATION_SIGNAL_1=Confirmation signal 1 - long short
@@ -857,10 +1090,26 @@ PARAM_SELECT|T1-T2=Difference temperature sensor 1 - sensor 2
 PARAM_SELECT|T2=Temperature sensor 2
 PARAM_SELECT|T2-T1=Difference temperature sensor 2 - sensor 1
 PARTY_SET_POINT_TEMPERATURE=Party/holiday temperature
+PARTY_START_DAY=Holiday start day
+PARTY_START_MONTH=Holiday start month
+PARTY_START_TIME=Holiday start time
+PARTY_START_YEAR=Holiday start year
+PARTY_STOP_DAY=Holiday end day
+PARTY_STOP_MONTH=Holiday end month
+PARTY_STOP_TIME=Holiday end time
+PARTY_STOP_YEAR=Holiday end year
+PARTY_TEMPERATURE=Holiday temperature
 PARTY_TIME_END=Party/holiday end time
 PARTY_TIME_START=Party/holiday start time
+PASSAGE_COUNTER_OVERFLOW|FALSE=Passage counter overrun: No
+PASSAGE_COUNTER_OVERFLOW|TRUE=Passage counter overrun: Yes
+PASSAGE_COUNTER_VALUE=Number of passages
+PASSAGE_DETECTOR_COUNTER_TRANSMITTER=Passage sensor
+PASSAGE_DETECTOR_COUNTER_TRANSMITTER|CHANNEL_OPERATION_MODE=Operating mode
+PASSAGE_DETECTOR_DIRECTION_TRANSMITTER=Direction recognition
 PEER_NEEDS_BURST=Burst signal necessary
 PIR_OPERATION_MODE=Normal / eco mode
+PIR_SENSITIVITY=Sensor sensitivity
 POSITION_SAVE_TIME=Position saving time
 POWERMETER_IEC1|ENERGY_COUNTER=Energy counter device
 POWERMETER_IEC1|GAS_ENERGY_COUNTER=Energy and gas metering device
@@ -888,19 +1137,28 @@ POWERMETER|VOLTAGE=Voltage
 POWERUP_ACTION=Activity on power supply
 POWERUP_JUMPTARGET=Activity on power supply
 POWERUP_OFF=none
+POWERUP_OFFDELAY_VALUE=Value switch off delay
+POWERUP_OFFTIME_UNIT=Unit of switch-off time
 POWERUP_ON=simulate short button press
 POWERUP_ONDELAY_UNIT=Unit of switch on delay
 POWERUP_ONDELAY_VALUE=Value switch on delay
 POWERUP_ONTIME_UNIT=Unit of switch-on time
 POWERUP_ONTIME_VALUE=Value switch-on time
+POWER_MAINS_FAILURE|FALSE=Power failure: No
+POWER_MAINS_FAILURE|TRUE=Power failure: Yes
 POWER_SUPPLY=Power supply
+PRESENCEDETECTOR_TRANSCEIVER=Presence Sensor
 PRESENCEDETECTOR_TRANSCEIVER|MIN_INTERVAL=Minimum transmission interval
+PRESENCE_DETECTION_ACTIVE|FALSE=Presence detector not active
+PRESENCE_DETECTION_ACTIVE|TRUE=Presence detector active
+PRESENCE_DETECTION_STATE|FALSE=No presence detected
+PRESENCE_DETECTION_STATE|TRUE=Presence detected
 PRESS_LONG=Button press long
 PRESS_LONG|TRUE=Button press long
 PRESS_SHORT=Button press short
 PRESS_SHORT|TRUE=Button press short
-PROCESS|NOT_STABLE=Time program: Active
+PROCESS|NOT_STABLE=Device active
-PROCESS|STABLE=Time program: Inactive
+PROCESS|STABLE=Device not active
 PULSE_SENSOR=Pulse sensor
 PULSE_SENSOR|SEQUENCE_OK=Activated
 PULSE_SENSOR|SEQUENCE_PULSE_1=Level 1 in s
@@ -914,6 +1172,7 @@ PULSE_SENSOR|SEQUENCE_PULSE_4|NOT_USED=Unused
 PULSE_SENSOR|SEQUENCE_PULSE_5=Level 3 in s
 PULSE_SENSOR|SEQUENCE_PULSE_5|NOT_USED=Unused
 PULSE_SENSOR|SEQUENCE_TOLERANCE=Tolerance in s
+RADIATOR_THERMOSTAT=Radiator Thermostat
 RAINDETECTOR=Rain sensor
 RAINDETECTOR|COND_TX_THRESHOLD_HI=Detection threshold for dry conditions
 RAINDETECTOR|COND_TX_THRESHOLD_LO=Detection threshold for rain
@@ -922,13 +1181,35 @@ RAINDETECTOR|EVENT_RELEASE_FILTER_TIME=Filter time for dryness detection
 RAINDETECTOR|STATE_HIGH_HOLD_TIME=Time until next measurement when rain is detected
 RAINDETECTOR|STATE|DRY=Dry conditions
 RAINDETECTOR|STATE|RAIN=Rain
+RAINING=Rain
+RAINING|FALSE=currently not raining
+RAINING|TRUE=currently raining
+RAIN_COUNTER=Rainfall
+RAIN_COUNTER_OVERFLOW|FALSE=Overrun rainfall counter: No
+RAIN_COUNTER_OVERFLOW|TRUE=Overrun rainfall counter: Yes
+RAIN_DETECTION_TRANSMITTER=Rain sensor
 RAMP_STOP=Stop dimming ramp
 RAMP_TIME=Dimming time
+RAMP_TIME_UNIT=Unit ramp time
+RAMP_TIME_UNIT|10MS=Unit ramp time: mS
+RAMP_TIME_UNIT|D=Unit ramp time: Days
+RAMP_TIME_UNIT|H=Unit ramp time: Hours
+RAMP_TIME_UNIT|M=Unit ramp time: Minutes
+RAMP_TIME_UNIT|S=Unit ramp time: Seconds
+RAMP_TIME_VALUE=Value ramp time
 REDUCE_LEVEL=Reducing level over temperature
 REDUCE_TEMP_LEVEL=Reducing threshold over temperature
+REFERENCE_RUNNING_TIME_BOTTOM_TOP_UNIT=Unit movement time
+REFERENCE_RUNNING_TIME_BOTTOM_TOP_VALUE=Value movement time
+REFERENCE_RUNNING_TIME_SLATS_UNIT=Unit slat adjustment time
+REFERENCE_RUNNING_TIME_SLATS_VALUE=Value slat adjustment time
+REFERENCE_RUNNING_TIME_TOP_BOTTOM_UNIT=Unit movement time
+REFERENCE_RUNNING_TIME_TOP_BOTTOM_VALUE=Value movement time
 REMOTECONTROL_RECEIVER=Radiator Thermostat (Receiver remote control)
 REPEATED_LONG_PRESS_TIMEOUT_UNIT=Unit for time-out
 REPEATED_LONG_PRESS_TIMEOUT_VALUE=Value for time-out
+RESET_MOTION=Reset status
+RESET_PRESENCE=Reset status
 RESTART_BUTTONPRESS=simulate short button press
 RESTART_BUTTONPRESS_IF_WAS_ON=simulate short button press, if switched on before
 RESTART_LAST=restore previous status
@@ -943,9 +1224,9 @@ RGBW_COLOR|COLOR=Color value
 RGBW_COLOR|WHITE_ADJUSTMENT_VALUE_BLUE=White balance blue
 RGBW_COLOR|WHITE_ADJUSTMENT_VALUE_GREEN=White balance green
 RGBW_COLOR|WHITE_ADJUSTMENT_VALUE_RED=White balance red
+ROTARY_CONTROL_TRANSCEIVER=Rotary Button
 ROTARY_HANDLE_SENSOR=Window twist-handle contact
 ROTARY_HANDLE_SENSOR|ERROR|SABOTAGE=Sabotage
-ROTARY_HANDLE_SENSOR|EVENT_DELAYTIME=Message delay
 ROTARY_HANDLE_SENSOR|MSG_FOR_POS_A=Message in position down
 ROTARY_HANDLE_SENSOR|MSG_FOR_POS_A|CLOSED=closed
 ROTARY_HANDLE_SENSOR|MSG_FOR_POS_A|NO_MSG=no message
@@ -983,10 +1264,17 @@ ROTARY_HANDLE_TRANSCEIVER|MSG_FOR_POS_C|TILTED=tilted
 ROTARY_HANDLE_TRANSCEIVER|STATE|CLOSED=Window status: locked
 ROTARY_HANDLE_TRANSCEIVER|STATE|OPEN=Window status: open
 ROTARY_HANDLE_TRANSCEIVER|STATE|TILTED=Window status: tilted
+ROUTER_MODULE_ENABLED=Device serves as router
 RSSI_DEVICE=RSSI device
 RSSI_PEER=RSSI peer
 SABOTAGE_MSG=Sabotage message
 SECTION=Profile section:
+SECTION_STATUS|NORMAL=Status Section: Normal
+SECTION_STATUS|UNKNOWN=Status Section: Unknown
+SELF_CALIBRATION_RESULT|FALSE=Calibration run not required
+SELF_CALIBRATION_RESULT|TRUE=Teach-in procedure successful
+SELF_CALIBRATION|START=Start calibration run
+SELF_CALIBRATION|STOP=End calibration run
 SENSOR_ERROR|FALSE=Sensor OK
 SENSOR_ERROR|TRUE=Sensor disturbed
 SENSOR_FOR_CARBON_DIOXIDE=Air quality sensor
@@ -1012,6 +1300,7 @@ SENSOR_FOR_CARBON_DIOXIDE|MSG_FOR_POS_D|NO_MSG=no message
 SENSOR_FOR_CARBON_DIOXIDE|STATE|LEVEL_ADDED=CO2 concentration increased
 SENSOR_FOR_CARBON_DIOXIDE|STATE|LEVEL_ADDED_STRONG=CO2 concentration greatly increased
 SENSOR_FOR_CARBON_DIOXIDE|STATE|LEVEL_NORMAL=CO2 concentration normal
+SENSOR_SENSITIVITY=Sensor sensitivity
 SENSOR|FALSE=closed
 SENSOR|INPUT_LOCKED=Input locked
 SENSOR|TRUE=open
@@ -1043,10 +1332,23 @@ SHUTTER_CONTACT|STATE|CLOSED=closed
 SHUTTER_CONTACT|STATE|FALSE=closed
 SHUTTER_CONTACT|STATE|OPEN=open
 SHUTTER_CONTACT|STATE|TRUE=open
+SHUTTER_TRANSMITTER|ACTIVITY_STATE|DOWN=Shutter moves down
+SHUTTER_TRANSMITTER|ACTIVITY_STATE|STABLE=Shutter not moving
+SHUTTER_TRANSMITTER|ACTIVITY_STATE|UNKNOWN=Shutter activity unknown
+SHUTTER_TRANSMITTER|ACTIVITY_STATE|UP=Shutter moves up
 SHUTTER_TRANSMITTER|LEVEL=Blind level
 SHUTTER_TRANSMITTER|LEVEL_2=Slats position
+SHUTTER_TRANSMITTER|PROCESS|NOT_STABLE=Shutter moves
+SHUTTER_TRANSMITTER|PROCESS|STABLE=Shutter not moving
+SHUTTER_VIRTUAL_RECEIVER=Shutter actuator
+SHUTTER_VIRTUAL_RECEIVER|ACTIVITY_STATE|DOWN=Shutter moves down
+SHUTTER_VIRTUAL_RECEIVER|ACTIVITY_STATE|STABLE=Shutter not moving
+SHUTTER_VIRTUAL_RECEIVER|ACTIVITY_STATE|UNKNOWN=Shutter activity unknown
+SHUTTER_VIRTUAL_RECEIVER|ACTIVITY_STATE|UP=Shutter moves up
 SHUTTER_VIRTUAL_RECEIVER|LEVEL=Blind level
 SHUTTER_VIRTUAL_RECEIVER|LEVEL_2=Slats position
+SHUTTER_VIRTUAL_RECEIVER|PROCESS|NOT_STABLE=Shutter moves
+SHUTTER_VIRTUAL_RECEIVER|PROCESS|STABLE=Shutter not moving
 SHUTTER_VIRTUAL_RECEIVER|STOP=Stop
 SIGNAL=Confirmation signal
 SIGNAL_CHIME=Signal actuator (acoustically)
@@ -1066,6 +1368,7 @@ SIGNAL_TONE|HIGH=high
 SIGNAL_TONE|LOW=low
 SIGNAL_TONE|MID=mid
 SIGNAL_TONE|VERY_HIGH=very high
+SIMPLE_SWITCH_RECEIVER=Switch actor
 SMOKE_DETECTOR_ALARM_STATUS|IDLE_OFF=Standby
 SMOKE_DETECTOR_ALARM_STATUS|INTRUSION_ALARM=Burglar alarm
 SMOKE_DETECTOR_ALARM_STATUS|PRIMARY_ALARM=Local alarm
@@ -1102,6 +1405,10 @@ SMOKE_DETECTOR|REPEAT_ENABLE=Forwarding of received data telegrams
 SMOKE_DETECTOR|STATE|FALSE=No smoke detected
 SMOKE_DETECTOR|STATE|TRUE=Smoke detected
 SOFTONOFF=Soft On/Off
+SOUNDFILE|DO_NOT_CARE=Proceed with current title
+SOUNDFILE|INTERNAL_SOUNDFILE=Internal device sound
+SOUNDFILE|OLD_VALUE=Title last played
+SOUNDFILE|RANDOM_SOUNDFILE=Shuffle
 SOUND_ID=Alarm signal
 SOUND_LONG=Long
 SOUND_LONG_LONG=Long / Long
@@ -1112,6 +1419,7 @@ SOUND_SHORT=Short
 SOUND_SHORT_SHORT=Short / Short
 SPEED_MULTIPLIER=Factor PWM frequency
 STANDBY_TIME=Time until standby mode
+STATE_RESET_RECEIVER=Suppression of motion detection
 STATE|FALSE=Switching status: Off
 STATE|TRUE=Switching status: On
 STATUSINFO_MINDELAY=Status messages minimum delay time
@@ -1123,8 +1431,20 @@ STATUS_INDICATOR|ON_TIME=Switch-on time
 STATUS_INDICATOR|STATE|FALSE=Switching status off
 STATUS_INDICATOR|STATE|TRUE=Switching status on
 STATUS_MESSAGE_TEXT_ALIGNMENT_LEFT_ALIGNED=Range status message left
+STICKY_UNREACH|FALSE=Device communication was disturbed: No
+STICKY_UNREACH|TRUE=Device communication was disturbed: Yes
+STORM_LOWER_THRESHOLD=Wind alert off threshold
+STORM_UPPER_THRESHOLD=Wind alert on threshold
 SUBMIT=Channel action
+SUNSHINEDURATION=Sunshine duration
+SUNSHINEDURATION_OVERFLOW|FALSE=Overrun counter sunshine: No
+SUNSHINEDURATION_OVERFLOW|TRUE=Overrun counter sunshine: Yes
+SUNSHINE_THRESHOLD=Sunshine threshold
+SUNSHINE_THRESHOLD_OVERRUN=Sunshine
+SUNSHINE_THRESHOLD_OVERRUN|FALSE=currently no sunshine
+SUNSHINE_THRESHOLD_OVERRUN|TRUE=currently sunshine
 SWITCH=Switch actuator
+SWITCH_ACTUATOR=Switch actuator
 SWITCH_INTERFACE=Switch interface
 SWITCH_INTERFACE|PRESS=Activated
 SWITCH_INTERFACE|STATE|FALSE=Switch position: pressed down
@@ -1141,6 +1461,7 @@ SWITCH|STATE|TRUE=Switching status: on
 SWITCH|STATUSINFO_RANDOM_A=To avoid collisions during transmission of  +
 TACTILE_SWITCH|FALSE=Operating mode push-button inactive
 TACTILE_SWITCH|TRUE=Operating mode push-button active
+TEMPERATURE=Temperature
 TEMPERATURE_COMFORT=Comfort temperature
 TEMPERATURE_LIMITER|FALSE=Operating mode temperature limit inactive
 TEMPERATURE_LIMITER|TRUE=Operating mode temperature limit active
@@ -1148,6 +1469,10 @@ TEMPERATURE_LOWERING=Eco temperature
 TEMPERATURE_MAXIMUM=Maximum temperature
 TEMPERATURE_MINIMUM=Minimum temperature
 TEMPERATURE_OFFSET=Temperature offset
+TEMPERATURE_OUT_OF_RANGE|FALSE=Ambient temperature OK
+TEMPERATURE_OUT_OF_RANGE|TRUE=Ambient temperature invalid
+TEMP_HUMIDITY_PARTICULATE_MATTER_TRANSMITTER|INTERVAL_UNIT=Unit of automatic sensor cleaning
+TEMP_HUMIDITY_PARTICULATE_MATTER_TRANSMITTER|INTERVAL_VALUE=Value of automatic sensor cleaning
 THERMALCONTROL_TRANSMIT=Temperature sensor room thermostat
 TILT_SENSOR=Tilt sensor
 TILT_SENSOR|EVENT_FILTERTIME=Filter time
@@ -1168,10 +1493,12 @@ TX_MINDELAY=Minimum transmission interval
 TX_MINDELAY_UNIT=Unit of minimum transmission interval
 TX_MINDELAY_VALUE=Value minimum transmission interval
 TX_THRESHOLD_POWER=TX Difference Power
+TYPICAL_PARTICLE_SIZE=Typical particle size
 UNREACH|FALSE=Device communication OK
 UNREACH|TRUE=Device communication disturbed
 USER_COLOR=Channel action
 USER_PROGRAM=Channel action
+VALVE_MAXIMUM_POSITION=maximum valve opening position
 VALVE_STATE=Valve position
 VALVE_STATE|ADAPTION_DONE=Adaption run performed
 VALVE_STATE|ADAPTION_IN_PROGRESS=Adaption run active
@@ -1184,6 +1511,8 @@ VALVE_STATE|TOO_TIGHT=Valve sluggish/blocked
 VALVE_STATE|WAIT_FOR_ADAPTION=Waiting for adaption run
 VENT_CLOSED=Close valve
 VENT_OPEN=Open valve
+VIR-LG-ONOFF-CH|LEVEL|FALSE=Switching status: Off
+VIR-LG-ONOFF-CH|LEVEL|TRUE=Switching status: On
 VIRTUAL_DIMMER=Dimming actuator
 VIRTUAL_DIMMER|ERROR_OVERHEAT=Overheat
 VIRTUAL_DIMMER|ERROR_OVERLOAD=Overload
@@ -1200,6 +1529,7 @@ VIRTUAL_DUAL_WHITE_COLOR|RAMP_STOP=Stop colour change
 VIRTUAL_DUAL_WHITE_COLOR|RAMP_TIME=Ramp time for colour change
 VIRTUAL_KEY=Virtual remote control
 VIRTUAL_KEY|LEVEL=Send percentage
+VOLTAGE=Voltage
 VOLTAGE_0=Value (relative) for control voltage at 0%
 VOLTAGE_100=Value (relative) for control voltage at 100%
 VOLUME_0=Volume 0%
@@ -1218,6 +1548,7 @@ WAKEUP_BEHAVIOUR_STATUS_MSG_CONFIRMATION=Button press evaluation status message
 WAKEUP_BEHAVIOUR_STATUS_MSG_RESISTANCE=Status message can be deleted only via CCU
 WAKEUP_BEHAVIOUR_STATUS_SIGNALIZATION_CONFIRMATION=Button press evaluation signalling
 WAKEUP_DEFAULT_CHANNEL=Initial channel when activating
+WALLMOUNTED_THERMOSTAT=Wall Thermostat
 WATERDETECTIONSENSOR=Water detector
 WATERDETECTIONSENSOR|EVENT_FILTERTIME=Filter time
 WATERDETECTIONSENSOR|MSG_FOR_POS_A=Dry conditions
@@ -1235,31 +1566,35 @@ WATERDETECTIONSENSOR|MSG_FOR_POS_C|WET=Humidity detected
 WATERDETECTIONSENSOR|STATE|DRY=Dry
 WATERDETECTIONSENSOR|STATE|WATER=Water level detected
 WATERDETECTIONSENSOR|STATE|WET=Humidity detected
+WATERLEVEL_DETECTED|FALSE=Water level detected: No
+WATERLEVEL_DETECTED|TRUE=Water level detected: Yes
+WATER_DETECTION_TRANSMITTER=Water sensor
+WATER_DETECTION_TRANSMITTER|ALARMSTATE|FALSE=Humidity or water level detected: No
+WATER_DETECTION_TRANSMITTER|ALARMSTATE|TRUE=Humidity or water level detected: Yes
 WEATHER=Weather sensor
 WEATHER_RECEIVER=Radiator Thermostat (Receiver weather data)
+WEATHER_TRANSMIT|ALARMSTATE|FALSE=Humidity or water level detected: No
+WEATHER_TRANSMIT|ALARMSTATE|TRUE=Humidity or water level detected: Yes
 WEATHER_TRANSMIT|HUMIDITY=Relative humidity
 WEATHER_TRANSMIT|TEMPERATURE=Temperature
-WEATHER|AIR_PRESSURE=Barometric pressure
+WEEK_PROGRAM_CHANNEL_LOCKS=Channels in auto mode
-WEATHER|BRIGHTNESS=Brightness
+WEEK_PROGRAM_TARGET_CHANNEL_LOCKS=Channels for mode week program (binary)
-WEATHER|HUMIDITY=Relative humidity
+WEEK_PROGRAM_TARGET_CHANNEL_LOCK|AUTO_MODE_WITHOUT_RESET=week program: Auto without reset
-WEATHER|RAINING=Rain
+WEEK_PROGRAM_TARGET_CHANNEL_LOCK|AUTO_MODE_WITH_RESET=week program: Auto with reset (reset without function)
-WEATHER|RAINING|FALSE=currently not raining
+WEEK_PROGRAM_TARGET_CHANNEL_LOCK|MANU_MODE=week program: Manually
-WEATHER|RAINING|TRUE=currently raining
-WEATHER|RAIN_COUNTER=Rainfall
-WEATHER|STORM_LOWER_THRESHOLD=Wind alert off threshold
-WEATHER|STORM_UPPER_THRESHOLD=Wind alert on threshold
-WEATHER|SUNSHINEDURATION=Sunshine duration
-WEATHER|SUNSHINE_THRESHOLD=Sunshine threshold
-WEATHER|TEMPERATURE=Temperature
-WEATHER|WIND_DIRECTION=Wind direction
-WEATHER|WIND_DIRECTION_RANGE=Wind direction fluctuation range
-WEATHER|WIND_SPEED=Wind velocity
-WEATHER|WIND_SPEED_RESULT_SOURCE=Type of wind velocity value
-WEATHER|WIND_SPEED_RESULT_SOURCE|AVERAGE_VALUE=Average
-WEATHER|WIND_SPEED_RESULT_SOURCE|MAX_VALUE=Maximum value
 WHITE=Colour temperature
 WINDOW_STATE=Window status
 WINDOW_SWITCH_RECEIVER=Radiator thermostat
+WIND_DIR=Wind direction
+WIND_DIRECTION=Wind direction
+WIND_DIRECTION_RANGE=Wind direction fluctuation range
+WIND_DIR_RANGE=Wind direction fluctuation range
+WIND_SPEED=Wind velocity
+WIND_SPEED_RESULT_SOURCE=Type of wind velocity value
+WIND_SPEED_RESULT_SOURCE|AVERAGE_VALUE=Average
+WIND_SPEED_RESULT_SOURCE|MAX_VALUE=Maximum value
+WIND_THRESHOLD_OVERRUN|FALSE=Wind threshold not exceeded
+WIND_THRESHOLD_OVERRUN|TRUE=Wind threshold exceeded
 WINMATIC=Window tilt actuator
 WINMATIC|ERROR|MOTOR_TILT_ERROR=Error tilt actuator
 WINMATIC|ERROR|MOTOR_TURN_ERROR=Error rotary actuator

bundles/org.openhab.binding.homematic/src/main/resources/homematic/tclrega-scripts.xml

@@ -192,7 +192,7 @@ if (objectFound) {
         else { dp_type = "BOOL"; }
       }
       if (dp_obj.ValueType() == 16) {
-        if (dp_obj.ValueSubType() == 0 || dp_obj.ValueSubType() == 27) { dp_type = "INTEGER"; }
+        if ((dp_obj.ValueSubType() == 0) || (dp_obj.ValueSubType() == 27)) { dp_type = "INTEGER"; }
         else { dp_type = "ENUM"; }
       }
       if (dp_obj.ValueType() == 4   ) { dp_type = "FLOAT"; }