Updated external content (Jenkins build 502)

pull/1685/head
openHAB Build Server 2021-07-20 03:35:33 +00:00
parent f2df88859e
commit 238b148f62
35 changed files with 248 additions and 158 deletions

View File

@ -151,15 +151,10 @@ Bridge rfxcom:tcpbridge:sunflower [ host="sunflower", port=10001 ] {
## Thing Configuration ## Thing Configuration
Available configuration parameters are: Configuration parameters are listed alongside each thing type. Most devices only require a deviceId and
a subType, but some things require additional configuration. The deviceId is used both when receiving and
| Applies to | Parameter Label | Parameter ID | Description | Required | Default | transmitting messages, the subType is mainly used when sending messages, but it can vary between device
|------------|-----------------|--------------|----------------------------------------------------------------------|----------|---------| types.
| All things | Device ID | deviceId | (Unique) id of the device, for example "100001.1", "B.8" or "286169" | true | |
| All things | Sub type | subType | Sub type, note that every thing-type has its own sub types | true | |
| Lighting4 | Pulse | pulse | Pulse length used by the device, only used when sending | false | 350 |
| Lighting4 | On command ID | onCommandId | Id of the command which should be send to turn the device ON | false | 1 |
| Lighting4 | Off command ID | offCommandId | Id of the command which should be send to turn the device OFF | false | 4 |
## Channels ## Channels
@ -705,7 +700,27 @@ A Lighting2 device
### lighting4 - RFXCOM Lighting4 Actuator ### lighting4 - RFXCOM Lighting4 Actuator
A Lighting4 device A Lighting4 device. The specification for the PT2262 protocol includes 3 bytes for data. By
convention, the first 20 bits of this is used for deviceId, and the last 4 bits is used for
command, which gives us a total of 16 commands per device.
Depending on your device, you may have only one command, one pair of commands (on/off), or
any other multiple, for example, a set of 4 sockets with an on/off pair for each and an
additional pair for "all".
Different device manufactures using this protocol will use different schemes for their
commands, so to configure a thing using the lighting4 protocol, you must specify at least
one commandId in the thing configuration. If a device has multiple sets of commands, you
can configure multiple things with the same device id, but different commandIds.
Some devices will expect a specific pulse length. If required, that can also be specified
as a thing configuration parameter.
Previously, openHAB would attempt to guess at the meaning of a commandId if it was not
specified in the thing configuration based on devices seen in the wild. Due to the varying
nature of devices, this behaviour is deprecated and will be removed in a future openHAB
version. Until then, commands 1, 3, 5-13 and 15 are considered ON and 0, 2, 4 and 14 are
considered OFF when the `onCommandId` or `offCommandId` for a device is not specified.
#### Channels #### Channels
@ -730,58 +745,40 @@ A Lighting4 device
* Pulse length of the device * Pulse length of the device
* onCommandId - On command * onCommandId - On command
* Specifies command to be send when ON must be transmitted * Specifies command that represents ON for this device.
* 0 - OFF (value 0)
* 1 - ON (value 1)
* 2 - OFF (value 2)
* 3 - ON (value 3)
* 4 - OFF (value 4)
* 5 - ON (value 5)
* 6 - value 6
* 7 - ON (value 7)
* 8 - value 8
* 9 - ON (value 9)
* 10 - ON (value 10)
* 11 - ON (value 11)
* 12 - ON (value 12)
* 13 - value 13
* 14 - OFF (value 14)
* 15 - value 15
* offCommandId - Off command * offCommandId - Off command
* Specifies command to be send when OFF must be transmitted * Specifies command that represents OFF for this device.
* 0 - OFF (value 0) * openCommandId - Open command
* 1 - ON (value 1) * Specifies command that represents OPEN for this device.
* 2 - OFF (value 2)
* 3 - ON (value 3) * closedCommandId - Closed command
* 4 - OFF (value 4) * Specifies command that represents CLOSED for this device.
* 5 - ON (value 5)
* 6 - value 6 #### Discovering commandId values
* 7 - ON (value 7)
* 8 - value 8 There are a number of ways to detect the commandId values for your device.
* 9 - ON (value 9)
* 10 - ON (value 10) - You can turn on DEBUG messages for the rfxcom binding by adding the line
* 11 - ON (value 11) `<Logger level="DEBUG" name="org.openhab.binding.rfxcom"/>`
* 12 - ON (value 12) to your `log4j2.xml`. You will then be able to see the commandId in the log
* 13 - value 13 file when you trigger the device.
* 14 - OFF (value 14)
* 15 - value 15 - You can link a Number Item to the commandId channel. The item will be updated with the
detected commandId when you trigger the device.
- You can use RFXmngr to look at the data from the device. Use the last letter/number
of the hexadecimal "Code", and convert it from hexadecimal to decimal.
#### Examples #### Examples
The support for lighting 4 in RFXCOM is less complete because a lot of different devices use the same chips and can not easily be distinguished. For a USB attached RFXCOM on Windows the configuration could look like this (note the `pulse` is optional):
So some extra configuration can be used for fine tuning the behavior of your Lighting4 devices.
When configuring, three extra fields are available, being the the pulse length, and a separate command id for both on and off.
If your item is auto-discovered normally the on or off command should be recognized properly.
For a USB attached RFXCOM on Windows the configuration could look like this (note that the `onCommandId`, `offCommandId` and `pulse` are all optional):
``` ```
Bridge rfxcom:bridge:238adf67 [ serialPort="COM4" ] { Bridge rfxcom:bridge:238adf67 [ serialPort="COM4" ] {
Thing lighting4 17745 [deviceId="17745", subType="PT2262", onCommandId=7, offCommandId=4, pulse=800] Thing lighting4 17745a [deviceId="17745", subType="PT2262", onCommandId=7, offCommandId=4]
Thing lighting4 17745b [deviceId="17745", subType="PT2262", onCommandId=10, offCommandId=2]
Thing lighting4 motion [deviceId="286169", subType="PT2262", onCommandId=9, pulse=392] Thing lighting4 motion [deviceId="286169", subType="PT2262", onCommandId=9, pulse=392]
} }
``` ```
@ -789,30 +786,31 @@ Bridge rfxcom:bridge:238adf67 [ serialPort="COM4" ] {
Your items file could look like this: Your items file could look like this:
``` ```
Switch Switch {channel="rfxcom:lighting4:238adf67:17745:command"} Number SocketCommandId {channel="rfxcom:lighting4:238adf67:17745a:commandId"}
Number SwitchCommandId "Command ID [%d]" {channel="rfxcom:lighting4:238adf67:17745:commandId"} Switch SocketA {channel="rfxcom:lighting4:238adf67:17745a:command"}
Switch SocketB {channel="rfxcom:lighting4:238adf67:17745b:command"}
``` ```
And if you want random actions on your relay you could for example do like this: #### Known commandIds
``` These are some commandIds from the field that may match your devices.
rule "Set random relay variations"
when
System started or
Time cron "/20 * * * * ?"
then
SwitchCommandId.sendCommand((Math::random * 15.9).intValue)
end
```
#### Devices: | Brand | What | Action | Command ID | Source |
|-------|---------------|-------------|------------|--------|
| Brand | What | Action | Command ID | Supported | Source | | Kerui | Motion Sensor | Motion | 10 | [#3103](https://github.com/openhab/openhab-addons/issues/3103) |
|-------|---------------|-------------|------------|-----------|--------| | Kerui | Door Contact | door open | 14 | [#3103](https://github.com/openhab/openhab-addons/issues/3103) |
| Kerui | Motion Sensor | Motion | 10 | as ON | [#3103](https://github.com/openhab/openhab-addons/issues/3103) | | Kerui | Door Contact | door closed | 7 | [#3103](https://github.com/openhab/openhab-addons/issues/3103) |
| Kerui | Door Contact | door open | 14 | as OFF | [#3103](https://github.com/openhab/openhab-addons/issues/3103) | | Kerui | Door Contact | tamper | 11 | [#3103](https://github.com/openhab/openhab-addons/issues/3103) |
| Kerui | Door Contact | door closed | 7 | as ON | [#3103](https://github.com/openhab/openhab-addons/issues/3103) | | Energenie | 4 Socket Power Bar | Socket 1 on | 15 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Kerui | Door Contact | tamper | 7 | as ON | [#3103](https://github.com/openhab/openhab-addons/issues/3103) | | Energenie | 4 Socket Power Bar | Socket 1 off | 14 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | Socket 2 on | 7 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | Socket 2 off | 6 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | Socket 3 on | 11 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | Socket 3 off | 10 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | Socket 4 on | 3 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | Socket 4 off | 2 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | All on | 13 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
| Energenie | 4 Socket Power Bar | All off | 12 | [Community](https://community.openhab.org/t/rfxcom-looking-to-improve-lighting4-call-for-users/123674) |
### lighting5 - RFXCOM Lighting5 Actuator ### lighting5 - RFXCOM Lighting5 Actuator

View File

@ -0,0 +1,73 @@
# Some events from openhab to see how the api responds over different charging events during a cycle.
#
# Using custom build from 2021-07-12 that added battery#batteryLevelRaw, battery#chargeStatusCharging,
# battery#chargeStatusFullyCharged, battery#chargeStatusCable and added some additional processing to
# battery#batteryLevel.
# Started up, car was fully charged
2021-07-12 16:31:56.706 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from NULL to 1
2021-07-12 16:31:56.954 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from NULL to 1
2021-07-12 16:31:57.003 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Cable' changed from NULL to OFF
2021-07-12 16:31:57.030 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Preclimatization' changed from NULL to OFF
2021-07-12 16:31:57.098 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charged' changed from NULL to ON
2021-07-12 16:31:57.183 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charging' changed from NULL to OFF
2021-07-12 16:33:03.143 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_ChargeStatus' changed from NULL to CableNotPluggedInCar
# Went out
2021-07-12 17:03:06.526 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from 100 % to 73 %
2021-07-12 17:03:06.534 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from 100 % to 73 %
2021-07-12 17:03:06.544 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charged' changed from ON to OFF
# Drove home
2021-07-12 18:23:13.529 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from 73 % to 41 %
2021-07-12 18:23:13.533 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from 73 % to 41 %
# Plugged in car, charging is on a timer
2021-07-12 21:13:26.479 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from 41 % to UNDEF
2021-07-12 21:13:26.494 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from 41 % to 100 %
2021-07-12 21:13:26.497 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_ChargeStatus' changed from CableNotPluggedInCar to CablePluggedInCar_ChargingPaused
2021-07-12 21:13:26.499 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Cable' changed from OFF to ON
# Openhab restart
2021-07-12 21:49:20.176 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from NULL to 1
# I think this was from persistence? \/
2021-07-12 21:49:20.587 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from NULL to 0.41
2021-07-12 21:49:20.682 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Cable' changed from NULL to ON
2021-07-12 21:49:20.721 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Preclimatization' changed from NULL to OFF
2021-07-12 21:49:20.858 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charged' changed from NULL to OFF
2021-07-12 21:49:20.992 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charging' changed from NULL to OFF
2021-07-12 21:50:26.351 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from 0.41 to UNDEF
2021-07-12 21:50:26.369 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_ChargeStatus' changed from NULL to CablePluggedInCar_ChargingPaused
# Automatic charging started @ 00:30
2021-07-13 00:30:39.391 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_ChargeStatus' changed from CablePluggedInCar_ChargingPaused to CablePluggedInCar_Charging
2021-07-13 00:30:39.393 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charging' changed from OFF to ON
# Automatic charging stopped (to see what happens) @ 01:00
2021-07-13 01:00:41.458 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from UNDEF to 53 %
2021-07-13 01:00:41.460 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from 100 % to 53 %
2021-07-13 01:00:41.462 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_ChargeStatus' changed from CablePluggedInCar_Charging to CablePluggedInCar_ChargingInterrupted
2021-07-13 01:00:41.464 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charging' changed from ON to OFF
# Automatic charging started again @ 01:30
2021-07-13 01:30:43.532 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from 53 % to 23 %
2021-07-13 01:30:43.535 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from 53 % to 23 %
2021-07-13 01:30:43.537 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_ChargeStatus' changed from CablePluggedInCar_ChargingInterrupted to CablePluggedInCar_Charging
2021-07-13 01:30:43.539 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charging' changed from OFF to ON
2021-07-13 03:50:53.485 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevel' changed from 23 % to 100 %
2021-07-13 03:50:53.488 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_BatteryLevelRaw' changed from 23 % to 100 %
2021-07-13 03:50:53.490 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_ChargeStatus' changed from CablePluggedInCar_Charging to CablePluggedInCar_FullyCharged
2021-07-13 03:50:53.493 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charging' changed from ON to OFF
2021-07-13 03:50:53.495 [INFO ] [openhab.event.ItemStateChangedEvent ] - Item 'Car_Charged' changed from OFF to ON
# Automatic charging stopped again @ 04:30

View File

@ -94,9 +94,13 @@ Following channels are currently available:
| other#washerFluidLevel | Number | Washer fluid level | Normal / Low / VeryLow | | other#washerFluidLevel | Number | Washer fluid level | Normal / Low / VeryLow |
| other#serviceWarning | String | Warning if service is needed | | | other#serviceWarning | String | Warning if service is needed | |
| other#bulbFailure | Switch | ON if at least one bulb is reported as failed | | | other#bulbFailure | Switch | ON if at least one bulb is reported as failed | |
| battery#batteryLevel | Number:Dimensionless | Battery level | Only for Plugin hybrid / Twin Engine models | | battery#batteryLevel | Number:Dimensionless | Battery level | Only for Plugin hybrid / Twin Engine models. The binding reports undefined in situations where it knows the API is misleading. |
| battery#batteryLevelRaw | Number:Dimensionless | Battery level | Only for Plugin hybrid / Twin Engine models. Raw figure from the API, can be misleading. |
| battery#batteryDistanceToEmpty | Number:Length | Distance until battery is empty | Only for Plugin hybrid / Twin Engine models | | battery#batteryDistanceToEmpty | Number:Length | Distance until battery is empty | Only for Plugin hybrid / Twin Engine models |
| battery#chargeStatus | String | Charging status | Only for Plugin hybrid / Twin Engine models | | battery#chargeStatus | String | Charging status | Only for Plugin hybrid / Twin Engine models |
| battery#chargeStatusCable | Switch | Is the cable plugged in | Only for Plugin hybrid / Twin Engine models |
| battery#chargeStatusCharging | Switch | Is the car currently charging | Only for Plugin hybrid / Twin Engine models |
| battery#chargeStatusFullyCharged | Switch | Is the car fully charged | Only for Plugin hybrid / Twin Engine models |
| battery#timeToHVBatteryFullyCharged | Number:Time | Time in minutes until the battery is fully charged | Only for Plugin hybrid / Twin Engine models | | battery#timeToHVBatteryFullyCharged | Number:Time | Time in minutes until the battery is fully charged | Only for Plugin hybrid / Twin Engine models |
| battery#chargingEnd | DateTime | Calculated time when the battery is fully charged | Only for Plugin hybrid / Twin Engine models | | battery#chargingEnd | DateTime | Calculated time when the battery is fully charged | Only for Plugin hybrid / Twin Engine models |
| lasttrip#tripConsumption | Number:Volume | Last trip fuel consumption | | | lasttrip#tripConsumption | Number:Volume | Last trip fuel consumption | |

View File

@ -16,7 +16,7 @@
<properties> <properties>
<property name="serverCert"></property> <property name="serverCert"></property>
</properties> </properties>
<config-description-ref uri="binding:digitalstrom:dssBridge"/> <config-description-ref uri="bridge-type:digitalstrom:dssBridge"/>
</bridge-type> </bridge-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -74,6 +74,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalpiko1020_config"/> <config-description-ref uri="thing-type:kostalinverter:kostalpiko1020"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -68,6 +68,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -68,6 +68,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -68,6 +68,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -68,6 +68,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -68,6 +68,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -81,6 +81,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -73,6 +73,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -81,6 +81,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -73,6 +73,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -81,6 +81,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -73,6 +73,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -81,6 +81,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -73,6 +73,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -81,6 +81,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -73,6 +73,6 @@
<properties> <properties>
<property name="vendor">KOSTAL Solar Electric GmbH</property> <property name="vendor">KOSTAL Solar Electric GmbH</property>
</properties> </properties>
<config-description-ref uri="thing-type:kostalplenticorepikoiq_config"/> <config-description-ref uri="thing-type:kostalinverter:plenticorepikoiq"/>
</thing-type> </thing-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -38,51 +38,31 @@
<description>Pulse length of the device</description> <description>Pulse length of the device</description>
<default>350</default> <default>350</default>
</parameter> </parameter>
<parameter name="onCommandId" type="integer" required="true"> <parameter name="onCommandId" type="integer" required="false" min="0" max="15">
<label>On Command</label> <label>On Command</label>
<description>Specifies command to be send when ON must be transmitted</description> <description>Specifies command that represents ON for this device. If not
<options> specified, will treat 1, 3, 5-13 and 15 as
<option value="0">OFF (value 0)</option> ON commands for receiving message, and will send 1 as an ON
<option value="1">ON (value 1)</option> command. This behaviour is deprecated. In a future
<option value="2">OFF (value 2)</option> version, if this is not specified, the on command will
<option value="3">ON (value 3)</option> not be available.</description>
<option value="4">OFF (value 4)</option>
<option value="5">ON (value 5)</option>
<option value="6">value 5</option>
<option value="7">ON (value 7)</option>
<option value="8">value 8</option>
<option value="9">ON (value 9)</option>
<option value="10">ON (value 10)</option>
<option value="11">ON (value 11)</option>
<option value="12">ON (value 12)</option>
<option value="13">value 13</option>
<option value="14">OFF (value 14)</option>
<option value="15">value 15</option>
</options>
<default>1</default>
</parameter> </parameter>
<parameter name="offCommandId" type="integer" required="true"> <parameter name="offCommandId" type="integer" required="false" min="0" max="15">
<label>Off Command</label> <label>Off Command</label>
<description>Specifies command to be send when OFF must be transmitted</description> <description>Specifies command that represents OFF for this device. For historical reasons, if not
<options> specified, will
<option value="0">OFF (value 0)</option> treat 0, 2, 4 and 14 as OFF commands for receiving message, and will send 4 as an OFF
<option value="1">ON (value 1)</option> command. This behaviour is
<option value="2">OFF (value 2)</option> deprecated. In a future version, if this is not specified, the off command will
<option value="3">ON (value 3)</option> not be available.</description>
<option value="4">OFF (value 4)</option> </parameter>
<option value="5">ON (value 5)</option> <parameter name="openCommandId" type="integer" required="false" min="0" max="15">
<option value="6">value 5</option> <label>Open Command</label>
<option value="7">ON (value 7)</option> <description>Specifies command that represents OPEN for this device.</description>
<option value="8">value 8</option> </parameter>
<option value="9">ON (value 9)</option> <parameter name="closedCommandId" type="integer" required="false" min="0" max="15">
<option value="10">ON (value 10)</option> <label>Closed Command</label>
<option value="11">ON (value 11)</option> <description>Specifies command that represents CLOSED for this device.</description>
<option value="12">ON (value 12)</option>
<option value="13">value 13</option>
<option value="14">OFF (value 14)</option>
<option value="15">value 15</option>
</options>
<default>4</default>
</parameter> </parameter>
</config-description> </config-description>
</thing-type> </thing-type>

View File

@ -23,7 +23,7 @@
<channel id="base" typeId="baseType"/> <channel id="base" typeId="baseType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -25,7 +25,7 @@
<channel id="lastUpdate" typeId="lastUpdateType"/> <channel id="lastUpdate" typeId="lastUpdateType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -24,7 +24,7 @@
<channel id="base" typeId="baseType"/> <channel id="base" typeId="baseType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -27,7 +27,7 @@
<channel id="lastUpdate" typeId="lastUpdateType"/> <channel id="lastUpdate" typeId="lastUpdateType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -26,7 +26,7 @@
<channel id="lastUpdate" typeId="lastUpdateType"/> <channel id="lastUpdate" typeId="lastUpdateType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -34,7 +34,7 @@
<channel id="lastUpdate" typeId="lastUpdateType"/> <channel id="lastUpdate" typeId="lastUpdateType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -25,7 +25,7 @@
<channel id="lastUpdate" typeId="lastUpdateType"/> <channel id="lastUpdate" typeId="lastUpdateType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -32,7 +32,7 @@
<channel id="lastUpdate" typeId="lastUpdateType"/> <channel id="lastUpdate" typeId="lastUpdateType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -33,7 +33,7 @@
<channel id="base" typeId="baseType"/> <channel id="base" typeId="baseType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -35,7 +35,7 @@
<channel id="ejphn" typeId="ejphnType"/> <channel id="ejphn" typeId="ejphnType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -35,7 +35,7 @@
<channel id="hhphc" typeId="hhphcType"/> <channel id="hhphc" typeId="hhphcType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -42,7 +42,7 @@
<channel id="lastUpdate" typeId="lastUpdateType"/> <channel id="lastUpdate" typeId="lastUpdateType"/>
</channels> </channels>
<config-description-ref uri="binding:teleinfo:adco"/> <config-description-ref uri="thing-type:teleinfo:adco"/>
</thing-type> </thing-type>

View File

@ -210,13 +210,17 @@
<label>Plugin Hybrid / Twin Engine info</label> <label>Plugin Hybrid / Twin Engine info</label>
<channels> <channels>
<channel id="batteryLevel" typeId="batteryLevel"/> <channel id="batteryLevel" typeId="batteryLevel"/>
<channel id="batteryLevelRaw" typeId="batteryLevelRaw"/>
<channel id="batteryDistanceToEmpty" typeId="odometer"> <channel id="batteryDistanceToEmpty" typeId="odometer">
<label>Distance to battery empty</label> <label>Distance Left (Battery)</label>
</channel> </channel>
<channel id="chargeStatus" typeId="chargeStatus"/> <channel id="chargeStatus" typeId="chargeStatus"/>
<channel id="chargeStatusCable" typeId="chargeStatusCable"/>
<channel id="chargeStatusCharging" typeId="chargeStatusCharging"/>
<channel id="chargeStatusFullyCharged" typeId="chargeStatusFullyCharged"/>
<channel id="timeToHVBatteryFullyCharged" typeId="timeToHVBatteryFullyCharged"/> <channel id="timeToHVBatteryFullyCharged" typeId="timeToHVBatteryFullyCharged"/>
<channel id="chargingEnd" typeId="timestamp"> <channel id="chargingEnd" typeId="timestamp">
<label>Charging end</label> <label>Charging End</label>
</channel> </channel>
</channels> </channels>
</channel-group-type> </channel-group-type>
@ -237,7 +241,7 @@
<channel-type id="window"> <channel-type id="window">
<item-type>Contact</item-type> <item-type>Contact</item-type>
<label>Window Status</label> <label>Window</label>
<description>Indicates if the window is opened</description> <description>Indicates if the window is opened</description>
<state readOnly="true"></state> <state readOnly="true"></state>
</channel-type> </channel-type>
@ -251,7 +255,7 @@
<channel-type id="averageSpeed"> <channel-type id="averageSpeed">
<item-type>Number:Speed</item-type> <item-type>Number:Speed</item-type>
<label>Average speed</label> <label>Average Speed</label>
<description>Average speed of the vehicle</description> <description>Average speed of the vehicle</description>
<state pattern="%.2f %unit%" readOnly="true"></state> <state pattern="%.2f %unit%" readOnly="true"></state>
</channel-type> </channel-type>
@ -316,7 +320,7 @@
<channel-type id="carLocked"> <channel-type id="carLocked">
<item-type>Switch</item-type> <item-type>Switch</item-type>
<label>Locked</label> <label>Locked</label>
<description>Car locking status</description> <description>Lock status</description>
<category>lock</category> <category>lock</category>
</channel-type> </channel-type>
@ -343,7 +347,7 @@
<channel-type id="bulbFailure"> <channel-type id="bulbFailure">
<item-type>Switch</item-type> <item-type>Switch</item-type>
<label>Bulb Failure</label> <label>Bulb Failure</label>
<description>At least on bulb is reported as dead</description> <description>At least one bulb is reported as dead</description>
<category>alarm</category> <category>alarm</category>
<state readOnly="true"></state> <state readOnly="true"></state>
</channel-type> </channel-type>
@ -364,7 +368,7 @@
<channel-type id="tyrePressure"> <channel-type id="tyrePressure">
<item-type>Number</item-type> <item-type>Number</item-type>
<label>Tyre pressure</label> <label>Tyre Pressure</label>
<category>alarm</category> <category>alarm</category>
<state readOnly="true"> <state readOnly="true">
<options> <options>
@ -377,7 +381,7 @@
<channel-type id="serviceWarningStatus"> <channel-type id="serviceWarningStatus">
<item-type>String</item-type> <item-type>String</item-type>
<label>Service Warning</label> <label>Service Warning</label>
<description>Is car service needed ?</description> <description>Is a car service needed?</description>
<category>alarm</category> <category>alarm</category>
<state readOnly="true"></state> <state readOnly="true"></state>
</channel-type> </channel-type>
@ -385,21 +389,52 @@
<channel-type id="batteryLevel"> <channel-type id="batteryLevel">
<item-type>Number:Dimensionless</item-type> <item-type>Number:Dimensionless</item-type>
<label>Battery Level</label> <label>Battery Level</label>
<description>Indicates the level of power in the battery (in case of PHEV / Twin Engine)</description> <description>Indicates the level of power in the battery, or unknown in situations the API is misleading (in case of
PHEV / Twin Engine)</description>
<category>batterylevel</category>
<state pattern="%d %unit%" readOnly="true"></state>
</channel-type>
<channel-type id="batteryLevelRaw">
<item-type>Number:Dimensionless</item-type>
<label>Battery Level (Raw)</label>
<description>Indicates the level of power in the battery taken straight from the API, which can be misleading (in case
of PHEV / Twin Engine)</description>
<category>batterylevel</category> <category>batterylevel</category>
<state pattern="%d %unit%" readOnly="true"></state> <state pattern="%d %unit%" readOnly="true"></state>
</channel-type> </channel-type>
<channel-type id="chargeStatus"> <channel-type id="chargeStatus">
<item-type>String</item-type> <item-type>String</item-type>
<label>Charging status</label> <label>Charging Status</label>
<description>Status of charging (in case of PHEV / Twin Engine)</description> <description>Status of charging (in case of PHEV / Twin Engine)</description>
<state readOnly="true"></state> <state readOnly="true"></state>
</channel-type> </channel-type>
<channel-type id="chargeStatusCable">
<item-type>Switch</item-type>
<label>Plugged In</label>
<description>Indicates if the charging cable is connected</description>
<state readOnly="true"></state>
</channel-type>
<channel-type id="chargeStatusCharging">
<item-type>Switch</item-type>
<label>Charging</label>
<description>Indicates if the car is currently charging</description>
<state readOnly="true"></state>
</channel-type>
<channel-type id="chargeStatusFullyCharged">
<item-type>Switch</item-type>
<label>Fully Charged</label>
<description>Indicates if the car is fully charged</description>
<state readOnly="true"></state>
</channel-type>
<channel-type id="timeToHVBatteryFullyCharged"> <channel-type id="timeToHVBatteryFullyCharged">
<item-type>Number:Time</item-type> <item-type>Number:Time</item-type>
<label>Time to battery fully charged</label> <label>Remaining Charging Time</label>
<description>Time in seconds until the battery is fully charged (in case of PHEV / Twin Engine)</description> <description>Time in seconds until the battery is fully charged (in case of PHEV / Twin Engine)</description>
<state pattern="%d %unit%" readOnly="true"></state> <state pattern="%d %unit%" readOnly="true"></state>
</channel-type> </channel-type>

View File

@ -20,7 +20,7 @@
<channel id="exclusion" typeId="exclusion"/> <channel id="exclusion" typeId="exclusion"/>
</channels> </channels>
<config-description-ref uri="binding:zway:zwayServer"/> <config-description-ref uri="bridge-type:zway:zwayServer"/>
</bridge-type> </bridge-type>
</thing:thing-descriptions> </thing:thing-descriptions>