Updated external content (Jenkins build 1423)

pull/2077/head
openHAB Build Server 2023-03-24 05:36:16 +00:00
parent 94be705f8d
commit 879c3ef956
5 changed files with 125 additions and 51 deletions

View File

@ -298,8 +298,8 @@ Use the `SCRIPT` transformation with JavaScript Scripting by:
})(input); })(input);
``` ```
2. Using `SCRIPT(graaljs:<scriptname>.script):%s` as the transformation profile, e.g. on an Item. 2. Using `SCRIPT(js:<scriptname>.script):%s` as the transformation profile, e.g. on an Item.
3. Passing parameters is also possible by using a URL like syntax: `SCRIPT(graaljs:<scriptname>.script?arg=value):%s`. 3. Passing parameters is also possible by using a URL like syntax: `SCRIPT(js:<scriptname>.script?arg=value):%s`.
Parameters are injected into the script and can be referenced like variables. Parameters are injected into the script and can be referenced like variables.
## Standard Library ## Standard Library

View File

@ -156,7 +156,7 @@ If correct credentials are set in the bridge configuration, connected AHA device
- `port` (optional, 1 to 65535), no default (derived from protocol: 80 or 443) - `port` (optional, 1 to 65535), no default (derived from protocol: 80 or 443)
- `password` (optional for call monitoring, but mandatory for AHA features), no default (depends on FRITZ!Box security configuration) - `password` (optional for call monitoring, but mandatory for AHA features), no default (depends on FRITZ!Box security configuration)
- `user` (optional), no default (depends on FRITZ!Box security configuration) - `user` (optional), no default (depends on FRITZ!Box security configuration)
- `pollingInterval` (optional, 5 to 60), default 15 (in seconds) - `pollingInterval` (optional, 1 to 60), default 15 (in seconds)
- `asyncTimeout` (optional, 1000 to 60000), default 10000 (in milliseconds) - `asyncTimeout` (optional, 1000 to 60000), default 10000 (in milliseconds)
- `syncTimeout` (optional, 500 to 15000), default 2000 (in milliseconds) - `syncTimeout` (optional, 500 to 15000), default 2000 (in milliseconds)
@ -167,7 +167,7 @@ If correct credentials are set in the bridge configuration, connected AHA device
- `protocol` (optional, "http" or "https"), default "http" - `protocol` (optional, "http" or "https"), default "http"
- `port` (optional, 1 to 65535), no default (derived from protocol: 80 or 443) - `port` (optional, 1 to 65535), no default (derived from protocol: 80 or 443)
- `password` (optional), no default (depends on FRITZ!Powerline security configuration) - `password` (optional), no default (depends on FRITZ!Powerline security configuration)
- `pollingInterval` (optional, 5 to 60), default 15 (in seconds) - `pollingInterval` (optional, 1 to 60), default 15 (in seconds)
- `asyncTimeout` (optional, 1000 to 60000), default 10000 (in milliseconds) - `asyncTimeout` (optional, 1000 to 60000), default 10000 (in milliseconds)
- `syncTimeout` (optional, 500 to 15000), default 2000 (in milliseconds) - `syncTimeout` (optional, 500 to 15000), default 2000 (in milliseconds)

View File

@ -31,11 +31,21 @@
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="apply_template" typeId="apply_template"/> <channel id="apply_template" typeId="apply_template"/>
<channel id="energy" typeId="energy"/> <channel id="energy" typeId="system.electrical-energy">
<channel id="power" typeId="power"/> <label>Energy Consumption</label>
<description>Accumulated energy consumption.</description>
</channel>
<channel id="power" typeId="system.electric-power">
<label>Power</label>
<description>Current power consumption.</description>
</channel>
<channel id="outlet" typeId="outlet"/> <channel id="outlet" typeId="outlet"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ipAddress</representation-property> <representation-property>ipAddress</representation-property>
<config-description-ref uri="bridge-type:avmfritz:fritzpowerline"/> <config-description-ref uri="bridge-type:avmfritz:fritzpowerline"/>

View File

