Updated external content (Jenkins build 1736)
parent
ebdad2f3f7
commit
7ff841b5bb
|
@ -27,12 +27,13 @@ All channels are available for thing type `service`.
|
|||
|
||||
### `service` Thing Configuration
|
||||
|
||||
| Name | Type | Description | Default | Required |
|
||||
|----------------|---------|---------------------------------------------------|---------------|----------|
|
||||
| priceArea | text | Price area for spot prices (same as bidding zone) | | yes |
|
||||
| currencyCode | text | Currency code in which to obtain spot prices | DKK | no |
|
||||
| gridCompanyGLN | integer | Global Location Number of the Grid Company | | no |
|
||||
| energinetGLN | integer | Global Location Number of Energinet | 5790000432752 | no |
|
||||
| Name | Type | Description | Default | Required |
|
||||
|-----------------------|---------|----------------------------------------------------------------------|---------------|----------|
|
||||
| priceArea | text | Price area for spot prices (same as bidding zone) | | yes |
|
||||
| currencyCode | text | Currency code in which to obtain spot prices | DKK | no |
|
||||
| gridCompanyGLN | integer | Global Location Number of the Grid Company | | no |
|
||||
| energinetGLN | integer | Global Location Number of Energinet | 5790000432752 | no |
|
||||
| reducedElectricityTax | boolean | Reduced electricity tax applies. For electric heating customers only | false | no |
|
||||
|
||||
#### Global Location Number of the Grid Company
|
||||
|
||||
|
@ -50,6 +51,13 @@ To obtain the Global Location Number of your grid company:
|
|||
- In column **Owner** you can find the GLN ("Global Location Number").
|
||||
- Most rows will have this **Owner**. If in doubt, try to look for rows __not__ having 5790000432752 as owner.
|
||||
|
||||
#### Reduced electricity tax applies
|
||||
|
||||
For customers using electricity for heating, a reduced electricity tax rate may apply after consuming the first 4000 kWh within a year.
|
||||
When you are entitled to reduced electricity tax, this option should be set.
|
||||
This will ensure that thing action calculations use the reduced electricity tax rate when price elements are not explicitly provided.
|
||||
It will not impact channels, see [Electricity Tax](#electricity-tax) for further information.
|
||||
|
||||
## Channels
|
||||
|
||||
### Channel Group `electricity`
|
||||
|
@ -60,6 +68,7 @@ To obtain the Global Location Number of your grid company:
|
|||
| net-tariff | Number | Current net tariff in DKK per kWh. Only available when `gridCompanyGLN` is configured | no |
|
||||
| system-tariff | Number | Current system tariff in DKK per kWh | no |
|
||||
| electricity-tax | Number | Current electricity tax in DKK per kWh | no |
|
||||
| reduced-electricity-tax | Number | Current reduced electricity tax in DKK per kWh. For electric heating customers only | no |
|
||||
| transmission-net-tariff | Number | Current transmission net tariff in DKK per kWh | no |
|
||||
| hourly-prices | String | JSON array with hourly prices from 24 hours ago and onward | yes |
|
||||
|
||||
|
@ -71,6 +80,9 @@ This has the following advantages:
|
|||
- An additional item containing the kWh fee from your electricity supplier can be added also.
|
||||
- Spot price can be configured in EUR while tariffs are in DKK.
|
||||
|
||||
If you want electricity tax included in your total price, please add either `electricity-tax` or `reduced-electricity-tax` to the group - depending on which one applies.
|
||||
See [Electricity Tax](#electricity-tax) for further information.
|
||||
|
||||
#### Value-Added Tax
|
||||
|
||||
VAT is not included in any of the prices.
|
||||
|
@ -122,6 +134,15 @@ _Nord Energi Net:_
|
|||
| start | StartOfDay |
|
||||
| offset | -P1D |
|
||||
|
||||
#### Electricity Tax
|
||||
|
||||
The standard channel for electricity tax is `electricity-tax`.
|
||||
For customers using electricity for heating, a reduced electricity tax rate may apply (see [Reduced electricity tax applies](#reduced-electricity-tax-applies)).
|
||||
This reduced rate is made available through channel `reduced-electricity-tax`.
|
||||
|
||||
The binding cannot determine or manage rate variations as they depend on metering data.
|
||||
Usually `reduced-electricity-tax` is preferred when using electricity for heating.
|
||||
|
||||
#### Hourly Prices
|
||||
|
||||
The format of the `hourly-prices` JSON array is as follows:
|
||||
|
@ -129,22 +150,24 @@ The format of the `hourly-prices` JSON array is as follows:
|
|||
```json
|
||||
[
|
||||
{
|
||||
"hourStart": "2023-01-24T15:00:00Z",
|
||||
"spotPrice": 1.67076001,
|
||||
"hourStart": "2023-09-19T18:00:00Z",
|
||||
"spotPrice": 0.0,
|
||||
"spotPriceCurrency": "DKK",
|
||||
"netTariff": 0.432225,
|
||||
"systemTariff": 0.054000,
|
||||
"electricityTax": 0.008000,
|
||||
"transmissionNetTariff": 0.058000
|
||||
"netTariff": 0.0,
|
||||
"systemTariff": 0.054,
|
||||
"electricityTax": 0.697,
|
||||
"reducedElectricityTax": 0.008,
|
||||
"transmissionNetTariff": 0.058
|
||||
},
|
||||
{
|
||||
"hourStart": "2023-01-24T16:00:00Z",
|
||||
"spotPrice": 1.859880005,
|
||||
"hourStart": "2023-09-19T19:00:00Z",
|
||||
"spotPrice": -0.00052,
|
||||
"spotPriceCurrency": "DKK",
|
||||
"netTariff": 1.05619,
|
||||
"systemTariff": 0.054000,
|
||||
"electricityTax": 0.008000,
|
||||
"transmissionNetTariff": 0.058000
|
||||
"netTariff": 0.0,
|
||||
"systemTariff": 0.054,
|
||||
"electricityTax": 0.697,
|
||||
"reducedElectricityTax": 0.008,
|
||||
"transmissionNetTariff": 0.058
|
||||
}
|
||||
]
|
||||
```
|
||||
|
@ -325,14 +348,17 @@ These elements can be requested:
|
|||
| NetTariff | Net tariff |
|
||||
| SystemTariff | System tariff |
|
||||
| ElectricityTax | Electricity tax |
|
||||
| ReducedElectricityTax | Reduced electricity tax |
|
||||
| TransmissionNetTariff | Transmission net tariff |
|
||||
|
||||
Using `null` as parameter returns the total prices including all price elements.
|
||||
If **Reduced Electricity Tax** is set in Thing configuration, `ElectricityTax` will be excluded, otherwise `ReducedElectricityTax`.
|
||||
This logic ensures consistent and comparable results not affected by artifical changes in the rate for electricity tax two times per year.
|
||||
|
||||
Example:
|
||||
|
||||
```javascript
|
||||
var priceMap = actions.getPrices("SpotPrice,NetTariff");
|
||||
var priceMap = actions.getPrices("SpotPrice,NetTariff")
|
||||
```
|
||||
|
||||
## Full Example
|
||||
|
|
|
@ -131,23 +131,23 @@ Channels available for each appliance type are listed below.
|
|||
|
||||
#### Dishwasher
|
||||
|
||||
| Channel | Type | Read/write | Description |
|
||||
|---------------------|----------------------|------------|---------------------------------------------------------------------|
|
||||
| state | String | Read | Current status of the appliance |
|
||||
| rawState | Number | Read | Current status of the appliance as raw number |
|
||||
| program | String | Read | Current program or function running on the appliance |
|
||||
| rawProgram | Number | Read | Current program or function running on the appliance as raw number |
|
||||
| phase | String | Read | Current phase of the program running on the appliance |
|
||||
| rawPhase | Number | Read | Current phase of the program running on the appliance as raw number |
|
||||
| start | DateTime | Read | Programmed start time of the program |
|
||||
| end | DateTime | Read | End time of the program (programmed or running) |
|
||||
| duration | Number:Time | Read | Duration of the program running on the appliance |
|
||||
| elapsed | Number:Time | Read | Time elapsed in the program running on the appliance |
|
||||
| finish | Number:Time | Read | Time to finish the program running on the appliance |
|
||||
| door | Contact | Read | Current state of the door of the appliance |
|
||||
| switch | Switch | Write | Switch the appliance on or off |
|
||||
| powerConsumption | Number:Energy | Read | Power consumption by the currently running program on the appliance |
|
||||
| waterConsumption | Number:Volume | Read | Water consumption by the currently running program on the appliance |
|
||||
| Channel | Type | Read/write | Description |
|
||||
|---------------------|----------------------|------------|----------------------------------------------------------------------|
|
||||
| state | String | Read | Current status of the appliance |
|
||||
| rawState | Number | Read | Current status of the appliance as raw number |
|
||||
| program | String | Read | Current program or function running on the appliance |
|
||||
| rawProgram | Number | Read | Current program or function running on the appliance as raw number |
|
||||
| phase | String | Read | Current phase of the program running on the appliance |
|
||||
| rawPhase | Number | Read | Current phase of the program running on the appliance as raw number |
|
||||
| start | DateTime | Read | Programmed start time of the program |
|
||||
| end | DateTime | Read | End time of the program (programmed or running) |
|
||||
| duration | Number:Time | Read | Duration of the program running on the appliance |
|
||||
| elapsed | Number:Time | Read | Time elapsed in the program running on the appliance |
|
||||
| finish | Number:Time | Read | Time to finish the program running on the appliance |
|
||||
| door | Contact | Read | Current state of the door of the appliance |
|
||||
| switch | Switch | Write | Switch the appliance on or off |
|
||||
| energyConsumption | Number:Energy | Read | Energy consumption by the currently running program on the appliance |
|
||||
| waterConsumption | Number:Volume | Read | Water consumption by the currently running program on the appliance |
|
||||
|
||||
##### Programs
|
||||
|
||||
|
@ -351,26 +351,26 @@ See oven.
|
|||
|
||||
#### Washing Machine
|
||||
|
||||
| Channel | Type | Read/write | Description |
|
||||
|---------------------|----------------------|------------|---------------------------------------------------------------------|
|
||||
| state | String | Read | Current status of the appliance |
|
||||
| rawState | Number | Read | Current status of the appliance as raw number |
|
||||
| program | String | Read | Current program or function running on the appliance |
|
||||
| rawProgram | Number | Read | Current program or function running on the appliance as raw number |
|
||||
| type | String | Read | Type of the program running on the appliance |
|
||||
| phase | String | Read | Current phase of the program running on the appliance |
|
||||
| rawPhase | Number | Read | Current phase of the program running on the appliance as raw number |
|
||||
| start | DateTime | Read | Programmed start time of the program |
|
||||
| end | DateTime | Read | End time of the program (programmed or running) |
|
||||
| duration | Number:Time | Read | Duration of the program running on the appliance |
|
||||
| elapsed | Number:Time | Read | Time elapsed in the program running on the appliance |
|
||||
| finish | Number:Time | Read | Time to finish the program running on the appliance |
|
||||
| door | Contact | Read | Current state of the door of the appliance |
|
||||
| switch | Switch | Write | Switch the appliance on or off |
|
||||
| target | Number:Temperature | Read | Temperature of the selected program (10 °C = cold) |
|
||||
| spinningspeed | String | Read | Spinning speed in the program running on the appliance |
|
||||
| powerConsumption | Number:Energy | Read | Power consumption by the currently running program on the appliance |
|
||||
| waterConsumption | Number:Volume | Read | Water consumption by the currently running program on the appliance |
|
||||
| Channel | Type | Read/write | Description |
|
||||
|---------------------|----------------------|------------|----------------------------------------------------------------------|
|
||||
| state | String | Read | Current status of the appliance |
|
||||
| rawState | Number | Read | Current status of the appliance as raw number |
|
||||
| program | String | Read | Current program or function running on the appliance |
|
||||
| rawProgram | Number | Read | Current program or function running on the appliance as raw number |
|
||||
| type | String | Read | Type of the program running on the appliance |
|
||||
| phase | String | Read | Current phase of the program running on the appliance |
|
||||
| rawPhase | Number | Read | Current phase of the program running on the appliance as raw number |
|
||||
| start | DateTime | Read | Programmed start time of the program |
|
||||
| end | DateTime | Read | End time of the program (programmed or running) |
|
||||
| duration | Number:Time | Read | Duration of the program running on the appliance |
|
||||
| elapsed | Number:Time | Read | Time elapsed in the program running on the appliance |
|
||||
| finish | Number:Time | Read | Time to finish the program running on the appliance |
|
||||
| door | Contact | Read | Current state of the door of the appliance |
|
||||
| switch | Switch | Write | Switch the appliance on or off |
|
||||
| target | Number:Temperature | Read | Temperature of the selected program (10 °C = cold) |
|
||||
| spinningspeed | String | Read | Spinning speed in the program running on the appliance |
|
||||
| energyConsumption | Number:Energy | Read | Energy consumption by the currently running program on the appliance |
|
||||
| waterConsumption | Number:Volume | Read | Water consumption by the currently running program on the appliance |
|
||||
|
||||
##### Programs
|
||||
|
||||
|
@ -447,7 +447,7 @@ String Dishwasher_Program "Program [%s]" {channel="miele:di
|
|||
String Dishwasher_Phase "Phase [%s]" {channel="miele:dishwasher:home:dishwasher:phase"}
|
||||
Number:Time Dishwasher_ElapsedTime "Elapsed time" <time> {channel="miele:dishwasher:home:dishwasher:elapsed"}
|
||||
Number:Time Dishwasher_FinishTime "Remaining time" <time> {channel="miele:dishwasher:home:dishwasher:finish"}
|
||||
Number:Energy Dishwasher_PowerConsumption {channel="miele:dishwasher:home:dishwasher:powerConsumption"}
|
||||
Number:Energy Dishwasher_EnergyConsumption {channel="miele:dishwasher:home:dishwasher:energyConsumption"}
|
||||
Number:Volume Dishwasher_WaterConsumption {channel="miele:dishwasher:home:dishwasher:waterConsumption"}
|
||||
|
||||
String Fridge_State {channel="miele:fridge:home:fridge:state"}
|
||||
|
@ -475,7 +475,7 @@ Number:Temperature WashingMachine_Temperature <temperature> {channel="miele:wa
|
|||
String WashingMachine_SpinningSpeed {channel="miele:washingmachine:home:washingmachine:spinningspeed"}
|
||||
Number:Time WashingMachine_ElapsedTime "Elapsed time" <time> {channel="miele:washingmachine:home:washingmachine:elapsed"}
|
||||
Number:Time WashingMachine_FinishTime "Remaining time" <time> {channel="miele:washingmachine:home:washingmachine:finish"}
|
||||
Number:Energy WashingMachine_PowerConsumption {channel="miele:washingmachine:home:washingmachine:powerConsumption"}
|
||||
Number:Energy WashingMachine_EnergyConsumption {channel="miele:washingmachine:home:washingmachine:energyConsumption"}
|
||||
Number:Volume WashingMachine_WaterConsumption {channel="miele:washingmachine:home:washingmachine:waterConsumption"}
|
||||
|
||||
String TumbleDryer_State {channel="miele:tumbledryer:home:tumbledryer:state"}
|
||||
|
@ -505,7 +505,7 @@ sitemap miele label="Miele" {
|
|||
Text item=WashingMachine_Phase visibility=[WashingMachine_Phase!=UNDEF]
|
||||
Text item=WashingMachine_ElapsedTime
|
||||
Text item=WashingMachine_FinishTime
|
||||
Text item=WashingMachine_PowerConsumption
|
||||
Text item=WashingMachine_EnergyConsumption
|
||||
Text item=WashingMachine_WaterConsumption
|
||||
}
|
||||
Text item=TumbleDryer_State label="Tumble Dryer [%s]" icon="dryer" {
|
||||
|
@ -519,7 +519,7 @@ sitemap miele label="Miele" {
|
|||
Text itemDishwasher_Phase visibility=[Dishwasher_Phase!=UNDEF]
|
||||
Text item=Dishwasher_ElapsedTime
|
||||
Text item=Dishwasher_FinishTime
|
||||
Text item=Dishwasher_PowerConsumption
|
||||
Text item=Dishwasher_EnergyConsumption
|
||||
Text item=Dishwasher_WaterConsumption
|
||||
}
|
||||
Text item=Fridge_CurrentTemperature label="Fridge" icon="climate" {
|
||||
|
|
|
@ -38,12 +38,10 @@ You can reach it via [https://pushover.net/apps/clone/openHAB](https://pushover.
|
|||
| `title` | text | The default title of a message (default: `openHAB`). |
|
||||
| `format` | text | The default format (`none`, `html` or `monospace`) of a message (default: `none`). |
|
||||
| `sound` | text | The notification sound on target device (default: `default`) (see [supported notification sounds](https://pushover.net/api#sounds)). This list will be populated dynamically during runtime with 21 different sounds plus user-defined [custom sounds](https://blog.pushover.net/posts/2021/3/custom-sounds). |
|
||||
| `retry` | integer | The retry parameter specifies how often (in seconds) the Pushover servers will send the same notification to the user (default: `300`). **advanced** |
|
||||
| `expire` | integer | The expire parameter specifies how long (in seconds) your notification will continue to be retried (default: `3600`). **advanced** |
|
||||
| `retry` | integer | The retry parameter specifies how often (in seconds) the Pushover servers will send the same emergency-priority notification to the user (default: `300`). **advanced** |
|
||||
| `expire` | integer | The expire parameter specifies how long (in seconds) your emergency-priority notification will continue to be retried (default: `3600`). **advanced** |
|
||||
| `timeout` | integer | The timeout parameter specifies maximum number of seconds a request to Pushover can take. **advanced** |
|
||||
|
||||
The `retry` and `expire` parameters are only used for emergency-priority notifications.
|
||||
|
||||
## Channels
|
||||
|
||||
Currently the binding does not support any Channels.
|
||||
|
@ -71,13 +69,13 @@ One has to pass a `null` value if it should be skipped or the default value for
|
|||
|
||||
- `sendMessageToDevice(String device, String message, @Nullable String title)` - This method is used to send a message to a specific device. Parameter `device` **mandatory** is the name of a specific device (multiple devices may be separated by a comma).
|
||||
|
||||
The `sendPriorityMessage` action returns a `String` value (the `receipt`) if the message was sent successfully, otherwise `null`.
|
||||
- `sendPriorityMessage(String message, @Nullable String title, @Nullable Integer priority)` - This method is used to send a priority message.
|
||||
Parameter `priority` is the priority to be used (`-2` = lowest priority, `-1` = low priority, `0` = normal priority, `1` = high priority, `2` = emergency priority; default: `2`).
|
||||
For priority `2` only, the action returns a `String` value (the `receipt`) if the message was sent successfully, otherwise `null`.
|
||||
For other priorities, the action always returns an empty `String`.
|
||||
|
||||
- `sendPriorityMessage(String message, @Nullable String title, @Nullable Integer priority)` - This method is used to send a priority message. Parameter `priority` is the priority (`-2`, `-1`, `0`, `1`, `2`) to be used (default: `2`).
|
||||
|
||||
The `cancelPriorityMessage` returns a `Boolean` value to indicate if the message was cancelled successfully or not.
|
||||
|
||||
- `cancelPriorityMessage(String receipt)` - This method is used to cancel a priority message.
|
||||
- `cancelPriorityMessage(String receipt)` - This method is used to cancel an emergency priority message.
|
||||
The action returns a `Boolean` value to indicate if the message was cancelled successfully or not.
|
||||
|
||||
## Full Example
|
||||
|
||||
|
|
|
@ -24,6 +24,10 @@
|
|||
<label>Electricity Tax</label>
|
||||
<description>Current electricity tax in DKK per kWh.</description>
|
||||
</channel>
|
||||
<channel id="reduced-electricity-tax" typeId="datahub-price">
|
||||
<label>Reduced Electricity Tax</label>
|
||||
<description>Current reduced electricity tax in DKK per kWh. For electric heating customers only.</description>
|
||||
</channel>
|
||||
<channel id="transmission-net-tariff" typeId="datahub-price">
|
||||
<label>Transmission Net Tariff</label>
|
||||
<description>Current transmission net tariff in DKK per kWh.</description>
|
||||
|
|
|
@ -13,6 +13,10 @@
|
|||
<channel-group id="electricity" typeId="electricity"/>
|
||||
</channel-groups>
|
||||
|
||||
<properties>
|
||||
<property name="thingTypeVersion">1</property>
|
||||
</properties>
|
||||
|
||||
<config-description-ref uri="thing-type:energidataservice:service"/>
|
||||
</thing-type>
|
||||
|
||||
|
|
|
@ -224,10 +224,10 @@
|
|||
<state readOnly="true"></state>
|
||||
</channel-type>
|
||||
|
||||
<channel-type id="powerConsumption">
|
||||
<channel-type id="energy-consumption">
|
||||
<item-type>Number:Energy</item-type>
|
||||
<label>Power Consumption</label>
|
||||
<description>Power consumption by the currently running program on the appliance</description>
|
||||
<label>Energy Consumption</label>
|
||||
<description>Energy consumption by the currently running program on the appliance</description>
|
||||
<category>Energy</category>
|
||||
<tags>
|
||||
<tag>Measurement</tag>
|
||||
|
@ -236,7 +236,7 @@
|
|||
<state readOnly="true" pattern="%.1f %unit%"/>
|
||||
</channel-type>
|
||||
|
||||
<channel-type id="waterConsumption">
|
||||
<channel-type id="water-consumption">
|
||||
<item-type>Number:Volume</item-type>
|
||||
<label>Water Consumption</label>
|
||||
<description>Water consumption by the currently running program on the appliance</description>
|
||||
|
@ -245,7 +245,7 @@
|
|||
<tag>Measurement</tag>
|
||||
<tag>Water</tag>
|
||||
</tags>
|
||||
<state readOnly="true" pattern="%.1f %unit%"/>
|
||||
<state readOnly="true" pattern="%.1f l"/>
|
||||
</channel-type>
|
||||
|
||||
</thing:thing-descriptions>
|
||||
|
|
|
@ -27,10 +27,14 @@
|
|||
<channel id="finish" typeId="finish"/>
|
||||
<channel id="door" typeId="door"/>
|
||||
<channel id="switch" typeId="switch"/>
|
||||
<channel id="powerConsumption" typeId="powerConsumption"/>
|
||||
<channel id="waterConsumption" typeId="waterConsumption"/>
|
||||
<channel id="energyConsumption" typeId="energy-consumption"/>
|
||||
<channel id="waterConsumption" typeId="water-consumption"/>
|
||||
</channels>
|
||||
|
||||
<properties>
|
||||
<property name="thingTypeVersion">1</property>
|
||||
</properties>
|
||||
|
||||
<representation-property>uid</representation-property>
|
||||
|
||||
<config-description-ref uri="thing-type:miele:appliance"/>
|
||||
|
|
|
@ -33,10 +33,14 @@
|
|||
<description>Temperature of the selected program (10 °C = cold)</description>
|
||||
</channel>
|
||||
<channel id="spinningspeed" typeId="spinningspeed"/>
|
||||
<channel id="powerConsumption" typeId="powerConsumption"/>
|
||||
<channel id="waterConsumption" typeId="waterConsumption"/>
|
||||
<channel id="energyConsumption" typeId="energy-consumption"/>
|
||||
<channel id="waterConsumption" typeId="water-consumption"/>
|
||||
</channels>
|
||||
|
||||
<properties>
|
||||
<property name="thingTypeVersion">1</property>
|
||||
</properties>
|
||||
|
||||
<representation-property>uid</representation-property>
|
||||
|
||||
<config-description-ref uri="thing-type:miele:appliance"/>
|
||||
|
|
Loading…
Reference in New Issue