demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 07:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge c54d85ac1a into adacdebb9f

Browse Source
This commit is contained in:
tl-photography 2025-01-08 23:15:24 +01:00 committed by GitHub
commit ffd3608ab3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.binding.awattar/README.md
View File

@ -36,6 +36,7 @@ Auto discovery is not supported.
| basePrice | The net(!) base price you have to pay for every kWh. Optional, but you most probably want to set it based on you delivery contract. |
| timeZone | The time zone the hour definitions of the things below refer to. Default is `CET`, as it corresponds to the aWATTar API. It is strongly recommended not to change this. However, if you do so, be aware that the prices delivered by the API will not cover a whole calendar day in this timezone. **Advanced** |
| country | The country prices should be received for. Use `DE` for Germany or `AT` for Austria. `DE` is the default. |
| serviceFee | The service fee in percent. Will be added to the total price. Will be calculated on top of the absolute price per hour. Default is `0`. |
### Prices Thing
@ -108,7 +109,7 @@ All prices are available in each of the following channel groups:
awattar.things:
```java
Bridge awattar:bridge:bridge1 "aWATTar Bridge" [ country="DE", vatPercent="19", basePrice="17.22"] {
Bridge awattar:bridge:bridge1 "aWATTar Bridge" [ country="DE", vatPercent="19", basePrice="17.22", serviceFee="3" ] {
Thing prices price1 "aWATTar Price" []
// The car should be loaded for 4 hours during the night
Thing bestprice carloader "Car Loader" [ rangeStart="22", rangeDuration="8", length="4", consecutive="true" ]

1
bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarBridgeConfiguration.java
View File

@ -23,5 +23,6 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
public class AwattarBridgeConfiguration {
public double basePrice;
public double vatPercent;
public double serviceFee;
public String country = "";
}

4
bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarPrice.java
View File

@ -23,8 +23,8 @@ import org.openhab.binding.awattar.internal.handler.TimeRange;
*
* @param netPrice the net price in €/kWh
* @param grossPrice the gross price in €/kWh
* @param netTotal the net total price in €
* @param grossTotal the gross total price in €
* @param netTotal the net total price in €/kWh
* @param grossTotal the gross total price in €/kWh
* @param timerange the time range of the price
*/
@NonNullByDefault

8
bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/api/AwattarApi.java
View File

@ -57,6 +57,7 @@ public class AwattarApi {
private double vatFactor;
private double basePrice;
private double serviceFee;
private ZoneId zone;
@ -87,6 +88,7 @@ public class AwattarApi {
vatFactor = 1 + (config.vatPercent / 100);
basePrice = config.basePrice;
serviceFee = config.serviceFee;
if (config.country.equals("DE")) {
this.url = URL_DE;
@ -141,6 +143,12 @@ public class AwattarApi {
double netMarket = d.marketprice / 10.0;
double grossMarket = netMarket * vatFactor;
double netTotal = netMarket + basePrice;
// add service fee for the aWATTar service (Ausgleichskomponente)
if (serviceFee > 0) {
netTotal += Math.abs(netTotal) * (serviceFee / 100);
}
double grossTotal = netTotal * vatFactor;
result.add(new AwattarPrice(netMarket, grossMarket, netTotal, grossTotal,

5
bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/config/config.xml
View File

@ -24,6 +24,11 @@
<description>Specifies the net base price per kWh</description>
<default>0</default>
</parameter>
<parameter name="serviceFee" type="decimal" min="0" max="100">
<label>Service Fee</label>
<description>Specifies the service fee in percent.</description>
<default>0</default>
</parameter>
</config-description>
<config-description uri="thing-type:awattar:bestprice">

2
bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar.properties
View File

@ -12,6 +12,8 @@ bridge-type.config.awattar.bridge.basePrice.label = Base price
bridge-type.config.awattar.bridge.basePrice.description = Specifies the net base price per kWh
bridge-type.config.awattar.bridge.timeZone.label = Time zone
bridge-type.config.awattar.bridge.timeZone.description = Time zone to apply to the hour definitions. Default CET aligns to the aWATTar API
bridge-type.config.awattar.bridge.serviceFee.label = Service fee
bridge-type.config.awattar.bridge.serviceFee.description = Specifies the service fee in percent
# thing types
thing-type.awattar.prices.label = aWATTar Hourly Prices

1
bundles/org.openhab.binding.awattar/src/test/java/org/openhab/binding/awattar/internal/api/AwattarApiTest.java
View File

@ -90,6 +90,7 @@ class AwattarApiTest extends JavaTest {
config.basePrice = 0.0;
config.vatPercent = 0.0;
config.serviceFee = 0.0;
config.country = "DE";
api = new AwattarApi(httpClientMock, ZoneId.of("GMT+2"), config);