Updated external content (Jenkins build 714)

pull/1839/head
openHAB Build Server 2022-01-03 17:26:19 +00:00
parent de32d0cff9
commit 85966af5ad
18 changed files with 198 additions and 158 deletions

File diff suppressed because one or more lines are too long

View File

@ -418,7 +418,7 @@ logger.debug("Hello {}!", "world");
### Time
openHAB internally makes extensive use of the `java.time` package. openHAB-JS exports the excellent [JS-Joda](#https://js-joda.github.io/js-joda/) library via the `time` namespace, which is a native Javascript port of the same API standard used in Java for `java.time`. Anywhere that a native Java `ZonedDateTime` or `Duration` is required, the runtime will automatically convert a JS-Joda `ZonedDateTime` or `Duration` to its Java counterpart.
openHAB internally makes extensive use of the `java.time` package. openHAB-JS exports the excellent [JS-Joda](https://js-joda.github.io/js-joda/) library via the `time` namespace, which is a native Javascript port of the same API standard used in Java for `java.time`. Anywhere that a native Java `ZonedDateTime` or `Duration` is required, the runtime will automatically convert a JS-Joda `ZonedDateTime` or `Duration` to its Java counterpart.
Examples:
```javascript
@ -433,7 +433,7 @@ console.log("averageSince", item.history.averageSince(yesterday));
actions.Exec.executeCommandLine(time.Duration.ofSeconds(20), 'echo', 'Hello World!');
```
See [JS-Joda](#https://js-joda.github.io/js-joda/) for more examples and complete API usage.
See [JS-Joda](https://js-joda.github.io/js-joda/) for more examples and complete API usage.
## File Based Rules

View File

@ -56,15 +56,16 @@ Hayward OmniLogic Connection Parameters:
### Backyard Channels
| backyardAirTemp | Number:Temperature | Backyard air temp sensor reading | R |
|-----------------|--------------------|----------------------------------|:-:|
| backyardStatus | String | Backyard status | R |
| backyardState | String | Backyard state | R |
| backyardAlarm1 | String | Backyard alarm #1 | R |
| backyardAlarm2 | String | Backyard alarm #2 | R |
| backyardAlarm3 | String | Backyard alarm #3 | R |
| backyardAlarm4 | String | Backyard alarm #4 | R |
| backyardAlarm5 | String | Backyard alarm #5 | R |
| Channel Type ID | Item Type | Description | Read Write |
|-----------------|--------------------|----------------------------------|:----------:|
| backyardAirTemp | Number:Temperature | Backyard air temp sensor reading | R |
| backyardStatus | String | Backyard status | R |
| backyardState | String | Backyard state | R |
| backyardAlarm1 | String | Backyard alarm #1 | R |
| backyardAlarm2 | String | Backyard alarm #2 | R |
| backyardAlarm3 | String | Backyard alarm #3 | R |
| backyardAlarm4 | String | Backyard alarm #4 | R |
| backyardAlarm5 | String | Backyard alarm #5 | R |
### Body of Water Channels
@ -102,7 +103,9 @@ Hayward OmniLogic Connection Parameters:
|---------------------|----------------------|------------------------|:----------:|
| filterEnable | Switch | Filter enable | R/W |
| filterValvePosition | String | Filter valve position | R |
| filterSpeed | Number:Dimensionless | Filter speed in % | R/W |
| filterSpeedPercent | Number:Dimensionless | Filter speed in % | R/W |
| filterSpeedRpm | Number | Filter speed in RPM | R/W |
| filterSpeedSelect | String | Filter speed presets | R/W |
| filterState | String | Filter state | R |
| filterLastSpeed | Number:Dimensionless | Filter last speed in % | R |
@ -110,15 +113,19 @@ Hayward OmniLogic Connection Parameters:
| Channel Type ID | Item Type | Description | Read Write |
|-----------------|-----------|---------------|:----------:|
| heaterState | Number | Heater state | R |
| heaterState | String | Heater state | R |
| heaterEnable | Switch | Heater enable | R |
### Pump Channels
| Channel Type ID | Item Type | Description | Read Write |
|-----------------|----------------------|-----------------|:----------:|
| pumpEnable | Switch | Pump enable | R |
| pumpSpeed | Number:Dimensionless | Pump speed in % | R |
| Channel Type ID | Item Type | Description | Read Write |
|------------------|----------------------|----------------------|:----------:|
| pumpEnable | Switch | Pump enable | R/W |
| pumpSpeedPercent | Number:Dimensionless | Pump speed in % | R/W |
| pumpSpeedRpm | Number | Pump speed in RPM | R/W |
| pumpSpeedSelect | String | Pump speed presets | R/W |
| pumpState | String | Pump state | R |
| pumpLastSpeed | Number:Dimensionless | Pump last speed in % | R |
### Relay Channels
@ -130,57 +137,11 @@ Hayward OmniLogic Connection Parameters:
| Channel Type ID | Item Type | Description | Read Write |
|-----------------------|--------------------|-------------------------|:----------:|
| heaterEnable | Number | Heater enable | R |
| heaterEnable | Switch | Heater enable | R |
| heaterCurrentSetpoint | Number:Temperature | Heater Current Setpoint | R/W |
## Full Example
After installing the binding, you will need to manually add the Hayward Connection thing and enter your credentials.
All pool items can be autmatically discovered by scanning the bridge
All pool items can be automatically discovered by scanning the bridge.
Goto the inbox and add the things.
### demo.items:
```text
Group gPool "Pool" ["Location"]
Group gHaywardChlorinator "Hayward Chlorinator" (gPool) ["Equipment"]
Switch HaywardChlorinator_Power "Power" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorEnable" }
String HaywardChlorinator_OperatingMode "Operating Mode" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorOperatingMode" }
Number:Dimensionless HaywardChlorinator_SaltOutput "Salt Output (%)" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorTimedPercent" }
String HaywardChlorinator_scMode "scMode" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorScMode" }
Number HaywardChlorinator_ChlorinatorError "Chlorinator Error" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorError" }
String HaywardChlorinator_ChlorinatorAlert "Chlorinator Alert" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorAlert" }
Number:Dimensionless HaywardChlorinator_AverageSaltLevel "Average Salt Level" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorAvgSaltLevel" }
Number:Dimensionless HaywardChlorinator_InstantSaltLevel "Instant Salt Level" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorInstantSaltLevel" }
Number HaywardChlorinator_Status "Status" (gHaywardChlorinator) ["Point"] { channel="haywardomnilogic:chlorinator:3766402f00:34:chlorStatus" }
Group gHaywardBackyard "Hayward Backyard" (gPool) ["Equipment"]
Number:Temperature HaywardBackyard_AirTemp "Air Temp" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardAirTemp" }
String HaywardBackyard_Status "Status" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardStatus" }
String HaywardBackyard_State "State" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardState" }
String HaywardBackyard_BackyardAlarm1 "Alarm" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardAlarm1" }
String HaywardBackyard_BackyardAlarm2 "Alarm" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardAlarm2" }
String HaywardBackyard_BackyardAlarm3 "Alarm" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardAlarm3" }
String HaywardBackyard_BackyardAlarm4 "Alarm" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardAlarm4" }
String HaywardBackyard_BackyardAlarm5 "Alarm" (gHaywardBackyard) ["Point"] { channel="haywardomnilogic:backyard:3766402f00:35940:backyardAlarm5" }
Group gHaywardGas "Hayward Gas" (gPool) ["Equipment"]
Number HaywardGas_HeaterState "Heater State" (gHaywardGas) ["Point"] { channel="haywardomnilogic:heater:3766402f00:33:heaterState" }
Switch HaywardGas_HeaterEnable "Heater Enable" (gHaywardGas) ["Point"] { channel="haywardomnilogic:heater:3766402f00:33:heaterEnable" }
Group gHaywardJets "Hayward Jets" (gPool) ["Equipment"]
Switch HaywardJets_Power "Power" (gHaywardJets) ["Point"] { channel="haywardomnilogic:relay:3766402f00:37:relayState" }
Group gHaywardPool "Hayward Pool" (gPool) ["Equipment"]
Switch HaywardPool_FlowSensor "Flow Sensor" (gHaywardPool) ["Point"] { channel="haywardomnilogic:bow:3766402f00:30:bowFlow" }
Number:Temperature HaywardPool_WaterTemp "Water Temp" (gHaywardPool) ["Point"] { channel="haywardomnilogic:bow:3766402f00:30:bowWaterTemp" }
Group gHaywardPoolLight "Hayward Pool Light" (gPool) ["Equipment"]
Switch HaywardPoolLight_Power "Power" (gHaywardPoolLight) ["Point"] { channel="haywardomnilogic:colorlogic:3766402f00:38:colorLogicLightEnable" }
String HaywardPoolLight_LightState "Light State" (gHaywardPoolLight) ["Point"] { channel="haywardomnilogic:colorlogic:3766402f00:38:colorLogicLightState" }
String HaywardPoolLight_CurrentShow "Current Show" (gHaywardPoolLight) ["Point"] { channel="haywardomnilogic:colorlogic:3766402f00:38:colorLogicLightCurrentShow" }
```

View File

@ -181,6 +181,7 @@ For single shades the refresh takes the item's channel into consideration:
| lowBattery | Battery |
| batteryLevel | Battery |
| batteryVoltage | Battery |
| signalStrength | Survey |
## Full Example

View File

@ -95,7 +95,7 @@ PID behind the heos:player:--- should be changed as required.
It is recommended to use the Player PID.
If the PID isn't known it can be discovered by establishing a Telnet connection (port 1255) to one player and search for available players (Command: heos://player/get_players) within the network.
Another way is to use the UI to discover the Player via the bridge and get the PID.
For further details refer to the [HEOS CLI](https://rn.dmglobal.com/euheos/HEOS_CLI_ProtocolSpecification.pdf) specification.
For further details refer to the [HEOS CLI](https://rn.dmglobal.com/euheos/HEOS_CLI_ProtocolSpecification_2021.pdf) specification.
### Group Configuration
@ -227,7 +227,7 @@ You can send commands to these channels from rules by sending the name of the se
| tvaudio |
| phono |
A current list can be found within the HEOS CLI protocol which can be found [here](https://rn.dmglobal.com/euheos/HEOS_CLI_ProtocolSpecification.pdf).
A current list can be found within the HEOS CLI protocol which can be found [here](https://rn.dmglobal.com/euheos/HEOS_CLI_ProtocolSpecification_2021.pdf).
### Channels of Thing type 'bridge'
@ -236,7 +236,7 @@ A current list can be found within the HEOS CLI protocol which can be found [her
| Reboot | Switch | Reboot the whole HEOS System. Can be used if you get in trouble with the system |
| BuildGroup | Switch | Is used to define a group. The player which shall be grouped has to be selected first. If Switch is then activated the group is built. |
For a list of the commands please refer to the [HEOS CLI protocol](https://rn.dmglobal.com/euheos/HEOS_CLI_ProtocolSpecification.pdf).
For a list of the commands please refer to the [HEOS CLI protocol](https://rn.dmglobal.com/euheos/HEOS_CLI_ProtocolSpecification_2021.pdf).
## *Dynamic Channels*

View File

@ -1678,13 +1678,7 @@ Items that represent components of a device that are characterized by numbers wi
* Supported item types:
* Dimmer
* Number
* Number:Angle
* Number:Dimensionless
* Number:Length
* Number:Mass
* Number:Temperature
* Number:Volume
* Number(:`<dimension>`)
* Rollershutter
* Supported metadata parameters:
* capabilityNames=`<names>`

View File

@ -109,7 +109,7 @@ Modify the policy accordingly if needed.
<!-- markdownlint-disable ol-prefix -->
4. Click _Next: Tags_
5. Click _Next: Review_
6. Enter `openhab-dynamodb-policy` as the _Name_ol-prefix -->
6. Enter `openhab-dynamodb-policy` as the _Name_
7. Click _Create policy_ to finish policy creation
<!-- markdownlint-enable ol-prefix -->
@ -238,10 +238,10 @@ Similar caveat applies for DynamoDB Time to Live (TTL) setting `expireDays`.
### Updating Amazon SDK
1. Clean `lib/*`
2. Update SDK version in `scripts/fetch_sdk_pom.xml`. You can use the [maven online repository browser](https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-dynamodb) to find the latest version available online.
3. `scripts/fetch_sdk.sh`
4. Copy printed dependencies to `pom.xml`
1. Update SDK version and `netty-nio-client` version in `scripts/fetch_sdk_pom.xml`. You can use the [maven online repository browser](https://mvnrepository.com/artifact/software.amazon.awssdk/dynamodb-enhanced) to find the latest version available online.
2. `scripts/fetch_sdk.sh`
3. Copy printed dependencies to `pom.xml`. If necessary, adjust feature.xml, bnd.importpackage and dep.noembedding as well (probably rarely needed but [it happens](https://aws.amazon.com/blogs/developer/the-aws-sdk-for-java-2-17-removes-its-external-dependency-on-jackson/)).
4. Check & update `NOTICE` file with all the updated, new and removed dependencies.
After these changes, it's good practice to run integration tests (against live AWS DynamoDB) in `org.openhab.persistence.dynamodb.test` bundle.
See README.md in the test bundle for more information how to execute the tests.

View File

@ -23,7 +23,7 @@
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="vendor">Hayward</property>
</properties>
<representation-property>systemID</representation-property>

View File

@ -17,7 +17,14 @@
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="vendor">Hayward</property>
<property name="type"></property>
<property name="sharedType"></property>
<property name="sharedPriority"></property>
<property name="sharedEquipmentSystemID"></property>
<property name="supportsSpillover"></property>
<property name="sizeInGallons"></property>
</properties>
<representation-property>systemID</representation-property>

View File

@ -24,7 +24,11 @@
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="vendor">Hayward</property>
<property name="chlorSharedType"></property>
<property name="chlorMode"></property>
<property name="cellType"></property>
<property name="dispenserType"></property>
</properties>
<representation-property>systemID</representation-property>

View File

@ -18,7 +18,8 @@
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="vendor">Hayward</property>
<property name="colorlogicType"></property>
</properties>
<representation-property>systemID</representation-property>

View File

@ -14,17 +14,27 @@
<channels>
<channel id="filterEnable" typeId="system.power"/>
<channel id="filterValvePosition" typeId="valvePosition"/>
<channel id="filterSpeed" typeId="filterSpeed"/>
<channel id="filterSpeedPercent" typeId="filterSpeedPercent"/>
<channel id="filterSpeedRpm" typeId="filterSpeedRpm"/>
<channel id="filterSpeedSelect" typeId="filterSpeedSelect"/>
<channel id="filterState" typeId="filterState"/>
<channel id="filterLastSpeed" typeId="filterLastSpeed"/>
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="Min Pump Percent"></property>
<property name="Max Pump Percent"></property>
<property name="Min Pump RPM"></property>
<property name="Max Pump RPM"></property>
<property name="vendor">Hayward</property>
<property name="filterSharedType"></property>
<property name="filterType"></property>
<property name="primingEnabled"></property>
<property name="minFilterPercent"></property>
<property name="maxFilterPercent"></property>
<property name="minFilterRPM"></property>
<property name="maxFilterRPM"></property>
<property name="lowFilterSpeed"></property>
<property name="mediumFilterSpeed"></property>
<property name="highFilterSpeed"></property>
<property name="customFilterSpeed"></property>
<property name="freezeProtectOverrideInterval"></property>
</properties>
<representation-property>systemID</representation-property>
@ -44,11 +54,33 @@
</state>
</channel-type>
<channel-type id="filterSpeed">
<channel-type id="filterSpeedPercent">
<item-type>Number:Dimensionless</item-type>
<label>Filter Speed</label>
<description>Filter Speed in %</description>
<state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
<label>Filter Speed %</label>
<description>Filter Speed (%)</description>
<state min="0" max="100" step="5" pattern="%d %unit%" readOnly="false"/>
</channel-type>
<channel-type id="filterSpeedRpm">
<item-type>Number</item-type>
<label>Filter Speed RPM</label>
<description>Filter Speed (RPM)</description>
<state min="0" max="3600" step="200" pattern="%d" readOnly="false"/>
</channel-type>
<channel-type id="filterSpeedSelect">
<item-type>String</item-type>
<label>Filter Speed States</label>
<description>Filter Speed States</description>
<state readOnly="false">
<options>
<option value="0">Off</option>
<option value="33">Low</option>
<option value="66">Medium</option>
<option value="100">High</option>
<option value="100">Custom</option>
</options>
</state>
</channel-type>
<channel-type id="filterState">
@ -76,7 +108,7 @@
<channel-type id="filterLastSpeed">
<item-type>Number:Dimensionless</item-type>
<label>Last Speed</label>
<description>Last Speed</description>
<description>Last Speed (%)</description>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>

View File

@ -17,16 +17,25 @@
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="vendor">Hayward</property>
<property name="type"></property>
<property name="heaterType"></property>
<property name="sharedEquipmentSystemID"></property>
</properties>
<representation-property>systemID</representation-property>
</thing-type>
<channel-type id="state">
<item-type>Number</item-type>
<item-type>String</item-type>
<label>Heater State</label>
<description>Heater State</description>
<state readOnly="true"/>
<state readOnly="true">
<options>
<option value="0">Off</option>
<option value="1">Heating</option>
<option value="2">Paused</option>
</options>
</state>
</channel-type>
<channel-type id="enable">

View File

@ -13,25 +13,87 @@
<description>Pump</description>
<channels>
<channel id="pumpEnable" typeId="system.power"/>
<channel id="pumpSpeed" typeId="pumpSpeed"/>
<channel id="pumpSpeedPercent" typeId="pumpSpeedPercent"/>
<channel id="pumpSpeedRpm" typeId="pumpSpeedRpm"/>
<channel id="pumpSpeedSelect" typeId="pumpSpeedSelect"/>
<channel id="pumpState" typeId="pumpState"/>
<channel id="pumpLastSpeed" typeId="pumpLastSpeed"/>
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="Min Pump Percent"></property>
<property name="Max Pump Percent"></property>
<property name="Min Pump RPM"></property>
<property name="Max Pump RPM"></property>
<property name="vendor">Hayward</property>
<property name="pumpType"></property>
<property name="pumpFunction"></property>
<property name="pumpPrimingEnabled"></property>
<property name="minPumpPercent"></property>
<property name="maxPumpPercent"></property>
<property name="minPumpRPM"></property>
<property name="maxPumpRPM"></property>
<property name="lowPumpSpeed"></property>
<property name="mediumPumpSpeed"></property>
<property name="highPumpSpeed"></property>
<property name="customPumpSpeed"></property>
</properties>
<representation-property>systemID</representation-property>
</thing-type>
<channel-type id="pumpSpeed">
<channel-type id="pumpSpeedPercent">
<item-type>Number:Dimensionless</item-type>
<label>Pump Speed in %</label>
<description>Pump Speed</description>
<state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
<label>Pump Speed %</label>
<description>Pump Speed (%)</description>
<state min="0" max="100" step="1" pattern="%d %unit%" readOnly="false"/>
</channel-type>
<channel-type id="pumpSpeedRpm">
<item-type>Number:Dimensionless</item-type>
<label>Pump Speed RPM</label>
<description>Pump Speed (RPM)</description>
<state min="0" max="3600" step="200" pattern="%d" readOnly="false"/>
</channel-type>
<channel-type id="pumpSpeedSelect">
<item-type>String</item-type>
<label>Pump Speed States</label>
<description>Pump Speed States</description>
<state readOnly="false">
<options>
<option value="0">Off</option>
<option value="33">Low</option>
<option value="66">Medium</option>
<option value="100">High</option>
<option value="100">Custom</option>
</options>
</state>
</channel-type>
<channel-type id="pumpState">
<item-type>String</item-type>
<label>Pump State</label>
<description>Pump State</description>
<state readOnly="true">
<options>
<option value="0">Off</option>
<option value="1">Running</option>
<option value="2">Priming</option>
<option value="3">Waiting to Turn Off</option>
<option value="4">Waiting to Turn Off Manual</option>
<option value="5">Heater Extend</option>
<option value="6">Heater Cool Down</option>
<option value="7">Suspended</option>
<option value="8">CSAD Extend</option>
<option value="9">Superchlorinate</option>
<option value="10">Force Priming</option>
<option value="11">Waiting for Pump to Turn Off</option>
</options>
</state>
</channel-type>
<channel-type id="pumpLastSpeed">
<item-type>Number:Dimensionless</item-type>
<label>Last Speed</label>
<description>Last Speed (%)</description>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
</thing:thing-descriptions>

View File

@ -16,7 +16,9 @@
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="vendor">Hayward</property>
<property name="relayType"></property>
<property name="relayFunction"></property>
</properties>
<representation-property>systemID</representation-property>

View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="haywardomnilogic"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<thing-type id="sensor" listed="false">
<supported-bridge-type-refs>
<bridge-type-ref id="bridge"/>
</supported-bridge-type-refs>
<label>Sensor</label>
<description>Sensor</description>
<channels>
<channel id="sensorData" typeId="data"/>
</channels>
<properties>
<property name="Vendor">Hayward</property>
</properties>
<representation-property>systemID</representation-property>
</thing-type>
<channel-type id="bow">
<item-type>Number</item-type>
<label>Body of Water</label>
<description>The Body of Water ID</description>
<state readOnly="true"/>
</channel-type>
<channel-type id="data">
<item-type>Number</item-type>
<label>Data</label>
<description>Sensor Data</description>
<state readOnly="true"/>
</channel-type>
</thing:thing-descriptions>

View File

@ -18,7 +18,11 @@
</channels>
<properties>
<property name="Vendor">Hayward</property>
<property name="vendor">Hayward</property>
<property name="sharedType"></property>
<property name="minSettableWaterTemp"></property>
<property name="maxSettableWaterTemp"></property>
<property name="maxWaterTemp"></property>
</properties>
<representation-property>systemID</representation-property>
</thing-type>

View File

@ -68,13 +68,13 @@
<item-type>DateTime</item-type>
<label>Current Event Start</label>
<description>Start of the currently present event</description>
<state readOnly="true"/>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
<channel-type id="event_current_end">
<item-type>DateTime</item-type>
<label>Current Event End</label>
<description>End of the currently present event</description>
<state readOnly="true"/>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
<channel-type id="event_current_presence">
<item-type>Switch</item-type>
@ -92,26 +92,26 @@
<item-type>DateTime</item-type>
<label>Next Event Start</label>
<description>Start of the next event in calendar</description>
<state readOnly="true"/>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
<channel-type id="event_next_end">
<item-type>DateTime</item-type>
<label>Next Event End</label>
<description>End of the next event in calendar</description>
<state readOnly="true"/>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
<channel-type id="result_start">
<item-type>DateTime</item-type>
<label>Start of Result</label>
<description>Start of the found result in calendar</description>
<state readOnly="true"/>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
<channel-type id="result_end">
<item-type>DateTime</item-type>
<label>End of Result</label>
<description>End of the found result in calendar</description>
<state readOnly="true"/>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
<channel-type id="result_title">
<item-type>String</item-type>
@ -123,7 +123,7 @@
<item-type>DateTime</item-type>
<label>Last Update</label>
<description>The time the calendar was updated successfully last time</description>
<state readOnly="true"/>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
<channel-group-type id="result">
<label>Result Event</label>
@ -156,6 +156,7 @@
<parameter name="maxEvents" type="integer" required="true" min="0" groupName="general">
<label>Maximum Matches</label>
<description>Maximum matches found by this filter</description>
</parameter>
<parameter name="refreshTime" type="integer" required="true" min="1" groupName="general" unit="min">
<label>Refresh Time</label>
@ -171,7 +172,8 @@
<option value="WEEK">week</option>
</options>
<default>HOUR</default>
<label>Date or Time Unit for Start and End</label>
<label>Date/Time Unit</label>
<description>Date or time unit for start and end</description>
</parameter>
<parameter name="datetimeStart" type="integer" groupName="datetime_based">
<label>Start</label>