@ -11,18 +11,21 @@
<description>Details about incoming call.</description> <description>Details about incoming call.</description>
<state pattern="%1$s to %2$s" readOnly="true"/> <state pattern="%1$s to %2$s" readOnly="true"/>
</channel-type> </channel-type>
<channel-type id="outgoing_call"> <channel-type id="outgoing_call">
<item-type>Call</item-type> <item-type>Call</item-type>
<label>Outgoing Call</label> <label>Outgoing Call</label>
<description>Details about outgoing call.</description> <description>Details about outgoing call.</description>
<state pattern="%1$s to %2$s" readOnly="true"/> <state pattern="%1$s to %2$s" readOnly="true"/>
</channel-type> </channel-type>
<channel-type id="active_call"> <channel-type id="active_call">
<item-type>Call</item-type> <item-type>Call</item-type>
<label>Active Call</label> <label>Active Call</label>
<description>Details about active call.</description> <description>Details about active call.</description>
<state pattern="%1$s" readOnly="true"/> <state pattern="%1$s" readOnly="true"/>
</channel-type> </channel-type>
<channel-type id="call_state"> <channel-type id="call_state">
<item-type>String</item-type> <item-type>String</item-type>
<label>Call State</label> <label>Call State</label>
@ -36,6 +39,7 @@
</options> </options>
</state> </state>
</channel-type> </channel-type>
<channel-type id="apply_template" advanced="true"> <channel-type id="apply_template" advanced="true">
<item-type>String</item-type> <item-type>String</item-type>
<label>Apply Template</label> <label>Apply Template</label>
@ -48,6 +52,7 @@
<item-type>String</item-type> <item-type>String</item-type>
<label>Mode</label> <label>Mode</label>
<description>States the mode of the device (MANUAL/AUTOMATIC/VACATION).</description> <description>States the mode of the device (MANUAL/AUTOMATIC/VACATION).</description>
<category>Heating</category>
<state pattern="%s" readOnly="true"> <state pattern="%s" readOnly="true">
<options> <options>
<option value="MANUAL">Manual</option> <option value="MANUAL">Manual</option>
@ -107,6 +112,10 @@
<label>Current Temperature</label> <label>Current Temperature</label>
<description>Current measured temperature.</description> <description>Current measured temperature.</description>
<category>Temperature</category> <category>Temperature</category>
<tags>
<tag>Measurement</tag>
<tag>Temperature</tag>
</tags>
<state pattern="%.1f %unit%" readOnly="true"/> <state pattern="%.1f %unit%" readOnly="true"/>
<config-description-ref uri="channel-type:avmfritz:temperature"/> <config-description-ref uri="channel-type:avmfritz:temperature"/>
@ -117,46 +126,22 @@
<label>Current Humidity</label> <label>Current Humidity</label>
<description>Current measured humidity.</description> <description>Current measured humidity.</description>
<category>Humidity</category> <category>Humidity</category>
<tags>
<tag>Measurement</tag>
<tag>Humidity</tag>
</tags>
<state pattern="%.0f %unit%" readOnly="true"/> <state pattern="%.0f %unit%" readOnly="true"/>
</channel-type> </channel-type>
<channel-type id="energy">
<item-type>Number:Energy</item-type>
<label>Energy Consumption</label>
<description>Accumulated energy consumption.</description>
<category>Energy</category>
<state pattern="%.3f kWh" readOnly="true"/>
</channel-type>
<channel-type id="power">
<item-type>Number:Power</item-type>
<label>Power</label>
<description>Current power consumption.</description>
<category>Energy</category>
<state pattern="%.2f %unit%" readOnly="true"/>
</channel-type>
<channel-type id="voltage">
<item-type>Number:ElectricPotential</item-type>
<label>Voltage</label>
<description>Current voltage.</description>
<category>Energy</category>
<state pattern="%.1f %unit%" readOnly="true"/>
</channel-type>
<channel-type id="outlet"> <channel-type id="outlet">
<item-type>Switch</item-type> <item-type>Switch</item-type>
<label>Outlet</label> <label>Outlet</label>
<description>Switched outlet (ON/OFF).</description> <description>Switched outlet (ON/OFF).</description>
<category>PowerOutlet</category> <category>PowerOutlet</category>
</channel-type> <tags>
<tag>Switch</tag>
<channel-type id="actual_temp" advanced="true"> <tag>Power</tag>
<item-type>Number:Temperature</item-type> </tags>
<label>Current Temperature</label>
<description>Current measured temperature.</description>
<category>Temperature</category>
<state pattern="%.1f %unit%" readOnly="true"/>
</channel-type> </channel-type>
<channel-type id="set_temp"> <channel-type id="set_temp">
@ -164,6 +149,10 @@
<label>Setpoint Temperature</label> <label>Setpoint Temperature</label>
<description>Thermostat Setpoint temperature.</description> <description>Thermostat Setpoint temperature.</description>
<category>Heating</category> <category>Heating</category>
<tags>
<tag>Setpoint</tag>
<tag>Temperature</tag>
</tags>
<state pattern="%.1f %unit%"/> <state pattern="%.1f %unit%"/>
</channel-type> </channel-type>

View File

@ -91,7 +91,10 @@
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="temperature" typeId="temperature"/> <channel id="temperature" typeId="temperature"/>
<channel id="actual_temp" typeId="actual_temp"/> <channel id="actual_temp" typeId="system.indoor-temperature">
<label>Current Temperature</label>
<description>Current measured temperature.</description>
</channel>
<channel id="set_temp" typeId="set_temp"/> <channel id="set_temp" typeId="set_temp"/>
<channel id="eco_temp" typeId="eco_temp"/> <channel id="eco_temp" typeId="eco_temp"/>
<channel id="comfort_temp" typeId="comfort_temp"/> <channel id="comfort_temp" typeId="comfort_temp"/>
@ -101,6 +104,10 @@
<channel id="battery_low" typeId="system.low-battery"/> <channel id="battery_low" typeId="system.low-battery"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzdevice"/> <config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@ -120,7 +127,10 @@
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="temperature" typeId="temperature"/> <channel id="temperature" typeId="temperature"/>
<channel id="actual_temp" typeId="actual_temp"/> <channel id="actual_temp" typeId="system.indoor-temperature">
<label>Current Temperature</label>
<description>Current measured temperature.</description>
</channel>
<channel id="set_temp" typeId="set_temp"/> <channel id="set_temp" typeId="set_temp"/>
<channel id="eco_temp" typeId="eco_temp"/> <channel id="eco_temp" typeId="eco_temp"/>
<channel id="comfort_temp" typeId="comfort_temp"/> <channel id="comfort_temp" typeId="comfort_temp"/>
@ -130,6 +140,10 @@
<channel id="battery_low" typeId="system.low-battery"/> <channel id="battery_low" typeId="system.low-battery"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzdevice"/> <config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@ -149,7 +163,10 @@
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="temperature" typeId="temperature"/> <channel id="temperature" typeId="temperature"/>
<channel id="actual_temp" typeId="actual_temp"/> <channel id="actual_temp" typeId="system.indoor-temperature">
<label>Current Temperature</label>
<description>Current measured temperature.</description>
</channel>
<channel id="set_temp" typeId="set_temp"/> <channel id="set_temp" typeId="set_temp"/>
<channel id="eco_temp" typeId="eco_temp"/> <channel id="eco_temp" typeId="eco_temp"/>
<channel id="comfort_temp" typeId="comfort_temp"/> <channel id="comfort_temp" typeId="comfort_temp"/>
@ -159,6 +176,10 @@
<channel id="battery_low" typeId="system.low-battery"/> <channel id="battery_low" typeId="system.low-battery"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzdevice"/> <config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@ -178,7 +199,10 @@
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="temperature" typeId="temperature"/> <channel id="temperature" typeId="temperature"/>
<channel id="actual_temp" typeId="actual_temp"/> <channel id="actual_temp" typeId="system.indoor-temperature">
<label>Current Temperature</label>
<description>Current measured temperature.</description>
</channel>
<channel id="set_temp" typeId="set_temp"/> <channel id="set_temp" typeId="set_temp"/>
<channel id="eco_temp" typeId="eco_temp"/> <channel id="eco_temp" typeId="eco_temp"/>
<channel id="comfort_temp" typeId="comfort_temp"/> <channel id="comfort_temp" typeId="comfort_temp"/>
@ -188,6 +212,10 @@
<channel id="battery_low" typeId="system.low-battery"/> <channel id="battery_low" typeId="system.low-battery"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzdevice"/> <config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@ -207,11 +235,21 @@
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="temperature" typeId="temperature"/> <channel id="temperature" typeId="temperature"/>
<channel id="energy" typeId="energy"/> <channel id="energy" typeId="system.electrical-energy">
<channel id="power" typeId="power"/> <label>Energy Consumption</label>
<description>Accumulated energy consumption.</description>
</channel>
<channel id="power" typeId="system.electric-power">
<label>Power</label>
<description>Current power consumption.</description>
</channel>
<channel id="outlet" typeId="outlet"/> <channel id="outlet" typeId="outlet"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzdevice"/> <config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@ -231,11 +269,21 @@
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="temperature" typeId="temperature"/> <channel id="temperature" typeId="temperature"/>
<channel id="energy" typeId="energy"/> <channel id="energy" typeId="system.electrical-energy">
<channel id="power" typeId="power"/> <label>Energy Consumption</label>
<description>Accumulated energy consumption.</description>
</channel>
<channel id="power" typeId="system.electric-power">
<label>Power</label>
<description>Current power consumption.</description>
</channel>
<channel id="outlet" typeId="outlet"/> <channel id="outlet" typeId="outlet"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzdevice"/> <config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@ -255,11 +303,21 @@
<channel id="mode" typeId="mode"/> <channel id="mode" typeId="mode"/>
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="energy" typeId="energy"/> <channel id="energy" typeId="system.electrical-energy">
<channel id="power" typeId="power"/> <label>Energy Consumption</label>
<description>Accumulated energy consumption.</description>
</channel>
<channel id="power" typeId="system.electric-power">
<label>Power</label>
<description>Current power consumption.</description>
</channel>
<channel id="outlet" typeId="outlet"/> <channel id="outlet" typeId="outlet"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzdevice"/> <config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@ -410,7 +468,10 @@
<channel id="mode" typeId="mode"/> <channel id="mode" typeId="mode"/>
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="actual_temp" typeId="actual_temp"/> <channel id="actual_temp" typeId="system.indoor-temperature">
<label>Current Temperature</label>
<description>Current measured temperature.</description>
</channel>
<channel id="set_temp" typeId="set_temp"/> <channel id="set_temp" typeId="set_temp"/>
<channel id="eco_temp" typeId="eco_temp"/> <channel id="eco_temp" typeId="eco_temp"/>
<channel id="comfort_temp" typeId="comfort_temp"/> <channel id="comfort_temp" typeId="comfort_temp"/>
@ -420,6 +481,10 @@
<channel id="battery_low" typeId="system.low-battery"/> <channel id="battery_low" typeId="system.low-battery"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzgroup"/> <config-description-ref uri="thing-type:avmfritz:fritzgroup"/>
@ -438,11 +503,21 @@
<channel id="mode" typeId="mode"/> <channel id="mode" typeId="mode"/>
<channel id="locked" typeId="locked"/> <channel id="locked" typeId="locked"/>
<channel id="device_locked" typeId="device_locked"/> <channel id="device_locked" typeId="device_locked"/>
<channel id="energy" typeId="energy"/> <channel id="energy" typeId="system.electrical-energy">
<channel id="power" typeId="power"/> <label>Energy Consumption</label>
<description>Accumulated energy consumption.</description>
</channel>
<channel id="power" typeId="system.electric-power">
<label>Power</label>
<description>Current power consumption.</description>
</channel>
<channel id="outlet" typeId="outlet"/> <channel id="outlet" typeId="outlet"/>
</channels> </channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<representation-property>ain</representation-property> <representation-property>ain</representation-property>
<config-description-ref uri="thing-type:avmfritz:fritzgroup"/> <config-description-ref uri="thing-type:avmfritz:fritzgroup"/>