From 9d2c67c6993758a4d2b3fdc71a9e158463af29ef Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 20:56:29 +0200
Subject: [PATCH 01/36] Initial implementation of the FENECON Binding

- Binding for FENECON via REST-API access implemented
- Documentation for FENECON added
- The implementation Closes #17173

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/NOTICE    |  13 +
 bundles/org.openhab.binding.fenecon/README.md | 145 ++++
 bundles/org.openhab.binding.fenecon/pom.xml   |  26 +
 .../src/main/feature/feature.xml              |   9 +
 .../internal/FeneconBindingConstants.java     |  31 +
 .../internal/FeneconConfiguration.java        |  32 +
 .../fenecon/internal/FeneconHandler.java      | 232 ++++++
 .../internal/FeneconHandlerFactory.java       |  55 ++
 .../src/main/resources/OH-INF/addon/addon.xml |  10 +
 .../resources/OH-INF/i18n/fenecon.properties  |   3 +
 .../resources/OH-INF/thing/thing-types.xml    | 144 ++++
 bundles/pom.xml                               | 706 +++++++++++++++++-
 12 files changed, 1393 insertions(+), 13 deletions(-)
 create mode 100644 bundles/org.openhab.binding.fenecon/NOTICE
 create mode 100644 bundles/org.openhab.binding.fenecon/README.md
 create mode 100644 bundles/org.openhab.binding.fenecon/pom.xml
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/feature/feature.xml
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml

diff --git a/bundles/org.openhab.binding.fenecon/NOTICE b/bundles/org.openhab.binding.fenecon/NOTICE
new file mode 100644
index 0000000000000..38d625e349232
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/NOTICE
@@ -0,0 +1,13 @@
+This content is produced and maintained by the openHAB project.
+
+* Project home: https://www.openhab.org
+
+== Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License 2.0 which is available at
+https://www.eclipse.org/legal/epl-2.0/.
+
+== Source Code
+
+https://github.com/openhab/openhab-addons
diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
new file mode 100644
index 0000000000000..b2c92002f9cc4
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -0,0 +1,145 @@
+# FENECON Binding
+
+The FENECON Binding integrates the [FENECON energy storage system](https://fenecon.de/) device into the openHAB system via [REST-API](https://docs.fenecon.de/_/de/fems/fems-app/OEM_App_REST_JSON.html).
+
+With the binding, it is possible to request status information from FENECON Home to allow you home automation decisions based on the current energy management.
+
+This makes it possible, for example, to switch on other consumers such as the dishwasher or washing machine in the case of power overproduction.
+
+## Supported Things
+
+Only one Thing is supported: The `fenecon` device.
+
+This Binding was tested with an [FENECON HOME 10](https://fenecon.de/fenecon-home-10/) device.
+
+## Discovery
+
+Auto-discovery is not supported.
+
+## Thing Configuration
+
+The FENECON Thing only needs to be configured with the `hostname`, all other parameters are optional and prefilled with the suitable default values:
+
+| Parameter       | Description                                                                      |
+|-----------------|----------------------------------------------------------------------------------|
+| hostname        | Hostname or IP address of the FENECON device, e.g. 192.168.1.11                  |
+| password        | Password of the FENECON device. The password for guest access is set by default. |
+| port            | Port of the FENECON device. Default: 8084                                        |
+| refreshInterval | Interval the device is polled in sec. Default 30 seconds                         |
+
+
+## Channels
+
+The FENECON binding currently only provides access to read out the values from the energy storage system. 
+
+| Channel                | Type                 | Read/Write | Description                                                                 |
+|------------------------|----------------------|------------|-----------------------------------------------------------------------------|
+| state                  | String               | R          | FENECON system state: Ok, Info, Warning or Fault                            |
+| lastUpdate             | DateTime             | R          | Last successful update via REST-API from the FENECON system                 |
+| essSoc                 | Number:Dimensionless | R          | Battery state of charge in percent                                          |
+| chargerPower           | Number:Power         | R          | Current charger power of energy storage system in watt.                     |
+| dischargerPower        | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
+| emergencyPowerMode     | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
+| productionActivePower  | Number:Power         | R          | Current active power producer load in watt.                                 |
+| sellToGridPower        | Number:Power         | R          | Current sell to grid exchange power in watt.                                |
+| sellToGridEnergy       | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
+| consumptionActivePower | Number:Power         | R          | Current active power consumer load in watt.                                 |
+| buyFromGridPower       | Number:Power         | R          | Current buy from grid exchange power in watt.                               |
+| buyFromGridEnergy      | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
+
+
+## Full Example
+
+### fenecon.things
+
+```java
+Thing fenecon:fenecon:1 "FENECON Home" [hostname="192.168.1.11", refreshInterval=5]
+```
+### demo.items
+
+```java
+// Sitemap Items
+Group   Home                    "MyHome"              <house>                                 ["Indoor"]
+Group   GF                      "GroundFloor"         <groundfloor>          (Home)           ["GroundFloor"]
+// Utility room
+Group   GF_UtilityRoom          "Utility room"        <energy>               (Home, GF)       ["Room"]
+Group   GF_UtilityRoomSolar     "Utility room solar"  <solarplant>           (GF_UtilityRoom) ["Inverter"]
+
+// FENECON items
+String               EssState               <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:fenecon:1:state"}
+DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:fenecon:1:lastUpdate"}
+Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:fenecon:1:essSoc"}
+Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:chargerPower"}
+Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:dischargerPower"}
+Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:fenecon:1:emergencyPowerMode"}
+
+Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:productionActivePower"}
+Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:sellToGridPower"}
+Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:sellToGridEnergy"}
+
+Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:consumptionActivePower"}
+Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:buyFromGridPower"}
+Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:buyFromGridEnergy"}
+
+// Examples of items for calculating the energy purchased and sold. Look at the demo.rules section. 
+Number:Currency      SoldEnergy "Total sold energy [%.2f €]"           <price> (GF_UtilityRoomSolar)
+Number:Currency      PurchasedEnergy "Total purchased energy [%.2f €]" <price> (GF_UtilityRoomSolar)
+
+
+```
+
+### demo.sitemap
+
+```perl
+sitemap demo label="FENECON Example Sitemap" {
+    Frame label="Groundfloor" icon="groundfloor" {
+        Group item=GF_UtilityRoom
+    }
+}
+```
+
+### demo.rules
+
+```java
+rule "Blackout detection"
+when
+  Item EmergencyPowerMode changed to ON
+then
+    val msg = "🚨 Power blackout detected, emergency power mode running." 
+    logInfo("PowerBlackout", msg)
+    sendBroadcastNotification(msg)
+end
+
+rule "Battery 100 percent"
+when
+  Item EssSoc changed
+then
+    var batteryState = (EssSoc.getState() as Number).intValue()
+    if(batteryState == 100){
+        val msg = "🔋 Full battery, consumers can be activated."
+        logInfo("FullBattery", msg)
+        sendBroadcastNotification(msg)
+    }
+end
+
+rule "Calculation sold energy"
+when
+  Item TotalSellEnergy changed
+then
+    val sellingPricePerKiloWattHour = 0.07 // €
+    var current = (TotalSellEnergy.getState() as Number).intValue()
+    var result = current * sellingPricePerKiloWattHour;
+    SoldEnergy.postUpdate(result)
+end
+
+rule "Calculation purchased energy"
+when
+  Item TotalBuyEnergy changed
+then
+    val purchasedPricePerKiloWattHour = 0.32 // €
+    var current = (TotalBuyEnergy.getState() as Number).intValue()
+    var result = current * purchasedPricePerKiloWattHour;
+    PurchasedEnergy.postUpdate(result)
+end
+```
+
diff --git a/bundles/org.openhab.binding.fenecon/pom.xml b/bundles/org.openhab.binding.fenecon/pom.xml
new file mode 100644
index 0000000000000..c885f25aed718
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.openhab.addons.bundles</groupId>
+    <artifactId>org.openhab.addons.reactor.bundles</artifactId>
+    <version>4.3.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.openhab.binding.fenecon</artifactId>
+
+  <name>openHAB Add-ons :: Bundles :: FENECON Binding</name>
+
+  <!--
+    <dependencies>
+    <dependency>
+    <groupId>org.json</groupId>
+    <artifactId>json</artifactId>
+    <version>20240303</version>
+    <scope>compile</scope>
+    </dependency>
+    </dependencies> -->
+</project>
diff --git a/bundles/org.openhab.binding.fenecon/src/main/feature/feature.xml b/bundles/org.openhab.binding.fenecon/src/main/feature/feature.xml
new file mode 100644
index 0000000000000..fc124c77f4110
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/feature/feature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="org.openhab.binding.fenecon-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
+
+	<feature name="openhab-binding-fenecon" description="FENECON Binding" version="${project.version}">
+		<feature>openhab-runtime-base</feature>
+		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.fenecon/${project.version}</bundle>
+	</feature>
+</features>
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
new file mode 100644
index 0000000000000..4215d79f6bec4
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.thing.ThingTypeUID;
+
+/**
+ * The {@link FeneconBindingConstants} class defines common constants, which are
+ * used across the whole binding.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class FeneconBindingConstants {
+
+    private static final String BINDING_ID = "fenecon";
+
+    // List of all Thing Type UIDs
+    public static final ThingTypeUID THING_TYPE_SAMPLE = new ThingTypeUID(BINDING_ID, "fenecon");
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java
new file mode 100644
index 0000000000000..15769a56aa510
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link FeneconConfiguration} class contains fields mapping thing configuration parameters.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class FeneconConfiguration {
+
+    /**
+     * Sample configuration parameters. Replace with your own.
+     */
+    public String hostname = "";
+    public String password = "user";
+    public int port = 8084;
+    public int refreshInterval = 30;
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
new file mode 100644
index 0000000000000..623da4f6c4078
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -0,0 +1,232 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.Builder;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.List;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.unit.Units;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+
+/**
+ * The {@link FeneconHandler} is responsible for handling commands, which are
+ * sent to one of the channels.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class FeneconHandler extends BaseThingHandler {
+
+    private final Logger logger = LoggerFactory.getLogger(FeneconHandler.class);
+
+    private @Nullable FeneconConfiguration config;
+    private @Nullable ScheduledFuture<?> pollingJob;
+
+    private final List<String> channels = List.of("GridMode", "State", "EssSoc", "ConsumptionActivePower",
+            "ProductionActivePower", "GridActivePower", "EssDischargePower", "GridBuyActiveEnergy",
+            "GridSellActiveEnergy");
+
+    private final HttpClient httpClient;
+    private @Nullable Builder baseHttpRequest;
+
+    public FeneconHandler(Thing thing) {
+        super(thing);
+        httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
+    }
+
+    @Override
+    public void initialize() {
+        config = getConfigAs(FeneconConfiguration.class);
+
+        logger.info("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(),
+                config.refreshInterval);
+
+        updateStatus(ThingStatus.UNKNOWN);
+
+        baseHttpRequest = createBaseHttpRequest();
+        pollingJob = scheduler.scheduleWithFixedDelay(this::pollingCode, 5, config.refreshInterval, TimeUnit.SECONDS);
+    }
+
+    private static final String getBasicAuthHeader(String username, String password) {
+        String valueToEncode = username + ":" + password;
+        return "Basic " + Base64.getEncoder().encodeToString(valueToEncode.getBytes());
+    }
+
+    private String getBaseUrl() {
+        return "http://" + config.hostname + ":" + config.port + "/";
+    }
+
+    private Builder createBaseHttpRequest() {
+        String basicAuth = getBasicAuthHeader("x", config.password);
+        return HttpRequest.newBuilder().timeout(Duration.ofSeconds(5)).header("Authorization", basicAuth)
+                .header("Content-Type", "application/json").GET();
+    }
+
+    private void pollingCode() {
+        for (String eachChannel : channels) {
+            try {
+
+                HttpRequest request = baseHttpRequest.uri(new URI(getBaseUrl() + "rest/channel/_sum/" + eachChannel))
+                        .build();
+                logger.trace("FENECON - request: {}", request);
+
+                HttpResponse<String> response = httpClient.send(request, BodyHandlers.ofString());
+                logger.trace("FENECON - response status code: {} body: {}", response.statusCode(), response.body());
+
+                if (response.statusCode() > 300) {
+                    // Authentication error
+                    if (response.statusCode() == 401) {
+                        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
+                                parseFeneconError(response));
+                        return;
+                    } else {
+                        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
+                                "http status code: " + response.statusCode());
+                        return;
+                    }
+                } else {
+                    processDataPoint(JsonParser.parseString(response.body()).getAsJsonObject());
+                    updateStatus(ThingStatus.ONLINE);
+                }
+
+            } catch (URISyntaxException | JsonSyntaxException | IOException | InterruptedException err) {
+                logger.trace("FENECON - connection problem on FENECON channel {}", eachChannel, err);
+                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR, err.getMessage());
+                return;
+            }
+        }
+
+        // Set last successful update cycle
+        updateState("lastUpdate", new DateTimeType());
+    }
+
+    private void processDataPoint(JsonObject response) {
+        // Example: {"address":"_sum/EssSoc","type":"INTEGER","accessMode":"RO","text":"Range
+        // 0..100","unit":"%","value":99}
+        String address = response.get("address").getAsString();
+        String text = response.get("text").getAsString();
+        String value = response.get("value").getAsString();
+
+        switch (address) {
+            case "_sum/State":
+                // {"address":"_sum/State","type":"INTEGER","accessMode":"RO","text":"0:Ok, 1:Info, 2:Warning,
+                // 3:Fault","unit":"","value":0}
+                int begin = text.indexOf(value + ":");
+                int end = text.indexOf(",", begin);
+                updateState("state", new StringType(text.substring(begin + 2, end)));
+                break;
+            case "_sum/EssSoc":
+                updateState("essSoc", new QuantityType<>(Integer.valueOf(value), Units.PERCENT));
+                break;
+            case "_sum/ConsumptionActivePower":
+                updateState("consumptionActivePower", new QuantityType<>(Integer.valueOf(value), Units.WATT));
+                break;
+            case "_sum/ProductionActivePower":
+                updateState("productionActivePower", new QuantityType<>(Integer.valueOf(value), Units.WATT));
+                break;
+            case "_sum/GridActivePower":
+                // Grid exchange power. Negative values for sell-to-grid; positive for buy-from-grid"
+                Integer gridValue = Integer.valueOf(value);
+                int selltoGridPower = 0;
+                int buyFromGridPower = 0;
+                if (gridValue < 0) {
+                    selltoGridPower = gridValue * -1;
+                } else {
+                    buyFromGridPower = gridValue;
+                }
+                updateState("sellToGridPower", new QuantityType<>(selltoGridPower, Units.WATT));
+                updateState("buyFromGridPower", new QuantityType<>(buyFromGridPower, Units.WATT));
+                break;
+            case "_sum/EssDischargePower":
+                // Actual AC-side battery discharge power of Energy Storage System.
+                // Negative values for charge; positive for discharge
+                Integer powerValue = Integer.valueOf(value);
+                int chargerPower = 0;
+                int dischargerPower = 0;
+                if (powerValue < 0) {
+                    chargerPower = powerValue * -1;
+                } else {
+                    dischargerPower = powerValue;
+                }
+                updateState("chargerPower", new QuantityType<>(chargerPower, Units.WATT));
+                updateState("dischargerPower", new QuantityType<>(dischargerPower, Units.WATT));
+                break;
+            case "_sum/GridMode":
+                // text":"1:On-Grid, 2:Off-Grid","unit":"","value":1
+                Integer gridMod = Integer.valueOf(value);
+                updateState("emergencyPowerMode", gridMod == 2 ? OnOffType.ON : OnOffType.OFF);
+                break;
+            case "_sum/GridSellActiveEnergy":
+                // {"address":"_sum/GridSellActiveEnergy","type":"LONG","accessMode":"RO","text":"","unit":"Wh_Σ","value":374242}
+                updateState("sellToGridEnergy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
+                break;
+            case "_sum/GridBuyActiveEnergy":
+                // "address":"_sum/GridBuyActiveEnergy","type":"LONG","accessMode":"RO","text":"","unit":"Wh_Σ","value":1105}
+                updateState("buyFromGridEnergy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
+                break;
+        }
+    }
+
+    private String parseFeneconError(HttpResponse<String> response) {
+        // Example error Response
+        // {"jsonrpc":"2.0","id":"00000000-0000-0000-0000-000000000000","error":{"code":1003,"message":"Authentication
+        // failed","data":[]}}
+        JsonObject jsonObject = JsonParser.parseString(response.body()).getAsJsonObject();
+        return jsonObject.getAsJsonObject("error").get("message").getAsString();
+    }
+
+    @Override
+    public void dispose() {
+        ScheduledFuture<?> job = pollingJob;
+        if (job != null) {
+            job.cancel(true);
+            pollingJob = null;
+        }
+    }
+
+    @Override
+    public void handleCommand(ChannelUID channelUID, Command command) {
+        if (command == RefreshType.REFRESH) {
+            // Noop
+        }
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
new file mode 100644
index 0000000000000..762c272ddae5e
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal;
+
+import static org.openhab.binding.fenecon.internal.FeneconBindingConstants.THING_TYPE_SAMPLE;
+
+import java.util.Set;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * The {@link FeneconHandlerFactory} is responsible for creating things and thing
+ * handlers.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+@Component(configurationPid = "binding.fenecon", service = ThingHandlerFactory.class)
+public class FeneconHandlerFactory extends BaseThingHandlerFactory {
+
+    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_SAMPLE);
+
+    @Override
+    public boolean supportsThingType(ThingTypeUID thingTypeUID) {
+        return SUPPORTED_THING_TYPES_UIDS.contains(thingTypeUID);
+    }
+
+    @Override
+    protected @Nullable ThingHandler createHandler(Thing thing) {
+        ThingTypeUID thingTypeUID = thing.getThingTypeUID();
+
+        if (THING_TYPE_SAMPLE.equals(thingTypeUID)) {
+            return new FeneconHandler(thing);
+        }
+
+        return null;
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml
new file mode 100644
index 0000000000000..4e394f9d42fe8
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon:addon id="fenecon" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:addon="https://openhab.org/schemas/addon/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
+
+	<type>binding</type>
+	<name>FENECON Home Binding</name>
+	<description>This is the binding for FENECON Home.</description>
+
+</addon:addon>
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
new file mode 100644
index 0000000000000..0c2f44015a92d
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
@@ -0,0 +1,3 @@
+# FIXME: please add all English translations to this file so the texts can be translated using Crowdin
+# FIXME: to generate the content of this file run: mvn i18n:generate-default-translations
+# FIXME: see also: https://www.openhab.org/docs/developer/utils/i18n.html
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
new file mode 100644
index 0000000000000..a5c885f736474
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="fenecon"
+	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">
+
+	<!-- Sample Thing Type -->
+	<thing-type id="fenecon">
+
+		<label>FENECON Home</label>
+		<description>Thing for FENECON Home Device</description>
+		<category>Solarplant</category>
+
+		<channels>
+			<channel id="state" typeId="state"/>
+			<channel id="lastUpdate" typeId="lastUpdate"/>
+			<channel id="essSoc" typeId="essSoc"/>
+			<channel id="chargerPower" typeId="chargerPower"/>
+			<channel id="dischargerPower" typeId="dischargerPower"/>
+			<channel id="emergencyPowerMode" typeId="emergencyPowerMode"/>
+			<channel id="consumptionActivePower" typeId="consumptionActivePower"/>
+			<channel id="productionActivePower" typeId="productionActivePower"/>
+			<channel id="sellToGridPower" typeId="sellToGridPower"/>
+			<channel id="sellToGridEnergy" typeId="sellToGridEnergy"/>
+			<channel id="buyFromGridPower" typeId="buyFromGridPower"/>
+			<channel id="buyFromGridEnergy" typeId="buyFromGridEnergy"/>
+		</channels>
+
+		<config-description>
+			<parameter name="hostname" type="text" required="true">
+				<context>network-address</context>
+				<label>Hostname</label>
+				<description>Hostname or IP address of the FENECON device, e.g. 192.168.1.11</description>
+			</parameter>
+			<parameter name="password" type="text">
+				<context>password</context>
+				<label>Password</label>
+				<default>user</default>
+				<description>Password to access the device. The password for guest access is set by default.</description>
+				<advanced>true</advanced>
+			</parameter>
+			<parameter name="port" type="integer" min="1">
+				<context>network-address</context>
+				<label>Port</label>
+				<description>Port of the FENECON device</description>
+				<default>8084</default>
+				<advanced>true</advanced>
+			</parameter>
+			<parameter name="refreshInterval" type="integer" unit="s" min="1">
+				<label>Refresh Interval</label>
+				<description>Interval the device is polled in sec.</description>
+				<default>30</default>
+				<advanced>true</advanced>
+			</parameter>
+		</config-description>
+	</thing-type>
+
+	<!-- Channel Types -->
+	<channel-type id="state">
+		<item-type>String</item-type>
+		<label>System State</label><!-- Use uppercase words, except prepositions. 2-3 words, max 25 chars -->
+		<description>FENECON system state: Ok, Info, Warning or Fault</description>
+		<category>Text</category>
+		<state readOnly="true" pattern="%s"/>
+	</channel-type>
+	<channel-type id="lastUpdate">
+		<item-type>DateTime</item-type>
+		<label>Last Update</label>
+		<description>Last successful update via REST-API from the FENECON system</description>
+		<category>Time</category>
+		<state readOnly="true"></state>
+	</channel-type>
+	<channel-type id="essSoc">
+		<item-type>Number:Dimensionless</item-type>
+		<label>Battery State</label>
+		<description>Battery state of charge in percent</description>
+		<category>BatteryLevel</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="chargerPower">
+		<item-type>Number:Power</item-type>
+		<label>Charger Power</label>
+		<description>Current charger power of energy storage system in watt.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="dischargerPower">
+		<item-type>Number:Power</item-type>
+		<label>Discharger Power</label>
+		<description>Current discharger power of energy storage system in watt.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="emergencyPowerMode">
+		<item-type>Switch</item-type>
+		<label>Emergency Power Mode</label>
+		<description>Indicates if there is grid power is off and the emergency power mode is on.</description>
+		<category>Switch</category>
+		<state readOnly="true"/>
+	</channel-type>
+	<channel-type id="productionActivePower">
+		<item-type>Number:Power</item-type>
+		<label>Producer Power</label>
+		<description>Current active power producer load in watt.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="sellToGridPower">
+		<item-type>Number:Power</item-type>
+		<label>Sell Grid Power</label>
+		<description>Current sell to grid exchange power in watt.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="sellToGridEnergy">
+		<item-type>Number:Energy</item-type>
+		<label>Sell Grid Energy</label>
+		<description>Total energy exported to the grid in watt per hour.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="consumptionActivePower">
+		<item-type>Number:Power</item-type>
+		<label>Consumer Power</label>
+		<description>Current active power consumer load in watt.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="buyFromGridPower">
+		<item-type>Number:Power</item-type>
+		<label>Buy Grid Power</label>
+		<description>Current buy from grid exchange power in watt.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="buyFromGridEnergy">
+		<item-type>Number:Energy</item-type>
+		<label>Buy Grid Energy</label>
+		<description>Total energy imported from the grid in watt per hour.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+
+</thing:thing-descriptions>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 1f26e09f2c2d3..4158c249b479e 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -1,705 +1,1385 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    
   <modelVersion>4.0.0</modelVersion>
-
+    
   <parent>
+        
     <groupId>org.openhab.addons</groupId>
+        
     <artifactId>org.openhab.addons.reactor</artifactId>
+        
     <version>4.3.0-SNAPSHOT</version>
+      
   </parent>
-
+    
   <groupId>org.openhab.addons.bundles</groupId>
+    
   <artifactId>org.openhab.addons.reactor.bundles</artifactId>
+    
   <packaging>pom</packaging>
-
+    
   <name>openHAB Add-ons :: Bundles</name>
-
+    
   <modules>
+        
     <!-- automation -->
+        
     <module>org.openhab.automation.groovyscripting</module>
+        
     <module>org.openhab.automation.jrubyscripting</module>
+        
     <module>org.openhab.automation.jsscripting</module>
+        
     <module>org.openhab.automation.jsscriptingnashorn</module>
+        
     <module>org.openhab.automation.jythonscripting</module>
+        
     <module>org.openhab.automation.pidcontroller</module>
+        
     <module>org.openhab.automation.pwm</module>
+        
     <!-- io -->
+        
     <module>org.openhab.io.homekit</module>
+        
     <module>org.openhab.io.hueemulation</module>
+        
     <module>org.openhab.io.metrics</module>
+        
     <module>org.openhab.io.neeo</module>
+        
     <module>org.openhab.io.openhabcloud</module>
+        
     <!-- transformations -->
+        
     <module>org.openhab.transform.basicprofiles</module>
+        
     <module>org.openhab.transform.bin2json</module>
+        
     <module>org.openhab.transform.exec</module>
+        
     <module>org.openhab.transform.jinja</module>
+        
     <module>org.openhab.transform.jsonpath</module>
+        
     <module>org.openhab.transform.map</module>
+        
     <module>org.openhab.transform.regex</module>
+        
     <module>org.openhab.transform.rollershutterposition</module>
+        
     <module>org.openhab.transform.scale</module>
+        
     <module>org.openhab.transform.vat</module>
+        
     <module>org.openhab.transform.xpath</module>
+        
     <module>org.openhab.transform.xslt</module>
+        
     <!-- bindings -->
+        
     <module>org.openhab.binding.adorne</module>
+        
     <module>org.openhab.binding.ahawastecollection</module>
+        
     <module>org.openhab.binding.airgradient</module>
+        
     <module>org.openhab.binding.airq</module>
+        
     <module>org.openhab.binding.airquality</module>
+        
     <module>org.openhab.binding.airvisualnode</module>
+        
     <module>org.openhab.binding.alarmdecoder</module>
+        
     <module>org.openhab.binding.allplay</module>
+        
     <module>org.openhab.binding.amazondashbutton</module>
+        
     <module>org.openhab.binding.amazonechocontrol</module>
+        
     <module>org.openhab.binding.amberelectric</module>
+        
     <module>org.openhab.binding.ambientweather</module>
+        
     <module>org.openhab.binding.amplipi</module>
+        
     <module>org.openhab.binding.androiddebugbridge</module>
+        
     <module>org.openhab.binding.androidtv</module>
+        
     <module>org.openhab.binding.anel</module>
+        
     <module>org.openhab.binding.anthem</module>
+        
     <module>org.openhab.binding.argoclima</module>
+        
     <module>org.openhab.binding.astro</module>
+        
     <module>org.openhab.binding.asuswrt</module>
+        
     <module>org.openhab.binding.atlona</module>
+        
     <module>org.openhab.binding.autelis</module>
+        
     <module>org.openhab.binding.automower</module>
+        
     <module>org.openhab.binding.avmfritz</module>
+        
     <module>org.openhab.binding.awattar</module>
+        
     <module>org.openhab.binding.benqprojector</module>
+        
     <module>org.openhab.binding.bigassfan</module>
+        
     <module>org.openhab.binding.bluetooth</module>
+        
     <module>org.openhab.binding.bluetooth.airthings</module>
+        
     <module>org.openhab.binding.bluetooth.am43</module>
+        
     <module>org.openhab.binding.bluetooth.bluegiga</module>
+        
     <module>org.openhab.binding.bluetooth.bluez</module>
+        
     <module>org.openhab.binding.bluetooth.blukii</module>
+        
     <module>org.openhab.binding.bluetooth.daikinmadoka</module>
+        
     <module>org.openhab.binding.bluetooth.enoceanble</module>
+        
     <module>org.openhab.binding.bluetooth.generic</module>
+        
     <module>org.openhab.binding.bluetooth.govee</module>
+        
     <module>org.openhab.binding.bluetooth.grundfosalpha</module>
+        
     <module>org.openhab.binding.bluetooth.radoneye</module>
+        
     <module>org.openhab.binding.bluetooth.roaming</module>
+        
     <module>org.openhab.binding.bluetooth.ruuvitag</module>
+        
     <module>org.openhab.binding.bondhome</module>
+        
     <module>org.openhab.binding.boschindego</module>
+        
     <module>org.openhab.binding.boschshc</module>
+        
     <module>org.openhab.binding.bosesoundtouch</module>
+        
     <module>org.openhab.binding.broadlinkthermostat</module>
+        
     <module>org.openhab.binding.bsblan</module>
+        
     <module>org.openhab.binding.bticinosmarther</module>
+        
     <module>org.openhab.binding.buienradar</module>
+        
     <module>org.openhab.binding.caddx</module>
+        
     <module>org.openhab.binding.cbus</module>
+        
     <module>org.openhab.binding.chatgpt</module>
+        
     <module>org.openhab.binding.chromecast</module>
+        
     <module>org.openhab.binding.cm11a</module>
+        
     <module>org.openhab.binding.comfoair</module>
+        
     <module>org.openhab.binding.coolmasternet</module>
+        
     <module>org.openhab.binding.coronastats</module>
+        
     <module>org.openhab.binding.daikin</module>
+        
     <module>org.openhab.binding.dali</module>
+        
     <module>org.openhab.binding.danfossairunit</module>
+        
     <module>org.openhab.binding.dbquery</module>
+        
     <module>org.openhab.binding.deconz</module>
+        
     <module>org.openhab.binding.denonmarantz</module>
+        
     <module>org.openhab.binding.deutschebahn</module>
+        
     <module>org.openhab.binding.digiplex</module>
+        
     <module>org.openhab.binding.digitalstrom</module>
+        
     <module>org.openhab.binding.dlinksmarthome</module>
+        
     <module>org.openhab.binding.dmx</module>
+        
     <module>org.openhab.binding.dolbycp</module>
+        
     <module>org.openhab.binding.dominoswiss</module>
+        
     <module>org.openhab.binding.doorbird</module>
+        
     <module>org.openhab.binding.draytonwiser</module>
+        
     <module>org.openhab.binding.dscalarm</module>
+        
     <module>org.openhab.binding.dsmr</module>
+        
     <module>org.openhab.binding.dwdpollenflug</module>
+        
     <module>org.openhab.binding.dwdunwetter</module>
+        
     <module>org.openhab.binding.easee</module>
+        
     <module>org.openhab.binding.echonetlite</module>
+        
     <module>org.openhab.binding.ecobee</module>
+        
     <module>org.openhab.binding.ecotouch</module>
+        
     <module>org.openhab.binding.ecovacs</module>
+        
     <module>org.openhab.binding.ecowatt</module>
+        
     <module>org.openhab.binding.ekey</module>
+        
     <module>org.openhab.binding.electroluxair</module>
+        
     <module>org.openhab.binding.elerotransmitterstick</module>
+        
     <module>org.openhab.binding.elroconnects</module>
+        
     <module>org.openhab.binding.emotiva</module>
+        
     <module>org.openhab.binding.energenie</module>
+        
     <module>org.openhab.binding.energidataservice</module>
+        
     <module>org.openhab.binding.enigma2</module>
+        
     <module>org.openhab.binding.enocean</module>
+        
     <module>org.openhab.binding.enphase</module>
+        
     <module>org.openhab.binding.enturno</module>
+        
     <module>org.openhab.binding.ephemeris</module>
+        
     <module>org.openhab.binding.epsonprojector</module>
+        
     <module>org.openhab.binding.etherrain</module>
+        
     <module>org.openhab.binding.evcc</module>
+        
     <module>org.openhab.binding.evohome</module>
+        
     <module>org.openhab.binding.exec</module>
+        
     <module>org.openhab.binding.feed</module>
+        
     <module>org.openhab.binding.feican</module>
+        
     <module>org.openhab.binding.fineoffsetweatherstation</module>
+        
     <module>org.openhab.binding.flicbutton</module>
+        
     <module>org.openhab.binding.fmiweather</module>
+        
     <module>org.openhab.binding.folderwatcher</module>
+        
     <module>org.openhab.binding.folding</module>
+        
     <module>org.openhab.binding.foobot</module>
+        
     <module>org.openhab.binding.freeathome</module>
+        
     <module>org.openhab.binding.freebox</module>
+        
     <module>org.openhab.binding.freeboxos</module>
+        
     <module>org.openhab.binding.freecurrency</module>
+        
     <module>org.openhab.binding.frenchgovtenergydata</module>
+        
     <module>org.openhab.binding.fronius</module>
+        
     <module>org.openhab.binding.fsinternetradio</module>
+        
     <module>org.openhab.binding.ftpupload</module>
+        
     <module>org.openhab.binding.gardena</module>
+        
     <module>org.openhab.binding.gce</module>
+        
     <module>org.openhab.binding.generacmobilelink</module>
+        
     <module>org.openhab.binding.goecharger</module>
+        
     <module>org.openhab.binding.govee</module>
+        
     <module>org.openhab.binding.gpio</module>
+        
     <module>org.openhab.binding.globalcache</module>
+        
     <module>org.openhab.binding.gpstracker</module>
+        
     <module>org.openhab.binding.gree</module>
+        
     <module>org.openhab.binding.gridbox</module>
+        
     <module>org.openhab.binding.groheondus</module>
+        
     <module>org.openhab.binding.groupepsa</module>
+        
     <module>org.openhab.binding.growatt</module>
+        
     <module>org.openhab.binding.guntamatic</module>
+        
     <module>org.openhab.binding.haassohnpelletstove</module>
+        
     <module>org.openhab.binding.harmonyhub</module>
+        
     <module>org.openhab.binding.haywardomnilogic</module>
+        
     <module>org.openhab.binding.hccrubbishcollection</module>
+        
     <module>org.openhab.binding.hdanywhere</module>
+        
     <module>org.openhab.binding.hdpowerview</module>
+        
     <module>org.openhab.binding.helios</module>
+        
     <module>org.openhab.binding.heliosventilation</module>
+        
     <module>org.openhab.binding.heos</module>
+        
     <module>org.openhab.binding.herzborg</module>
+        
     <module>org.openhab.binding.homeconnect</module>
+        
     <module>org.openhab.binding.homematic</module>
+        
     <module>org.openhab.binding.homewizard</module>
+        
     <module>org.openhab.binding.hpprinter</module>
+        
     <module>org.openhab.binding.http</module>
+        
     <module>org.openhab.binding.hue</module>
+        
     <module>org.openhab.binding.hydrawise</module>
+        
     <module>org.openhab.binding.hyperion</module>
+        
     <module>org.openhab.binding.iammeter</module>
+        
     <module>org.openhab.binding.iaqualink</module>
+        
     <module>org.openhab.binding.icalendar</module>
+        
     <module>org.openhab.binding.icloud</module>
+        
     <module>org.openhab.binding.ihc</module>
+        
     <module>org.openhab.binding.insteon</module>
+        
     <module>org.openhab.binding.ipcamera</module>
+        
     <module>org.openhab.binding.ipobserver</module>
+        
     <module>org.openhab.binding.intesis</module>
+        
     <module>org.openhab.binding.iotawatt</module>
+        
     <module>org.openhab.binding.ipp</module>
+        
     <module>org.openhab.binding.irobot</module>
+        
     <module>org.openhab.binding.irtrans</module>
+        
     <module>org.openhab.binding.ism8</module>
+        
     <module>org.openhab.binding.jablotron</module>
+        
     <module>org.openhab.binding.jeelink</module>
+        
     <module>org.openhab.binding.jellyfin</module>
+        
     <module>org.openhab.binding.juicenet</module>
+        
     <module>org.openhab.binding.kaleidescape</module>
+        
     <module>org.openhab.binding.keba</module>
+        
     <module>org.openhab.binding.km200</module>
+        
     <module>org.openhab.binding.knx</module>
+        
     <module>org.openhab.binding.kodi</module>
+        
     <module>org.openhab.binding.konnected</module>
+        
     <module>org.openhab.binding.kostalinverter</module>
+        
     <module>org.openhab.binding.kvv</module>
+        
     <module>org.openhab.binding.lametrictime</module>
+        
     <module>org.openhab.binding.lcn</module>
+        
     <module>org.openhab.binding.leapmotion</module>
+        
     <module>org.openhab.binding.lghombot</module>
+        
     <module>org.openhab.binding.lgtvserial</module>
+        
     <module>org.openhab.binding.lgwebos</module>
+        
     <module>org.openhab.binding.lifx</module>
+        
     <module>org.openhab.binding.linky</module>
+        
     <module>org.openhab.binding.linuxinput</module>
+        
     <module>org.openhab.binding.liquidcheck</module>
+        
     <module>org.openhab.binding.lirc</module>
+        
     <module>org.openhab.binding.livisismarthome</module>
+        
     <module>org.openhab.binding.logreader</module>
+        
     <module>org.openhab.binding.loxone</module>
+        
     <module>org.openhab.binding.lutron</module>
+        
     <module>org.openhab.binding.luxom</module>
+        
     <module>org.openhab.binding.luxtronikheatpump</module>
+        
     <module>org.openhab.binding.magentatv</module>
+        
     <module>org.openhab.binding.mail</module>
+        
     <module>org.openhab.binding.max</module>
+        
     <module>org.openhab.binding.mcd</module>
+        
     <module>org.openhab.binding.mcp23017</module>
+        
     <module>org.openhab.binding.meater</module>
+        
     <module>org.openhab.binding.mecmeter</module>
+        
     <module>org.openhab.binding.melcloud</module>
+        
     <module>org.openhab.binding.mercedesme</module>
+        
     <module>org.openhab.binding.meteoalerte</module>
+        
     <module>org.openhab.binding.meteoblue</module>
+        
     <module>org.openhab.binding.meteostick</module>
+        
     <module>org.openhab.binding.mffan</module>
+        
     <module>org.openhab.binding.miele</module>
+        
     <module>org.openhab.binding.mielecloud</module>
+        
     <module>org.openhab.binding.mihome</module>
+        
     <module>org.openhab.binding.miio</module>
+        
     <module>org.openhab.binding.mikrotik</module>
+        
     <module>org.openhab.binding.millheat</module>
+        
     <module>org.openhab.binding.milight</module>
+        
     <module>org.openhab.binding.minecraft</module>
+        
     <module>org.openhab.binding.modbus</module>
+        
     <module>org.openhab.binding.modbus.e3dc</module>
+        
     <module>org.openhab.binding.modbus.sbc</module>
+        
     <module>org.openhab.binding.modbus.studer</module>
+        
     <module>org.openhab.binding.modbus.sungrow</module>
+        
     <module>org.openhab.binding.modbus.sunspec</module>
+        
     <module>org.openhab.binding.modbus.stiebeleltron</module>
+        
     <module>org.openhab.binding.modbus.helioseasycontrols</module>
+        
     <module>org.openhab.binding.monopriceaudio</module>
+        
     <module>org.openhab.binding.mpd</module>
+        
     <module>org.openhab.binding.mqtt</module>
+        
     <module>org.openhab.binding.mqtt.espmilighthub</module>
+        
     <module>org.openhab.binding.mqtt.generic</module>
+        
     <module>org.openhab.binding.mqtt.homeassistant</module>
+        
     <module>org.openhab.binding.mqtt.homie</module>
+        
     <module>org.openhab.binding.mqtt.ruuvigateway</module>
+        
     <module>org.openhab.binding.mybmw</module>
+        
     <module>org.openhab.binding.mycroft</module>
+        
     <module>org.openhab.binding.mynice</module>
+        
     <module>org.openhab.binding.mystrom</module>
+        
     <module>org.openhab.binding.nanoleaf</module>
+        
     <module>org.openhab.binding.neato</module>
+        
     <module>org.openhab.binding.neeo</module>
+        
     <module>org.openhab.binding.neohub</module>
+        
     <module>org.openhab.binding.nest</module>
+        
     <module>org.openhab.binding.netatmo</module>
+        
     <module>org.openhab.binding.network</module>
+        
     <module>org.openhab.binding.networkupstools</module>
+        
     <module>org.openhab.binding.nibeheatpump</module>
+        
     <module>org.openhab.binding.nibeuplink</module>
+        
     <module>org.openhab.binding.nikobus</module>
+        
     <module>org.openhab.binding.nikohomecontrol</module>
+        
     <module>org.openhab.binding.nobohub</module>
+        
     <module>org.openhab.binding.novafinedust</module>
+        
     <module>org.openhab.binding.ntp</module>
+        
     <module>org.openhab.binding.nuki</module>
+        
     <module>org.openhab.binding.nuvo</module>
+        
     <module>org.openhab.binding.nzwateralerts</module>
+        
     <module>org.openhab.binding.oceanic</module>
+        
     <module>org.openhab.binding.ojelectronics</module>
+        
     <module>org.openhab.binding.omnikinverter</module>
+        
     <module>org.openhab.binding.omnilink</module>
+        
     <module>org.openhab.binding.onebusaway</module>
+        
     <module>org.openhab.binding.onewiregpio</module>
+        
     <module>org.openhab.binding.onewire</module>
+        
     <module>org.openhab.binding.onkyo</module>
+        
     <module>org.openhab.binding.opengarage</module>
+        
     <module>org.openhab.binding.opensprinkler</module>
+        
     <module>org.openhab.binding.openthermgateway</module>
+        
     <module>org.openhab.binding.openuv</module>
+        
     <module>org.openhab.binding.openweathermap</module>
+        
     <module>org.openhab.binding.openwebnet</module>
+        
     <module>org.openhab.binding.oppo</module>
+        
     <module>org.openhab.binding.orbitbhyve</module>
+        
     <module>org.openhab.binding.orvibo</module>
+        
     <module>org.openhab.binding.panasonicbdp</module>
+        
     <module>org.openhab.binding.paradoxalarm</module>
+        
     <module>org.openhab.binding.pegelonline</module>
+        
     <module>org.openhab.binding.pentair</module>
+        
     <module>org.openhab.binding.phc</module>
+        
     <module>org.openhab.binding.pihole</module>
+        
     <module>org.openhab.binding.pilight</module>
+        
     <module>org.openhab.binding.pioneeravr</module>
+        
     <module>org.openhab.binding.pixometer</module>
+        
     <module>org.openhab.binding.pjlinkdevice</module>
+        
     <module>org.openhab.binding.playstation</module>
+        
     <module>org.openhab.binding.plclogo</module>
+        
     <module>org.openhab.binding.plex</module>
+        
     <module>org.openhab.binding.plugwise</module>
+        
     <module>org.openhab.binding.plugwiseha</module>
+        
     <module>org.openhab.binding.powermax</module>
+        
     <module>org.openhab.binding.proteusecometer</module>
+        
     <module>org.openhab.binding.prowl</module>
+        
     <module>org.openhab.binding.publictransportswitzerland</module>
+        
     <module>org.openhab.binding.pulseaudio</module>
+        
     <module>org.openhab.binding.pushbullet</module>
+        
     <module>org.openhab.binding.pushover</module>
+        
     <module>org.openhab.binding.pushsafer</module>
+        
     <module>org.openhab.binding.qbus</module>
+        
     <module>org.openhab.binding.qolsysiq</module>
+        
     <module>org.openhab.binding.radiobrowser</module>
+        
     <module>org.openhab.binding.radiothermostat</module>
+        
     <module>org.openhab.binding.regoheatpump</module>
+        
     <module>org.openhab.binding.revogi</module>
+        
     <module>org.openhab.binding.remoteopenhab</module>
+        
     <module>org.openhab.binding.renault</module>
+        
     <module>org.openhab.binding.resol</module>
+        
     <module>org.openhab.binding.rfxcom</module>
+        
     <module>org.openhab.binding.rme</module>
+        
     <module>org.openhab.binding.robonect</module>
+        
     <module>org.openhab.binding.roku</module>
+        
     <module>org.openhab.binding.rotel</module>
+        
     <module>org.openhab.binding.russound</module>
+        
     <module>org.openhab.binding.sagercaster</module>
+        
     <module>org.openhab.binding.saicismart</module>
+        
     <module>org.openhab.binding.salus</module>
+        
     <module>org.openhab.binding.samsungtv</module>
+        
     <module>org.openhab.binding.satel</module>
+        
     <module>org.openhab.binding.semsportal</module>
+        
     <module>org.openhab.binding.senechome</module>
+        
     <module>org.openhab.binding.seneye</module>
+        
     <module>org.openhab.binding.sensebox</module>
+        
     <module>org.openhab.binding.sensibo</module>
+        
     <module>org.openhab.binding.sensorcommunity</module>
+        
     <module>org.openhab.binding.serial</module>
+        
     <module>org.openhab.binding.serialbutton</module>
+        
     <module>org.openhab.binding.shelly</module>
+        
     <module>org.openhab.binding.silvercrestwifisocket</module>
+        
     <module>org.openhab.binding.siemenshvac</module>
+        
     <module>org.openhab.binding.siemensrds</module>
+        
     <module>org.openhab.binding.sinope</module>
+        
     <module>org.openhab.binding.sleepiq</module>
+        
     <module>org.openhab.binding.smaenergymeter</module>
+        
     <module>org.openhab.binding.smartmeter</module>
+        
     <module>org.openhab.binding.smartthings</module>
+        
     <module>org.openhab.binding.smgw</module>
+        
     <module>org.openhab.binding.smhi</module>
+        
     <module>org.openhab.binding.smsmodem</module>
+        
     <module>org.openhab.binding.sncf</module>
+        
     <module>org.openhab.binding.snmp</module>
+        
     <module>org.openhab.binding.solaredge</module>
+        
     <module>org.openhab.binding.solarforecast</module>
+        
     <module>org.openhab.binding.solarlog</module>
+        
     <module>org.openhab.binding.solarmax</module>
+        
     <module>org.openhab.binding.solarwatt</module>
+        
     <module>org.openhab.binding.solax</module>
+        
     <module>org.openhab.binding.somfymylink</module>
+        
     <module>org.openhab.binding.somfytahoma</module>
+        
     <module>org.openhab.binding.somneo</module>
+        
     <module>org.openhab.binding.sonnen</module>
+        
     <module>org.openhab.binding.sonos</module>
+        
     <module>org.openhab.binding.sonyaudio</module>
+        
     <module>org.openhab.binding.sonyprojector</module>
+        
     <module>org.openhab.binding.souliss</module>
+        
     <module>org.openhab.binding.speedtest</module>
+        
     <module>org.openhab.binding.spotify</module>
+        
     <module>org.openhab.binding.squeezebox</module>
+        
     <module>org.openhab.binding.surepetcare</module>
+        
     <module>org.openhab.binding.synopanalyzer</module>
+        
     <module>org.openhab.binding.systeminfo</module>
+        
     <module>org.openhab.binding.tacmi</module>
+        
     <module>org.openhab.binding.tado</module>
+        
     <module>org.openhab.binding.tankerkoenig</module>
+        
     <module>org.openhab.binding.tapocontrol</module>
+        
     <module>org.openhab.binding.tasmotaplug</module>
+        
     <module>org.openhab.binding.telegram</module>
+        
     <module>org.openhab.binding.teleinfo</module>
+        
     <module>org.openhab.binding.tellstick</module>
+        
     <module>org.openhab.binding.tesla</module>
+        
     <module>org.openhab.binding.teslapowerwall</module>
+        
     <module>org.openhab.binding.teslascope</module>
+        
     <module>org.openhab.binding.tibber</module>
+        
     <module>org.openhab.binding.tivo</module>
+        
     <module>org.openhab.binding.touchwand</module>
+        
     <module>org.openhab.binding.tplinkrouter</module>
+        
     <module>org.openhab.binding.tplinksmarthome</module>
+        
     <module>org.openhab.binding.tr064</module>
+        
     <module>org.openhab.binding.tradfri</module>
+        
     <module>org.openhab.binding.unifi</module>
+        
     <module>org.openhab.binding.unifiedremote</module>
+        
     <module>org.openhab.binding.upnpcontrol</module>
+        
     <module>org.openhab.binding.upb</module>
+        
     <module>org.openhab.binding.urtsi</module>
+        
     <module>org.openhab.binding.valloxmv</module>
+        
     <module>org.openhab.binding.vdr</module>
+        
     <module>org.openhab.binding.vektiva</module>
+        
     <module>org.openhab.binding.velbus</module>
+        
     <module>org.openhab.binding.velux</module>
+        
     <module>org.openhab.binding.venstarthermostat</module>
+        
     <module>org.openhab.binding.ventaair</module>
+        
     <module>org.openhab.binding.verisure</module>
+        
     <module>org.openhab.binding.vesync</module>
+        
     <module>org.openhab.binding.vigicrues</module>
+        
     <module>org.openhab.binding.vitotronic</module>
+        
     <module>org.openhab.binding.vizio</module>
+        
     <module>org.openhab.binding.volvooncall</module>
+        
     <module>org.openhab.binding.volumio</module>
+        
     <module>org.openhab.binding.warmup</module>
+        
     <module>org.openhab.binding.weathercompany</module>
+        
     <module>org.openhab.binding.weatherunderground</module>
+        
     <module>org.openhab.binding.webexteams</module>
+        
     <module>org.openhab.binding.webthing</module>
+        
     <module>org.openhab.binding.wemo</module>
+        
     <module>org.openhab.binding.wifiled</module>
+        
     <module>org.openhab.binding.windcentrale</module>
+        
     <module>org.openhab.binding.wlanthermo</module>
+        
     <module>org.openhab.binding.wled</module>
+        
     <module>org.openhab.binding.wolfsmartset</module>
+        
     <module>org.openhab.binding.wundergroundupdatereceiver</module>
+        
     <module>org.openhab.binding.x</module>
+        
     <module>org.openhab.binding.xmltv</module>
+        
     <module>org.openhab.binding.xmppclient</module>
+        
     <module>org.openhab.binding.yamahamusiccast</module>
+        
     <module>org.openhab.binding.yamahareceiver</module>
+        
     <module>org.openhab.binding.yioremote</module>
+        
     <module>org.openhab.binding.yeelight</module>
+        
     <module>org.openhab.binding.zoneminder</module>
+        
     <module>org.openhab.binding.zway</module>
+        
     <!-- persistence -->
+        
     <module>org.openhab.persistence.dynamodb</module>
+        
     <module>org.openhab.persistence.influxdb</module>
+        
     <module>org.openhab.persistence.inmemory</module>
+        
     <module>org.openhab.persistence.jdbc</module>
+        
     <module>org.openhab.persistence.jpa</module>
+        
     <module>org.openhab.persistence.mapdb</module>
+        
     <module>org.openhab.persistence.mongodb</module>
+        
     <module>org.openhab.persistence.rrd4j</module>
+        
     <!-- voice -->
+        
     <module>org.openhab.voice.googlestt</module>
+        
     <module>org.openhab.voice.googletts</module>
+        
     <module>org.openhab.voice.mactts</module>
+        
     <module>org.openhab.voice.marytts</module>
+        
     <module>org.openhab.voice.mimictts</module>
+        
     <module>org.openhab.voice.picotts</module>
+        
     <module>org.openhab.voice.pipertts</module>
+        
     <module>org.openhab.voice.pollytts</module>
+        
     <module>org.openhab.voice.rustpotterks</module>
+        
     <module>org.openhab.voice.voicerss</module>
+        
     <module>org.openhab.voice.voskstt</module>
+        
     <module>org.openhab.voice.watsonstt</module>
+        
     <module>org.openhab.voice.whisperstt</module>
+        
+      
   </modules>
-
+    
   <properties>
+        
     <m2e.jdt.annotationpath>target/dependency</m2e.jdt.annotationpath>
+        
     <dep.noembedding/>
+      
   </properties>
-
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.lastnpe.eea</groupId>
+            
       <artifactId>eea-all</artifactId>
+            
       <version>${eea.version}</version>
+          
     </dependency>
+        
     <!-- openHAB core -->
+        
     <dependency>
+            
       <groupId>org.openhab.core.bom</groupId>
+            
       <artifactId>org.openhab.core.bom.compile</artifactId>
+            
       <type>pom</type>
+            
       <scope>provided</scope>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.openhab.core.bom</groupId>
+            
       <artifactId>org.openhab.core.bom.openhab-core</artifactId>
+            
       <type>pom</type>
+            
       <scope>provided</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <groupId>commons-net</groupId>
+                    
           <artifactId>commons-net</artifactId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.openhab.core.bom</groupId>
+            
       <artifactId>org.openhab.core.bom.test</artifactId>
+            
       <type>pom</type>
+            
       <scope>test</scope>
+          
     </dependency>
+        
     <!-- Distribution -->
+        
     <dependency>
+            
       <groupId>org.apache.karaf.features</groupId>
+            
       <artifactId>framework</artifactId>
+            
       <version>${karaf.version}</version>
+            
       <type>kar</type>
+            
       <optional>true</optional>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <groupId>*</groupId>
+                    
           <artifactId>*</artifactId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <!-- Repositories -->
+        
     <dependency>
+            
       <groupId>org.apache.karaf.features</groupId>
+            
       <artifactId>standard</artifactId>
+            
       <version>${karaf.version}</version>
+            
       <classifier>features</classifier>
+            
       <type>xml</type>
+            
       <scope>provided</scope>
+          
     </dependency>
+      
   </dependencies>
-
+    
   <build>
+        
     <pluginManagement>
+            
       <plugins>
+                
         <plugin>
+                    
           <groupId>org.apache.maven.plugins</groupId>
+                    
           <artifactId>maven-jar-plugin</artifactId>
+                    
           <configuration>
+                        
             <archive>
+                            
               <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                          
             </archive>
+                        
             <skipIfEmpty>true</skipIfEmpty>
+                      
           </configuration>
+                  
         </plugin>
+                
         <plugin>
+                    
           <groupId>org.apache.karaf.tooling</groupId>
+                    
           <artifactId>karaf-maven-plugin</artifactId>
+                    
           <version>${karaf.version}</version>
+                    
           <extensions>true</extensions>
+                    
           <configuration>
+                        
             <startLevel>80</startLevel>
+                        
             <aggregateFeatures>true</aggregateFeatures>
+                        
             <checkDependencyChange>true</checkDependencyChange>
+                        
             <failOnDependencyChange>false</failOnDependencyChange>
+                        
             <logDependencyChanges>true</logDependencyChanges>
+                        
             <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                      
           </configuration>
+                    
           <executions>
+                        
             <execution>
+                            
               <id>compile</id>
+                            
               <goals>
+                                
                 <goal>features-generate-descriptor</goal>
+                              
               </goals>
+                            
               <phase>generate-resources</phase>
+                            
               <configuration>
+                                
                 <inputFile>${feature.directory}</inputFile>
+                              
               </configuration>
+                          
             </execution>
+                        
             <execution>
+                            
               <id>karaf-feature-verification</id>
+                            
               <goals>
+                                
                 <goal>verify</goal>
+                              
               </goals>
+                            
               <phase>verify</phase>
+                            
               <configuration>
+                                
                 <descriptors combine.children="append">
+                                    
                   <!-- Apache Karaf -->
+                                    
                   <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+                                    
                   <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                                    
                   <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
+                                    
                   <!-- Current feature under verification -->
+                                    
                   <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+                                  
                 </descriptors>
+                                
                 <distribution>org.apache.karaf.features:framework</distribution>
+                                
                 <javase>${oh.java.version}</javase>
+                                
                 <framework>
+                                    
                   <feature>framework</feature>
+                                  
                 </framework>
+                                
                 <features>
+                                    
                   <feature>openhab-*</feature>
+                                  
                 </features>
+                                
                 <verifyTransitive>false</verifyTransitive>
+                                
                 <ignoreMissingConditions>true</ignoreMissingConditions>
+                                
                 <fail>first</fail>
+                              
               </configuration>
+                          
             </execution>
+                      
           </executions>
+                  
         </plugin>
+              
       </plugins>
+          
     </pluginManagement>
-
+        
     <plugins>
+            
       <plugin>
+                
         <groupId>biz.aQute.bnd</groupId>
+                
         <artifactId>bnd-maven-plugin</artifactId>
+              
       </plugin>
+            
       <plugin>
+                
         <groupId>org.apache.maven.plugins</groupId>
+                
         <artifactId>maven-source-plugin</artifactId>
+                
         <executions>
+                    
           <execution>
+                        
             <id>attach-sources</id>
+                        
             <goals>
+                            
               <goal>jar-no-fork</goal>
+                          
             </goals>
+                      
           </execution>
+                  
         </executions>
+              
       </plugin>
+            
       <plugin>
+                
         <groupId>org.apache.karaf.tooling</groupId>
+                
         <artifactId>karaf-maven-plugin</artifactId>
+              
       </plugin>
+            
       <!-- embed compile time dependencies by unpacking -->
+            
       <plugin>
+                
         <groupId>org.apache.maven.plugins</groupId>
+                
         <artifactId>maven-dependency-plugin</artifactId>
+                
         <version>3.6.1</version>
+                
         <executions>
+                    
           <execution>
+                        
             <id>embed-dependencies</id>
+                        
             <goals>
+                            
               <goal>unpack-dependencies</goal>
+                          
             </goals>
+                        
             <configuration>
+                            
               <includeScope>runtime</includeScope>
+                            
               <includeTypes>jar</includeTypes>
+                            
               <excludes>**/module-info.class</excludes>
+                            
               <excludeGroupIds>javax.activation,org.apache.karaf.features,org.lastnpe.eea</excludeGroupIds>
+                            
               <excludeArtifactIds>${dep.noembedding}</excludeArtifactIds>
+                            
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                            
               <overWriteReleases>true</overWriteReleases>
+                            
               <overWriteSnapshots>true</overWriteSnapshots>
+                            
               <excludeTransitive>true</excludeTransitive>
+                            
               <type>jar</type>
+                          
             </configuration>
+                      
           </execution>
+                    
           <execution>
+                        
             <id>unpack-eea</id>
+                        
             <goals>
+                            
               <goal>unpack</goal>
+                          
             </goals>
+                        
             <configuration>
+                            
               <artifactItems>
+                                
                 <artifactItem>
+                                    
                   <groupId>org.lastnpe.eea</groupId>
+                                    
                   <artifactId>eea-all</artifactId>
+                                    
                   <version>${eea.version}</version>
+                                    
                   <overWrite>true</overWrite>
+                                  
                 </artifactItem>
+                              
               </artifactItems>
+                          
             </configuration>
+                      
           </execution>
+                  
         </executions>
+              
       </plugin>
+          
     </plugins>
+      
   </build>
-
+    
   <profiles>
+        
     <!-- suppress embedding of dependencies -->
+        
     <profile>
+            
       <id>no-embed-dependencies</id>
+            
       <activation>
+                
         <file>
+                    
           <exists>noEmbedDependencies.profile</exists>
+                  
         </file>
+              
       </activation>
+            
       <build>
+                
         <plugins>
+                    
           <plugin>
+                        
             <groupId>org.apache.maven.plugins</groupId>
+                        
             <artifactId>maven-dependency-plugin</artifactId>
+                        
             <executions>
+                            
               <execution>
+                                
                 <id>embed-dependencies</id>
+                                
                 <phase>none</phase>
+                              
               </execution>
+                          
             </executions>
+                      
           </plugin>
+                  
         </plugins>
+              
       </build>
+          
     </profile>
+      
   </profiles>
-
+  
 </project>

From 32194f6242e86a6fae545ff96be02a5cc49438a5 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 22:00:42 +0200
Subject: [PATCH 02/36] Fix: Enter new binding in bundle pom.xml

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 4158c249b479e..de52efe72e452 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -280,6 +280,8 @@
     <module>org.openhab.binding.feed</module>
         
     <module>org.openhab.binding.feican</module>
+
+    <module>org.openhab.binding.fenecon</module>
         
     <module>org.openhab.binding.fineoffsetweatherstation</module>
         

From 83f63a118428bb69cc1a3a2ff6da251c5b8f5111 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 22:12:46 +0200
Subject: [PATCH 03/36] Fix: Enter new binding in bom/openhab-addons pom.xml

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bom/openhab-addons/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml
index e95b1542ac8f5..39a9ad7801ce3 100644
--- a/bom/openhab-addons/pom.xml
+++ b/bom/openhab-addons/pom.xml
@@ -556,6 +556,11 @@
       <artifactId>org.openhab.binding.feican</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.fenecon</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.fineoffsetweatherstation</artifactId>

From 6e2f943ce5f80a64cde771432d9f2b768d4d7668 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 22:25:21 +0200
Subject: [PATCH 04/36] Fix format validation in bundle pom.xml

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/pom.xml | 1387 ++++++++++++++++++++++++-----------------------
 1 file changed, 694 insertions(+), 693 deletions(-)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index de52efe72e452..6d0bc08fc539a 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -1,1387 +1,1388 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
-    
+
   <parent>
-        
+
     <groupId>org.openhab.addons</groupId>
-        
+
     <artifactId>org.openhab.addons.reactor</artifactId>
-        
+
     <version>4.3.0-SNAPSHOT</version>
-      
+
   </parent>
-    
+
   <groupId>org.openhab.addons.bundles</groupId>
-    
+
   <artifactId>org.openhab.addons.reactor.bundles</artifactId>
-    
+
   <packaging>pom</packaging>
-    
+
   <name>openHAB Add-ons :: Bundles</name>
-    
+
   <modules>
-        
+
     <!-- automation -->
-        
+
     <module>org.openhab.automation.groovyscripting</module>
-        
+
     <module>org.openhab.automation.jrubyscripting</module>
-        
+
     <module>org.openhab.automation.jsscripting</module>
-        
+
     <module>org.openhab.automation.jsscriptingnashorn</module>
-        
+
     <module>org.openhab.automation.jythonscripting</module>
-        
+
     <module>org.openhab.automation.pidcontroller</module>
-        
+
     <module>org.openhab.automation.pwm</module>
-        
+
     <!-- io -->
-        
+
     <module>org.openhab.io.homekit</module>
-        
+
     <module>org.openhab.io.hueemulation</module>
-        
+
     <module>org.openhab.io.metrics</module>
-        
+
     <module>org.openhab.io.neeo</module>
-        
+
     <module>org.openhab.io.openhabcloud</module>
-        
+
     <!-- transformations -->
-        
+
     <module>org.openhab.transform.basicprofiles</module>
-        
+
     <module>org.openhab.transform.bin2json</module>
-        
+
     <module>org.openhab.transform.exec</module>
-        
+
     <module>org.openhab.transform.jinja</module>
-        
+
     <module>org.openhab.transform.jsonpath</module>
-        
+
     <module>org.openhab.transform.map</module>
-        
+
     <module>org.openhab.transform.regex</module>
-        
+
     <module>org.openhab.transform.rollershutterposition</module>
-        
+
     <module>org.openhab.transform.scale</module>
-        
+
     <module>org.openhab.transform.vat</module>
-        
+
     <module>org.openhab.transform.xpath</module>
-        
+
     <module>org.openhab.transform.xslt</module>
-        
+
     <!-- bindings -->
-        
+
     <module>org.openhab.binding.adorne</module>
-        
+
     <module>org.openhab.binding.ahawastecollection</module>
-        
+
     <module>org.openhab.binding.airgradient</module>
-        
+
     <module>org.openhab.binding.airq</module>
-        
+
     <module>org.openhab.binding.airquality</module>
-        
+
     <module>org.openhab.binding.airvisualnode</module>
-        
+
     <module>org.openhab.binding.alarmdecoder</module>
-        
+
     <module>org.openhab.binding.allplay</module>
-        
+
     <module>org.openhab.binding.amazondashbutton</module>
-        
+
     <module>org.openhab.binding.amazonechocontrol</module>
-        
+
     <module>org.openhab.binding.amberelectric</module>
-        
+
     <module>org.openhab.binding.ambientweather</module>
-        
+
     <module>org.openhab.binding.amplipi</module>
-        
+
     <module>org.openhab.binding.androiddebugbridge</module>
-        
+
     <module>org.openhab.binding.androidtv</module>
-        
+
     <module>org.openhab.binding.anel</module>
-        
+
     <module>org.openhab.binding.anthem</module>
-        
+
     <module>org.openhab.binding.argoclima</module>
-        
+
     <module>org.openhab.binding.astro</module>
-        
+
     <module>org.openhab.binding.asuswrt</module>
-        
+
     <module>org.openhab.binding.atlona</module>
-        
+
     <module>org.openhab.binding.autelis</module>
-        
+
     <module>org.openhab.binding.automower</module>
-        
+
     <module>org.openhab.binding.avmfritz</module>
-        
+
     <module>org.openhab.binding.awattar</module>
-        
+
     <module>org.openhab.binding.benqprojector</module>
-        
+
     <module>org.openhab.binding.bigassfan</module>
-        
+
     <module>org.openhab.binding.bluetooth</module>
-        
+
     <module>org.openhab.binding.bluetooth.airthings</module>
-        
+
     <module>org.openhab.binding.bluetooth.am43</module>
-        
+
     <module>org.openhab.binding.bluetooth.bluegiga</module>
-        
+
     <module>org.openhab.binding.bluetooth.bluez</module>
-        
+
     <module>org.openhab.binding.bluetooth.blukii</module>
-        
+
     <module>org.openhab.binding.bluetooth.daikinmadoka</module>
-        
+
     <module>org.openhab.binding.bluetooth.enoceanble</module>
-        
+
     <module>org.openhab.binding.bluetooth.generic</module>
-        
+
     <module>org.openhab.binding.bluetooth.govee</module>
-        
+
     <module>org.openhab.binding.bluetooth.grundfosalpha</module>
-        
+
     <module>org.openhab.binding.bluetooth.radoneye</module>
-        
+
     <module>org.openhab.binding.bluetooth.roaming</module>
-        
+
     <module>org.openhab.binding.bluetooth.ruuvitag</module>
-        
+
     <module>org.openhab.binding.bondhome</module>
-        
+
     <module>org.openhab.binding.boschindego</module>
-        
+
     <module>org.openhab.binding.boschshc</module>
-        
+
     <module>org.openhab.binding.bosesoundtouch</module>
-        
+
     <module>org.openhab.binding.broadlinkthermostat</module>
-        
+
     <module>org.openhab.binding.bsblan</module>
-        
+
     <module>org.openhab.binding.bticinosmarther</module>
-        
+
     <module>org.openhab.binding.buienradar</module>
-        
+
     <module>org.openhab.binding.caddx</module>
-        
+
     <module>org.openhab.binding.cbus</module>
-        
+
     <module>org.openhab.binding.chatgpt</module>
-        
+
     <module>org.openhab.binding.chromecast</module>
-        
+
     <module>org.openhab.binding.cm11a</module>
-        
+
     <module>org.openhab.binding.comfoair</module>
-        
+
     <module>org.openhab.binding.coolmasternet</module>
-        
+
     <module>org.openhab.binding.coronastats</module>
-        
+
     <module>org.openhab.binding.daikin</module>
-        
+
     <module>org.openhab.binding.dali</module>
-        
+
     <module>org.openhab.binding.danfossairunit</module>
-        
+
     <module>org.openhab.binding.dbquery</module>
-        
+
     <module>org.openhab.binding.deconz</module>
-        
+
     <module>org.openhab.binding.denonmarantz</module>
-        
+
     <module>org.openhab.binding.deutschebahn</module>
-        
+
     <module>org.openhab.binding.digiplex</module>
-        
+
     <module>org.openhab.binding.digitalstrom</module>
-        
+
     <module>org.openhab.binding.dlinksmarthome</module>
-        
+
     <module>org.openhab.binding.dmx</module>
-        
+
     <module>org.openhab.binding.dolbycp</module>
-        
+
     <module>org.openhab.binding.dominoswiss</module>
-        
+
     <module>org.openhab.binding.doorbird</module>
-        
+
     <module>org.openhab.binding.draytonwiser</module>
-        
+
     <module>org.openhab.binding.dscalarm</module>
-        
+
     <module>org.openhab.binding.dsmr</module>
-        
+
     <module>org.openhab.binding.dwdpollenflug</module>
-        
+
     <module>org.openhab.binding.dwdunwetter</module>
-        
+
     <module>org.openhab.binding.easee</module>
-        
+
     <module>org.openhab.binding.echonetlite</module>
-        
+
     <module>org.openhab.binding.ecobee</module>
-        
+
     <module>org.openhab.binding.ecotouch</module>
-        
+
     <module>org.openhab.binding.ecovacs</module>
-        
+
     <module>org.openhab.binding.ecowatt</module>
-        
+
     <module>org.openhab.binding.ekey</module>
-        
+
     <module>org.openhab.binding.electroluxair</module>
-        
+
     <module>org.openhab.binding.elerotransmitterstick</module>
-        
+
     <module>org.openhab.binding.elroconnects</module>
-        
+
     <module>org.openhab.binding.emotiva</module>
-        
+
     <module>org.openhab.binding.energenie</module>
-        
+
     <module>org.openhab.binding.energidataservice</module>
-        
+
     <module>org.openhab.binding.enigma2</module>
-        
+
     <module>org.openhab.binding.enocean</module>
-        
+
     <module>org.openhab.binding.enphase</module>
-        
+
     <module>org.openhab.binding.enturno</module>
-        
+
     <module>org.openhab.binding.ephemeris</module>
-        
+
     <module>org.openhab.binding.epsonprojector</module>
-        
+
     <module>org.openhab.binding.etherrain</module>
-        
+
     <module>org.openhab.binding.evcc</module>
-        
+
     <module>org.openhab.binding.evohome</module>
-        
+
     <module>org.openhab.binding.exec</module>
-        
+
     <module>org.openhab.binding.feed</module>
-        
+
     <module>org.openhab.binding.feican</module>
 
     <module>org.openhab.binding.fenecon</module>
-        
+
     <module>org.openhab.binding.fineoffsetweatherstation</module>
-        
+
     <module>org.openhab.binding.flicbutton</module>
-        
+
     <module>org.openhab.binding.fmiweather</module>
-        
+
     <module>org.openhab.binding.folderwatcher</module>
-        
+
     <module>org.openhab.binding.folding</module>
-        
+
     <module>org.openhab.binding.foobot</module>
-        
+
     <module>org.openhab.binding.freeathome</module>
-        
+
     <module>org.openhab.binding.freebox</module>
-        
+
     <module>org.openhab.binding.freeboxos</module>
-        
+
     <module>org.openhab.binding.freecurrency</module>
-        
+
     <module>org.openhab.binding.frenchgovtenergydata</module>
-        
+
     <module>org.openhab.binding.fronius</module>
-        
+
     <module>org.openhab.binding.fsinternetradio</module>
-        
+
     <module>org.openhab.binding.ftpupload</module>
-        
+
     <module>org.openhab.binding.gardena</module>
-        
+
     <module>org.openhab.binding.gce</module>
-        
+
     <module>org.openhab.binding.generacmobilelink</module>
-        
+
     <module>org.openhab.binding.goecharger</module>
-        
+
     <module>org.openhab.binding.govee</module>
-        
+
     <module>org.openhab.binding.gpio</module>
-        
+
     <module>org.openhab.binding.globalcache</module>
-        
+
     <module>org.openhab.binding.gpstracker</module>
-        
+
     <module>org.openhab.binding.gree</module>
-        
+
     <module>org.openhab.binding.gridbox</module>
-        
+
     <module>org.openhab.binding.groheondus</module>
-        
+
     <module>org.openhab.binding.groupepsa</module>
-        
+
     <module>org.openhab.binding.growatt</module>
-        
+
     <module>org.openhab.binding.guntamatic</module>
-        
+
     <module>org.openhab.binding.haassohnpelletstove</module>
-        
+
     <module>org.openhab.binding.harmonyhub</module>
-        
+
     <module>org.openhab.binding.haywardomnilogic</module>
-        
+
     <module>org.openhab.binding.hccrubbishcollection</module>
-        
+
     <module>org.openhab.binding.hdanywhere</module>
-        
+
     <module>org.openhab.binding.hdpowerview</module>
-        
+
     <module>org.openhab.binding.helios</module>
-        
+
     <module>org.openhab.binding.heliosventilation</module>
-        
+
     <module>org.openhab.binding.heos</module>
-        
+
     <module>org.openhab.binding.herzborg</module>
-        
+
     <module>org.openhab.binding.homeconnect</module>
-        
+
     <module>org.openhab.binding.homematic</module>
-        
+
     <module>org.openhab.binding.homewizard</module>
-        
+
     <module>org.openhab.binding.hpprinter</module>
-        
+
     <module>org.openhab.binding.http</module>
-        
+
     <module>org.openhab.binding.hue</module>
-        
+
     <module>org.openhab.binding.hydrawise</module>
-        
+
     <module>org.openhab.binding.hyperion</module>
-        
+
     <module>org.openhab.binding.iammeter</module>
-        
+
     <module>org.openhab.binding.iaqualink</module>
-        
+
     <module>org.openhab.binding.icalendar</module>
-        
+
     <module>org.openhab.binding.icloud</module>
-        
+
     <module>org.openhab.binding.ihc</module>
-        
+
     <module>org.openhab.binding.insteon</module>
-        
+
     <module>org.openhab.binding.ipcamera</module>
-        
+
     <module>org.openhab.binding.ipobserver</module>
-        
+
     <module>org.openhab.binding.intesis</module>
-        
+
     <module>org.openhab.binding.iotawatt</module>
-        
+
     <module>org.openhab.binding.ipp</module>
-        
+
     <module>org.openhab.binding.irobot</module>
-        
+
     <module>org.openhab.binding.irtrans</module>
-        
+
     <module>org.openhab.binding.ism8</module>
-        
+
     <module>org.openhab.binding.jablotron</module>
-        
+
     <module>org.openhab.binding.jeelink</module>
-        
+
     <module>org.openhab.binding.jellyfin</module>
-        
+
     <module>org.openhab.binding.juicenet</module>
-        
+
     <module>org.openhab.binding.kaleidescape</module>
-        
+
     <module>org.openhab.binding.keba</module>
-        
+
     <module>org.openhab.binding.km200</module>
-        
+
     <module>org.openhab.binding.knx</module>
-        
+
     <module>org.openhab.binding.kodi</module>
-        
+
     <module>org.openhab.binding.konnected</module>
-        
+
     <module>org.openhab.binding.kostalinverter</module>
-        
+
     <module>org.openhab.binding.kvv</module>
-        
+
     <module>org.openhab.binding.lametrictime</module>
-        
+
     <module>org.openhab.binding.lcn</module>
-        
+
     <module>org.openhab.binding.leapmotion</module>
-        
+
     <module>org.openhab.binding.lghombot</module>
-        
+
     <module>org.openhab.binding.lgtvserial</module>
-        
+
     <module>org.openhab.binding.lgwebos</module>
-        
+
     <module>org.openhab.binding.lifx</module>
-        
+
     <module>org.openhab.binding.linky</module>
-        
+
     <module>org.openhab.binding.linuxinput</module>
-        
+
     <module>org.openhab.binding.liquidcheck</module>
-        
+
     <module>org.openhab.binding.lirc</module>
-        
+
     <module>org.openhab.binding.livisismarthome</module>
-        
+
     <module>org.openhab.binding.logreader</module>
-        
+
     <module>org.openhab.binding.loxone</module>
-        
+
     <module>org.openhab.binding.lutron</module>
-        
+
     <module>org.openhab.binding.luxom</module>
-        
+
     <module>org.openhab.binding.luxtronikheatpump</module>
-        
+
     <module>org.openhab.binding.magentatv</module>
-        
+
     <module>org.openhab.binding.mail</module>
-        
+
     <module>org.openhab.binding.max</module>
-        
+
     <module>org.openhab.binding.mcd</module>
-        
+
     <module>org.openhab.binding.mcp23017</module>
-        
+
     <module>org.openhab.binding.meater</module>
-        
+
     <module>org.openhab.binding.mecmeter</module>
-        
+
     <module>org.openhab.binding.melcloud</module>
-        
+
     <module>org.openhab.binding.mercedesme</module>
-        
+
     <module>org.openhab.binding.meteoalerte</module>
-        
+
     <module>org.openhab.binding.meteoblue</module>
-        
+
     <module>org.openhab.binding.meteostick</module>
-        
+
     <module>org.openhab.binding.mffan</module>
-        
+
     <module>org.openhab.binding.miele</module>
-        
+
     <module>org.openhab.binding.mielecloud</module>
-        
+
     <module>org.openhab.binding.mihome</module>
-        
+
     <module>org.openhab.binding.miio</module>
-        
+
     <module>org.openhab.binding.mikrotik</module>
-        
+
     <module>org.openhab.binding.millheat</module>
-        
+
     <module>org.openhab.binding.milight</module>
-        
+
     <module>org.openhab.binding.minecraft</module>
-        
+
     <module>org.openhab.binding.modbus</module>
-        
+
     <module>org.openhab.binding.modbus.e3dc</module>
-        
+
     <module>org.openhab.binding.modbus.sbc</module>
-        
+
     <module>org.openhab.binding.modbus.studer</module>
-        
+
     <module>org.openhab.binding.modbus.sungrow</module>
-        
+
     <module>org.openhab.binding.modbus.sunspec</module>
-        
+
     <module>org.openhab.binding.modbus.stiebeleltron</module>
-        
+
     <module>org.openhab.binding.modbus.helioseasycontrols</module>
-        
+
     <module>org.openhab.binding.monopriceaudio</module>
-        
+
     <module>org.openhab.binding.mpd</module>
-        
+
     <module>org.openhab.binding.mqtt</module>
-        
+
     <module>org.openhab.binding.mqtt.espmilighthub</module>
-        
+
     <module>org.openhab.binding.mqtt.generic</module>
-        
+
     <module>org.openhab.binding.mqtt.homeassistant</module>
-        
+
     <module>org.openhab.binding.mqtt.homie</module>
-        
+
     <module>org.openhab.binding.mqtt.ruuvigateway</module>
-        
+
     <module>org.openhab.binding.mybmw</module>
-        
+
     <module>org.openhab.binding.mycroft</module>
-        
+
     <module>org.openhab.binding.mynice</module>
-        
+
     <module>org.openhab.binding.mystrom</module>
-        
+
     <module>org.openhab.binding.nanoleaf</module>
-        
+
     <module>org.openhab.binding.neato</module>
-        
+
     <module>org.openhab.binding.neeo</module>
-        
+
     <module>org.openhab.binding.neohub</module>
-        
+
     <module>org.openhab.binding.nest</module>
-        
+
     <module>org.openhab.binding.netatmo</module>
-        
+
     <module>org.openhab.binding.network</module>
-        
+
     <module>org.openhab.binding.networkupstools</module>
-        
+
     <module>org.openhab.binding.nibeheatpump</module>
-        
+
     <module>org.openhab.binding.nibeuplink</module>
-        
+
     <module>org.openhab.binding.nikobus</module>
-        
+
     <module>org.openhab.binding.nikohomecontrol</module>
-        
+
     <module>org.openhab.binding.nobohub</module>
-        
+
     <module>org.openhab.binding.novafinedust</module>
-        
+
     <module>org.openhab.binding.ntp</module>
-        
+
     <module>org.openhab.binding.nuki</module>
-        
+
     <module>org.openhab.binding.nuvo</module>
-        
+
     <module>org.openhab.binding.nzwateralerts</module>
-        
+
     <module>org.openhab.binding.oceanic</module>
-        
+
     <module>org.openhab.binding.ojelectronics</module>
-        
+
     <module>org.openhab.binding.omnikinverter</module>
-        
+
     <module>org.openhab.binding.omnilink</module>
-        
+
     <module>org.openhab.binding.onebusaway</module>
-        
+
     <module>org.openhab.binding.onewiregpio</module>
-        
+
     <module>org.openhab.binding.onewire</module>
-        
+
     <module>org.openhab.binding.onkyo</module>
-        
+
     <module>org.openhab.binding.opengarage</module>
-        
+
     <module>org.openhab.binding.opensprinkler</module>
-        
+
     <module>org.openhab.binding.openthermgateway</module>
-        
+
     <module>org.openhab.binding.openuv</module>
-        
+
     <module>org.openhab.binding.openweathermap</module>
-        
+
     <module>org.openhab.binding.openwebnet</module>
-        
+
     <module>org.openhab.binding.oppo</module>
-        
+
     <module>org.openhab.binding.orbitbhyve</module>
-        
+
     <module>org.openhab.binding.orvibo</module>
-        
+
     <module>org.openhab.binding.panasonicbdp</module>
-        
+
     <module>org.openhab.binding.paradoxalarm</module>
-        
+
     <module>org.openhab.binding.pegelonline</module>
-        
+
     <module>org.openhab.binding.pentair</module>
-        
+
     <module>org.openhab.binding.phc</module>
-        
+
     <module>org.openhab.binding.pihole</module>
-        
+
     <module>org.openhab.binding.pilight</module>
-        
+
     <module>org.openhab.binding.pioneeravr</module>
-        
+
     <module>org.openhab.binding.pixometer</module>
-        
+
     <module>org.openhab.binding.pjlinkdevice</module>
-        
+
     <module>org.openhab.binding.playstation</module>
-        
+
     <module>org.openhab.binding.plclogo</module>
-        
+
     <module>org.openhab.binding.plex</module>
-        
+
     <module>org.openhab.binding.plugwise</module>
-        
+
     <module>org.openhab.binding.plugwiseha</module>
-        
+
     <module>org.openhab.binding.powermax</module>
-        
+
     <module>org.openhab.binding.proteusecometer</module>
-        
+
     <module>org.openhab.binding.prowl</module>
-        
+
     <module>org.openhab.binding.publictransportswitzerland</module>
-        
+
     <module>org.openhab.binding.pulseaudio</module>
-        
+
     <module>org.openhab.binding.pushbullet</module>
-        
+
     <module>org.openhab.binding.pushover</module>
-        
+
     <module>org.openhab.binding.pushsafer</module>
-        
+
     <module>org.openhab.binding.qbus</module>
-        
+
     <module>org.openhab.binding.qolsysiq</module>
-        
+
     <module>org.openhab.binding.radiobrowser</module>
-        
+
     <module>org.openhab.binding.radiothermostat</module>
-        
+
     <module>org.openhab.binding.regoheatpump</module>
-        
+
     <module>org.openhab.binding.revogi</module>
-        
+
     <module>org.openhab.binding.remoteopenhab</module>
-        
+
     <module>org.openhab.binding.renault</module>
-        
+
     <module>org.openhab.binding.resol</module>
-        
+
     <module>org.openhab.binding.rfxcom</module>
-        
+
     <module>org.openhab.binding.rme</module>
-        
+
     <module>org.openhab.binding.robonect</module>
-        
+
     <module>org.openhab.binding.roku</module>
-        
+
     <module>org.openhab.binding.rotel</module>
-        
+
     <module>org.openhab.binding.russound</module>
-        
+
     <module>org.openhab.binding.sagercaster</module>
-        
+
     <module>org.openhab.binding.saicismart</module>
-        
+
     <module>org.openhab.binding.salus</module>
-        
+
     <module>org.openhab.binding.samsungtv</module>
-        
+
     <module>org.openhab.binding.satel</module>
-        
+
     <module>org.openhab.binding.semsportal</module>
-        
+
     <module>org.openhab.binding.senechome</module>
-        
+
     <module>org.openhab.binding.seneye</module>
-        
+
     <module>org.openhab.binding.sensebox</module>
-        
+
     <module>org.openhab.binding.sensibo</module>
-        
+
     <module>org.openhab.binding.sensorcommunity</module>
-        
+
     <module>org.openhab.binding.serial</module>
-        
+
     <module>org.openhab.binding.serialbutton</module>
-        
+
     <module>org.openhab.binding.shelly</module>
-        
+
     <module>org.openhab.binding.silvercrestwifisocket</module>
-        
+
     <module>org.openhab.binding.siemenshvac</module>
-        
+
     <module>org.openhab.binding.siemensrds</module>
-        
+
     <module>org.openhab.binding.sinope</module>
-        
+
     <module>org.openhab.binding.sleepiq</module>
-        
+
     <module>org.openhab.binding.smaenergymeter</module>
-        
+
     <module>org.openhab.binding.smartmeter</module>
-        
+
     <module>org.openhab.binding.smartthings</module>
-        
+
     <module>org.openhab.binding.smgw</module>
-        
+
     <module>org.openhab.binding.smhi</module>
-        
+
     <module>org.openhab.binding.smsmodem</module>
-        
+
     <module>org.openhab.binding.sncf</module>
-        
+
     <module>org.openhab.binding.snmp</module>
-        
+
     <module>org.openhab.binding.solaredge</module>
-        
+
     <module>org.openhab.binding.solarforecast</module>
-        
+
     <module>org.openhab.binding.solarlog</module>
-        
+
     <module>org.openhab.binding.solarmax</module>
-        
+
     <module>org.openhab.binding.solarwatt</module>
-        
+
     <module>org.openhab.binding.solax</module>
-        
+
     <module>org.openhab.binding.somfymylink</module>
-        
+
     <module>org.openhab.binding.somfytahoma</module>
-        
+
     <module>org.openhab.binding.somneo</module>
-        
+
     <module>org.openhab.binding.sonnen</module>
-        
+
     <module>org.openhab.binding.sonos</module>
-        
+
     <module>org.openhab.binding.sonyaudio</module>
-        
+
     <module>org.openhab.binding.sonyprojector</module>
-        
+
     <module>org.openhab.binding.souliss</module>
-        
+
     <module>org.openhab.binding.speedtest</module>
-        
+
     <module>org.openhab.binding.spotify</module>
-        
+
     <module>org.openhab.binding.squeezebox</module>
-        
+
     <module>org.openhab.binding.surepetcare</module>
-        
+
     <module>org.openhab.binding.synopanalyzer</module>
-        
+
     <module>org.openhab.binding.systeminfo</module>
-        
+
     <module>org.openhab.binding.tacmi</module>
-        
+
     <module>org.openhab.binding.tado</module>
-        
+
     <module>org.openhab.binding.tankerkoenig</module>
-        
+
     <module>org.openhab.binding.tapocontrol</module>
-        
+
     <module>org.openhab.binding.tasmotaplug</module>
-        
+
     <module>org.openhab.binding.telegram</module>
-        
+
     <module>org.openhab.binding.teleinfo</module>
-        
+
     <module>org.openhab.binding.tellstick</module>
-        
+
     <module>org.openhab.binding.tesla</module>
-        
+
     <module>org.openhab.binding.teslapowerwall</module>
-        
+
     <module>org.openhab.binding.teslascope</module>
-        
+
     <module>org.openhab.binding.tibber</module>
-        
+
     <module>org.openhab.binding.tivo</module>
-        
+
     <module>org.openhab.binding.touchwand</module>
-        
+
     <module>org.openhab.binding.tplinkrouter</module>
-        
+
     <module>org.openhab.binding.tplinksmarthome</module>
-        
+
     <module>org.openhab.binding.tr064</module>
-        
+
     <module>org.openhab.binding.tradfri</module>
-        
+
     <module>org.openhab.binding.unifi</module>
-        
+
     <module>org.openhab.binding.unifiedremote</module>
-        
+
     <module>org.openhab.binding.upnpcontrol</module>
-        
+
     <module>org.openhab.binding.upb</module>
-        
+
     <module>org.openhab.binding.urtsi</module>
-        
+
     <module>org.openhab.binding.valloxmv</module>
-        
+
     <module>org.openhab.binding.vdr</module>
-        
+
     <module>org.openhab.binding.vektiva</module>
-        
+
     <module>org.openhab.binding.velbus</module>
-        
+
     <module>org.openhab.binding.velux</module>
-        
+
     <module>org.openhab.binding.venstarthermostat</module>
-        
+
     <module>org.openhab.binding.ventaair</module>
-        
+
     <module>org.openhab.binding.verisure</module>
-        
+
     <module>org.openhab.binding.vesync</module>
-        
+
     <module>org.openhab.binding.vigicrues</module>
-        
+
     <module>org.openhab.binding.vitotronic</module>
-        
+
     <module>org.openhab.binding.vizio</module>
-        
+
     <module>org.openhab.binding.volvooncall</module>
-        
+
     <module>org.openhab.binding.volumio</module>
-        
+
     <module>org.openhab.binding.warmup</module>
-        
+
     <module>org.openhab.binding.weathercompany</module>
-        
+
     <module>org.openhab.binding.weatherunderground</module>
-        
+
     <module>org.openhab.binding.webexteams</module>
-        
+
     <module>org.openhab.binding.webthing</module>
-        
+
     <module>org.openhab.binding.wemo</module>
-        
+
     <module>org.openhab.binding.wifiled</module>
-        
+
     <module>org.openhab.binding.windcentrale</module>
-        
+
     <module>org.openhab.binding.wlanthermo</module>
-        
+
     <module>org.openhab.binding.wled</module>
-        
+
     <module>org.openhab.binding.wolfsmartset</module>
-        
+
     <module>org.openhab.binding.wundergroundupdatereceiver</module>
-        
+
     <module>org.openhab.binding.x</module>
-        
+
     <module>org.openhab.binding.xmltv</module>
-        
+
     <module>org.openhab.binding.xmppclient</module>
-        
+
     <module>org.openhab.binding.yamahamusiccast</module>
-        
+
     <module>org.openhab.binding.yamahareceiver</module>
-        
+
     <module>org.openhab.binding.yioremote</module>
-        
+
     <module>org.openhab.binding.yeelight</module>
-        
+
     <module>org.openhab.binding.zoneminder</module>
-        
+
     <module>org.openhab.binding.zway</module>
-        
+
     <!-- persistence -->
-        
+
     <module>org.openhab.persistence.dynamodb</module>
-        
+
     <module>org.openhab.persistence.influxdb</module>
-        
+
     <module>org.openhab.persistence.inmemory</module>
-        
+
     <module>org.openhab.persistence.jdbc</module>
-        
+
     <module>org.openhab.persistence.jpa</module>
-        
+
     <module>org.openhab.persistence.mapdb</module>
-        
+
     <module>org.openhab.persistence.mongodb</module>
-        
+
     <module>org.openhab.persistence.rrd4j</module>
-        
+
     <!-- voice -->
-        
+
     <module>org.openhab.voice.googlestt</module>
-        
+
     <module>org.openhab.voice.googletts</module>
-        
+
     <module>org.openhab.voice.mactts</module>
-        
+
     <module>org.openhab.voice.marytts</module>
-        
+
     <module>org.openhab.voice.mimictts</module>
-        
+
     <module>org.openhab.voice.picotts</module>
-        
+
     <module>org.openhab.voice.pipertts</module>
-        
+
     <module>org.openhab.voice.pollytts</module>
-        
+
     <module>org.openhab.voice.rustpotterks</module>
-        
+
     <module>org.openhab.voice.voicerss</module>
-        
+
     <module>org.openhab.voice.voskstt</module>
-        
+
     <module>org.openhab.voice.watsonstt</module>
-        
+
     <module>org.openhab.voice.whisperstt</module>
-        
-      
+
+
   </modules>
-    
+
   <properties>
-        
+
     <m2e.jdt.annotationpath>target/dependency</m2e.jdt.annotationpath>
-        
+
     <dep.noembedding/>
-      
+
   </properties>
-    
+
   <dependencies>
-        
+
     <dependency>
-            
+
       <groupId>org.lastnpe.eea</groupId>
-            
+
       <artifactId>eea-all</artifactId>
-            
+
       <version>${eea.version}</version>
-          
+
     </dependency>
-        
+
     <!-- openHAB core -->
-        
+
     <dependency>
-            
+
       <groupId>org.openhab.core.bom</groupId>
-            
+
       <artifactId>org.openhab.core.bom.compile</artifactId>
-            
+
       <type>pom</type>
-            
+
       <scope>provided</scope>
-          
+
     </dependency>
-        
+
     <dependency>
-            
+
       <groupId>org.openhab.core.bom</groupId>
-            
+
       <artifactId>org.openhab.core.bom.openhab-core</artifactId>
-            
+
       <type>pom</type>
-            
+
       <scope>provided</scope>
-            
+
       <exclusions>
-                
+
         <exclusion>
-                    
+
           <groupId>commons-net</groupId>
-                    
+
           <artifactId>commons-net</artifactId>
-                  
+
         </exclusion>
-              
+
       </exclusions>
-          
+
     </dependency>
-        
+
     <dependency>
-            
+
       <groupId>org.openhab.core.bom</groupId>
-            
+
       <artifactId>org.openhab.core.bom.test</artifactId>
-            
+
       <type>pom</type>
-            
+
       <scope>test</scope>
-          
+
     </dependency>
-        
+
     <!-- Distribution -->
-        
+
     <dependency>
-            
+
       <groupId>org.apache.karaf.features</groupId>
-            
+
       <artifactId>framework</artifactId>
-            
+
       <version>${karaf.version}</version>
-            
+
       <type>kar</type>
-            
+
       <optional>true</optional>
-            
+
       <exclusions>
-                
+
         <exclusion>
-                    
+
           <groupId>*</groupId>
-                    
+
           <artifactId>*</artifactId>
-                  
+
         </exclusion>
-              
+
       </exclusions>
-          
+
     </dependency>
-        
+
     <!-- Repositories -->
-        
+
     <dependency>
-            
+
       <groupId>org.apache.karaf.features</groupId>
-            
+
       <artifactId>standard</artifactId>
-            
+
       <version>${karaf.version}</version>
-            
+
       <classifier>features</classifier>
-            
+
       <type>xml</type>
-            
+
       <scope>provided</scope>
-          
+
     </dependency>
-      
+
   </dependencies>
-    
+
   <build>
-        
+
     <pluginManagement>
-            
+
       <plugins>
-                
+
         <plugin>
-                    
+
           <groupId>org.apache.maven.plugins</groupId>
-                    
+
           <artifactId>maven-jar-plugin</artifactId>
-                    
+
           <configuration>
-                        
+
             <archive>
-                            
+
               <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                          
+
             </archive>
-                        
+
             <skipIfEmpty>true</skipIfEmpty>
-                      
+
           </configuration>
-                  
+
         </plugin>
-                
+
         <plugin>
-                    
+
           <groupId>org.apache.karaf.tooling</groupId>
-                    
+
           <artifactId>karaf-maven-plugin</artifactId>
-                    
+
           <version>${karaf.version}</version>
-                    
+
           <extensions>true</extensions>
-                    
+
           <configuration>
-                        
+
             <startLevel>80</startLevel>
-                        
+
             <aggregateFeatures>true</aggregateFeatures>
-                        
+
             <checkDependencyChange>true</checkDependencyChange>
-                        
+
             <failOnDependencyChange>false</failOnDependencyChange>
-                        
+
             <logDependencyChanges>true</logDependencyChanges>
-                        
+
             <overwriteChangedDependencies>true</overwriteChangedDependencies>
-                      
+
           </configuration>
-                    
+
           <executions>
-                        
+
             <execution>
-                            
+
               <id>compile</id>
-                            
+
               <goals>
-                                
+
                 <goal>features-generate-descriptor</goal>
-                              
+
               </goals>
-                            
+
               <phase>generate-resources</phase>
-                            
+
               <configuration>
-                                
+
                 <inputFile>${feature.directory}</inputFile>
-                              
+
               </configuration>
-                          
+
             </execution>
-                        
+
             <execution>
-                            
+
               <id>karaf-feature-verification</id>
-                            
+
               <goals>
-                                
+
                 <goal>verify</goal>
-                              
+
               </goals>
-                            
+
               <phase>verify</phase>
-                            
+
               <configuration>
-                                
+
                 <descriptors combine.children="append">
-                                    
+
                   <!-- Apache Karaf -->
-                                    
+
                   <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
-                                    
+
                   <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
-                                    
+
                   <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
-                                    
+
                   <!-- Current feature under verification -->
-                                    
+
                   <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
-                                  
+
                 </descriptors>
-                                
+
                 <distribution>org.apache.karaf.features:framework</distribution>
-                                
+
                 <javase>${oh.java.version}</javase>
-                                
+
                 <framework>
-                                    
+
                   <feature>framework</feature>
-                                  
+
                 </framework>
-                                
+
                 <features>
-                                    
+
                   <feature>openhab-*</feature>
-                                  
+
                 </features>
-                                
+
                 <verifyTransitive>false</verifyTransitive>
-                                
+
                 <ignoreMissingConditions>true</ignoreMissingConditions>
-                                
+
                 <fail>first</fail>
-                              
+
               </configuration>
-                          
+
             </execution>
-                      
+
           </executions>
-                  
+
         </plugin>
-              
+
       </plugins>
-          
+
     </pluginManagement>
-        
+
     <plugins>
-            
+
       <plugin>
-                
+
         <groupId>biz.aQute.bnd</groupId>
-                
+
         <artifactId>bnd-maven-plugin</artifactId>
-              
+
       </plugin>
-            
+
       <plugin>
-                
+
         <groupId>org.apache.maven.plugins</groupId>
-                
+
         <artifactId>maven-source-plugin</artifactId>
-                
+
         <executions>
-                    
+
           <execution>
-                        
+
             <id>attach-sources</id>
-                        
+
             <goals>
-                            
+
               <goal>jar-no-fork</goal>
-                          
+
             </goals>
-                      
+
           </execution>
-                  
+
         </executions>
-              
+
       </plugin>
-            
+
       <plugin>
-                
+
         <groupId>org.apache.karaf.tooling</groupId>
-                
+
         <artifactId>karaf-maven-plugin</artifactId>
-              
+
       </plugin>
-            
+
       <!-- embed compile time dependencies by unpacking -->
-            
+
       <plugin>
-                
+
         <groupId>org.apache.maven.plugins</groupId>
-                
+
         <artifactId>maven-dependency-plugin</artifactId>
-                
+
         <version>3.6.1</version>
-                
+
         <executions>
-                    
+
           <execution>
-                        
+
             <id>embed-dependencies</id>
-                        
+
             <goals>
-                            
+
               <goal>unpack-dependencies</goal>
-                          
+
             </goals>
-                        
+
             <configuration>
-                            
+
               <includeScope>runtime</includeScope>
-                            
+
               <includeTypes>jar</includeTypes>
-                            
+
               <excludes>**/module-info.class</excludes>
-                            
+
               <excludeGroupIds>javax.activation,org.apache.karaf.features,org.lastnpe.eea</excludeGroupIds>
-                            
+
               <excludeArtifactIds>${dep.noembedding}</excludeArtifactIds>
-                            
+
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                            
+
               <overWriteReleases>true</overWriteReleases>
-                            
+
               <overWriteSnapshots>true</overWriteSnapshots>
-                            
+
               <excludeTransitive>true</excludeTransitive>
-                            
+
               <type>jar</type>
-                          
+
             </configuration>
-                      
+
           </execution>
-                    
+
           <execution>
-                        
+
             <id>unpack-eea</id>
-                        
+
             <goals>
-                            
+
               <goal>unpack</goal>
-                          
+
             </goals>
-                        
+
             <configuration>
-                            
+
               <artifactItems>
-                                
+
                 <artifactItem>
-                                    
+
                   <groupId>org.lastnpe.eea</groupId>
-                                    
+
                   <artifactId>eea-all</artifactId>
-                                    
+
                   <version>${eea.version}</version>
-                                    
+
                   <overWrite>true</overWrite>
-                                  
+
                 </artifactItem>
-                              
+
               </artifactItems>
-                          
+
             </configuration>
-                      
+
           </execution>
-                  
+
         </executions>
-              
+
       </plugin>
-          
+
     </plugins>
-      
+
   </build>
-    
+
   <profiles>
-        
+
     <!-- suppress embedding of dependencies -->
-        
+
     <profile>
-            
+
       <id>no-embed-dependencies</id>
-            
+
       <activation>
-                
+
         <file>
-                    
+
           <exists>noEmbedDependencies.profile</exists>
-                  
+
         </file>
-              
+
       </activation>
-            
+
       <build>
-                
+
         <plugins>
-                    
+
           <plugin>
-                        
+
             <groupId>org.apache.maven.plugins</groupId>
-                        
+
             <artifactId>maven-dependency-plugin</artifactId>
-                        
+
             <executions>
-                            
+
               <execution>
-                                
+
                 <id>embed-dependencies</id>
-                                
+
                 <phase>none</phase>
-                              
+
               </execution>
-                          
+
             </executions>
-                      
+
           </plugin>
-                  
+
         </plugins>
-              
+
       </build>
-          
+
     </profile>
-      
+
   </profiles>
-  
+
 </project>

From 3b338e12cb90381358a809835e7bb8736ecbaefc Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 22:32:06 +0200
Subject: [PATCH 05/36] Fix warning in markdown

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index b2c92002f9cc4..98d9d050ced5d 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -55,6 +55,7 @@ The FENECON binding currently only provides access to read out the values from t
 ```java
 Thing fenecon:fenecon:1 "FENECON Home" [hostname="192.168.1.11", refreshInterval=5]
 ```
+
 ### demo.items
 
 ```java

From a4e7d5adc6a80ca9892e15b0f6b0a249d90f5a97 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 22:46:03 +0200
Subject: [PATCH 06/36] Fix null pointer warnings

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../binding/fenecon/internal/FeneconHandler.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 623da4f6c4078..65ca7fb0fccef 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -58,7 +58,7 @@ public class FeneconHandler extends BaseThingHandler {
 
     private final Logger logger = LoggerFactory.getLogger(FeneconHandler.class);
 
-    private @Nullable FeneconConfiguration config;
+    private FeneconConfiguration config = new FeneconConfiguration();
     private @Nullable ScheduledFuture<?> pollingJob;
 
     private final List<String> channels = List.of("GridMode", "State", "EssSoc", "ConsumptionActivePower",
@@ -77,12 +77,12 @@ public FeneconHandler(Thing thing) {
     public void initialize() {
         config = getConfigAs(FeneconConfiguration.class);
 
-        logger.info("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(),
+        logger.info("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(config),
                 config.refreshInterval);
 
         updateStatus(ThingStatus.UNKNOWN);
 
-        baseHttpRequest = createBaseHttpRequest();
+        baseHttpRequest = createBaseHttpRequest(config);
         pollingJob = scheduler.scheduleWithFixedDelay(this::pollingCode, 5, config.refreshInterval, TimeUnit.SECONDS);
     }
 
@@ -91,11 +91,11 @@ private static final String getBasicAuthHeader(String username, String password)
         return "Basic " + Base64.getEncoder().encodeToString(valueToEncode.getBytes());
     }
 
-    private String getBaseUrl() {
+    private String getBaseUrl(FeneconConfiguration config) {
         return "http://" + config.hostname + ":" + config.port + "/";
     }
 
-    private Builder createBaseHttpRequest() {
+    private Builder createBaseHttpRequest(FeneconConfiguration config) {
         String basicAuth = getBasicAuthHeader("x", config.password);
         return HttpRequest.newBuilder().timeout(Duration.ofSeconds(5)).header("Authorization", basicAuth)
                 .header("Content-Type", "application/json").GET();
@@ -105,8 +105,9 @@ private void pollingCode() {
         for (String eachChannel : channels) {
             try {
 
-                HttpRequest request = baseHttpRequest.uri(new URI(getBaseUrl() + "rest/channel/_sum/" + eachChannel))
-                        .build();
+                @SuppressWarnings("null")
+                HttpRequest request = baseHttpRequest
+                        .uri(new URI(getBaseUrl(config) + "rest/channel/_sum/" + eachChannel)).build();
                 logger.trace("FENECON - request: {}", request);
 
                 HttpResponse<String> response = httpClient.send(request, BodyHandlers.ofString());

From 0cf1589741327c5f89fbef78a85a8aade78f15fe Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 22:54:43 +0200
Subject: [PATCH 07/36] Fix tow checkstyle notices.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../org/openhab/binding/fenecon/internal/FeneconHandler.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 65ca7fb0fccef..0a52260c7d036 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -104,7 +104,6 @@ private Builder createBaseHttpRequest(FeneconConfiguration config) {
     private void pollingCode() {
         for (String eachChannel : channels) {
             try {
-
                 @SuppressWarnings("null")
                 HttpRequest request = baseHttpRequest
                         .uri(new URI(getBaseUrl(config) + "rest/channel/_sum/" + eachChannel)).build();
@@ -128,7 +127,6 @@ private void pollingCode() {
                     processDataPoint(JsonParser.parseString(response.body()).getAsJsonObject());
                     updateStatus(ThingStatus.ONLINE);
                 }
-
             } catch (URISyntaxException | JsonSyntaxException | IOException | InterruptedException err) {
                 logger.trace("FENECON - connection problem on FENECON channel {}", eachChannel, err);
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR, err.getMessage());

From 02ff037af91a126cfd194ed7141206181ba444c8 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 28 Jul 2024 23:02:49 +0200
Subject: [PATCH 08/36] Removed unnecessary code comments.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/pom.xml              | 9 ---------
 .../src/main/resources/OH-INF/i18n/fenecon.properties    | 4 +---
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/pom.xml b/bundles/org.openhab.binding.fenecon/pom.xml
index c885f25aed718..fd76dac5b0b88 100644
--- a/bundles/org.openhab.binding.fenecon/pom.xml
+++ b/bundles/org.openhab.binding.fenecon/pom.xml
@@ -14,13 +14,4 @@
 
   <name>openHAB Add-ons :: Bundles :: FENECON Binding</name>
 
-  <!--
-    <dependencies>
-    <dependency>
-    <groupId>org.json</groupId>
-    <artifactId>json</artifactId>
-    <version>20240303</version>
-    <scope>compile</scope>
-    </dependency>
-    </dependencies> -->
 </project>
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
index 0c2f44015a92d..1e0ca6a5f2c37 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
@@ -1,3 +1 @@
-# FIXME: please add all English translations to this file so the texts can be translated using Crowdin
-# FIXME: to generate the content of this file run: mvn i18n:generate-default-translations
-# FIXME: see also: https://www.openhab.org/docs/developer/utils/i18n.html
+# 

From 469c7ef10808cd77efef03ca805c239dd8481172 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Fri, 2 Aug 2024 23:08:30 +0200
Subject: [PATCH 09/36] Add code owner information.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 CODEOWNERS                                  |  1 +
 bundles/org.openhab.binding.fenecon/pom.xml | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/CODEOWNERS b/CODEOWNERS
index 0a4f724322f04..ecbb283567a33 100755
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -113,6 +113,7 @@
 /bundles/org.openhab.binding.exec/ @kgoderis
 /bundles/org.openhab.binding.feed/ @openhab/add-ons-maintainers
 /bundles/org.openhab.binding.feican/ @Hilbrand
+/bundles/org.openhab.binding.fenecon/ @nixoso
 /bundles/org.openhab.binding.fineoffsetweatherstation/ @Andy2003
 /bundles/org.openhab.binding.flicbutton/ @pfink
 /bundles/org.openhab.binding.fmiweather/ @ssalonen
diff --git a/bundles/org.openhab.binding.fenecon/pom.xml b/bundles/org.openhab.binding.fenecon/pom.xml
index fd76dac5b0b88..6a60b4839a315 100644
--- a/bundles/org.openhab.binding.fenecon/pom.xml
+++ b/bundles/org.openhab.binding.fenecon/pom.xml
@@ -14,4 +14,15 @@
 
   <name>openHAB Add-ons :: Bundles :: FENECON Binding</name>
 
+  <inceptionYear>2024</inceptionYear>
+
+  <developers>
+    <developer>
+      <id>nixoso</id>
+      <name>Philipp Schneider</name>
+      <email>philipp.schneider@nixo-soft.de</email>
+      <timezone>Europe/​Berlin</timezone>
+    </developer>
+  </developers>
+
 </project>

From 6281b0d36729e4987a50a30966634ba3dfddd5aa Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Fri, 2 Aug 2024 23:46:21 +0200
Subject: [PATCH 10/36] [Review]: Change initial delay of the polling job.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../org/openhab/binding/fenecon/internal/FeneconHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 0a52260c7d036..98f6439c789e5 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -83,7 +83,7 @@ public void initialize() {
         updateStatus(ThingStatus.UNKNOWN);
 
         baseHttpRequest = createBaseHttpRequest(config);
-        pollingJob = scheduler.scheduleWithFixedDelay(this::pollingCode, 5, config.refreshInterval, TimeUnit.SECONDS);
+        pollingJob = scheduler.scheduleWithFixedDelay(this::pollingCode, 0, config.refreshInterval, TimeUnit.SECONDS);
     }
 
     private static final String getBasicAuthHeader(String username, String password) {

From 496594f240c23f83ac0b16d51941bac174ce459d Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Fri, 2 Aug 2024 23:48:15 +0200
Subject: [PATCH 11/36] [Review]: Change log level of initialization message.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../org/openhab/binding/fenecon/internal/FeneconHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 98f6439c789e5..7486d97211c0a 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -77,7 +77,7 @@ public FeneconHandler(Thing thing) {
     public void initialize() {
         config = getConfigAs(FeneconConfiguration.class);
 
-        logger.info("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(config),
+        logger.debug("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(config),
                 config.refreshInterval);
 
         updateStatus(ThingStatus.UNKNOWN);

From 816c39535199b79fb7369d30b4ac90ff8401eceb Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Fri, 2 Aug 2024 23:57:03 +0200
Subject: [PATCH 12/36] [Review]: Add unitHint for battery state

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index a5c885f736474..bcbb64cc200e6 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -71,7 +71,7 @@
 		<state readOnly="true"></state>
 	</channel-type>
 	<channel-type id="essSoc">
-		<item-type>Number:Dimensionless</item-type>
+		<item-type unitHint="%">Number:Dimensionless</item-type>
 		<label>Battery State</label>
 		<description>Battery state of charge in percent</description>
 		<category>BatteryLevel</category>

From 113dcef1244897e267ad4a02357b498b713a6bf3 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 00:38:48 +0200
Subject: [PATCH 13/36] [Review]: Fix naming convention

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 29 +++++-----
 .../resources/OH-INF/thing/thing-types.xml    | 55 +++++++++++--------
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index 98d9d050ced5d..f52bef28334a3 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -32,20 +32,20 @@ The FENECON Thing only needs to be configured with the `hostname`, all other par
 
 The FENECON binding currently only provides access to read out the values from the energy storage system. 
 
-| Channel                | Type                 | Read/Write | Description                                                                 |
-|------------------------|----------------------|------------|-----------------------------------------------------------------------------|
-| state                  | String               | R          | FENECON system state: Ok, Info, Warning or Fault                            |
-| lastUpdate             | DateTime             | R          | Last successful update via REST-API from the FENECON system                 |
-| essSoc                 | Number:Dimensionless | R          | Battery state of charge in percent                                          |
-| chargerPower           | Number:Power         | R          | Current charger power of energy storage system in watt.                     |
-| dischargerPower        | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
-| emergencyPowerMode     | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
-| productionActivePower  | Number:Power         | R          | Current active power producer load in watt.                                 |
-| sellToGridPower        | Number:Power         | R          | Current sell to grid exchange power in watt.                                |
-| sellToGridEnergy       | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
-| consumptionActivePower | Number:Power         | R          | Current active power consumer load in watt.                                 |
-| buyFromGridPower       | Number:Power         | R          | Current buy from grid exchange power in watt.                               |
-| buyFromGridEnergy      | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
+| Channel                  | Type                 | Read/Write | Description                                                                 |
+|--------------------------|----------------------|------------|-----------------------------------------------------------------------------|
+| state                    | String               | R          | FENECON system state: Ok, Info, Warning or Fault                            |
+| last-update              | DateTime             | R          | Last successful update via REST-API from the FENECON system                 |
+| ess-soc                  | Number:Dimensionless | R          | Battery state of charge in percent                                          |
+| charger-power            | Number:Power         | R          | Current charger power of energy storage system in watt.                     |
+| discharger-power         | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
+| emergency-power-mode     | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
+| production-active-power  | Number:Power         | R          | Current active power producer load in watt.                                 |
+| sell-to-grid-power       | Number:Power         | R          | Current sell to grid exchange power in watt.                                |
+| sell-to-grid-energy      | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
+| consumption-active-power | Number:Power         | R          | Current active power consumer load in watt.                                 |
+| buy-from-grid-power      | Number:Power         | R          | Current buy from grid exchange power in watt.                               |
+| buy-from-grid-energy     | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
 
 
 ## Full Example
@@ -101,6 +101,7 @@ sitemap demo label="FENECON Example Sitemap" {
 
 ### demo.rules
 
+
 ```java
 rule "Blackout detection"
 when
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index bcbb64cc200e6..d94dbacd8b2ec 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -13,17 +13,17 @@
 
 		<channels>
 			<channel id="state" typeId="state"/>
-			<channel id="lastUpdate" typeId="lastUpdate"/>
-			<channel id="essSoc" typeId="essSoc"/>
-			<channel id="chargerPower" typeId="chargerPower"/>
-			<channel id="dischargerPower" typeId="dischargerPower"/>
-			<channel id="emergencyPowerMode" typeId="emergencyPowerMode"/>
-			<channel id="consumptionActivePower" typeId="consumptionActivePower"/>
-			<channel id="productionActivePower" typeId="productionActivePower"/>
-			<channel id="sellToGridPower" typeId="sellToGridPower"/>
-			<channel id="sellToGridEnergy" typeId="sellToGridEnergy"/>
-			<channel id="buyFromGridPower" typeId="buyFromGridPower"/>
-			<channel id="buyFromGridEnergy" typeId="buyFromGridEnergy"/>
+			<channel id="last-update" typeId="last-update"/>
+			<channel id="ess-soc" typeId="ess-soc"/>
+			<channel id="charger-power" typeId="charger-power"/>
+			<channel id="discharger-power" typeId="discharger-power"/>
+			<channel id="emergency-power-mode" typeId="emergency-power-mode"/>
+			<channel id="consumption-active-power" typeId="consumption-active-power"/>
+			<channel id="production-active-power" typeId="production-active-power"/>
+			<channel id="sell-to-grid-power" typeId="sell-to-grid-power"/>
+			<channel id="sell-to-grid-energy" typeId="sell-to-grid-energy"/>
+			<channel id="buy-from-grid-power" typeId="buy-from-grid-power"/>
+			<channel id="buy-from-grid-energy" typeId="buy-from-grid-energy"/>
 		</channels>
 
 		<config-description>
@@ -59,81 +59,88 @@
 	<channel-type id="state">
 		<item-type>String</item-type>
 		<label>System State</label><!-- Use uppercase words, except prepositions. 2-3 words, max 25 chars -->
-		<description>FENECON system state: Ok, Info, Warning or Fault</description>
+		<description>FENECON system state</description>
 		<category>Text</category>
-		<state readOnly="true" pattern="%s"/>
+		<state readOnly="true" pattern="%s">
+		      <options>
+                <option value="OK">Ok</option>
+                <option value="INFO">Info</option>
+                <option value="WARN">Warning</option>
+                <option value="FAULT">Fault</option>
+            </options>
+		</state>
 	</channel-type>
-	<channel-type id="lastUpdate">
+	<channel-type id="last-update">
 		<item-type>DateTime</item-type>
 		<label>Last Update</label>
 		<description>Last successful update via REST-API from the FENECON system</description>
 		<category>Time</category>
 		<state readOnly="true"></state>
 	</channel-type>
-	<channel-type id="essSoc">
+	<channel-type id="ess-soc">
 		<item-type unitHint="%">Number:Dimensionless</item-type>
 		<label>Battery State</label>
 		<description>Battery state of charge in percent</description>
 		<category>BatteryLevel</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="chargerPower">
+	<channel-type id="charger-power">
 		<item-type>Number:Power</item-type>
 		<label>Charger Power</label>
 		<description>Current charger power of energy storage system in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="dischargerPower">
+	<channel-type id="discharger-power">
 		<item-type>Number:Power</item-type>
 		<label>Discharger Power</label>
 		<description>Current discharger power of energy storage system in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="emergencyPowerMode">
+	<channel-type id="emergency-power-mode">
 		<item-type>Switch</item-type>
 		<label>Emergency Power Mode</label>
 		<description>Indicates if there is grid power is off and the emergency power mode is on.</description>
 		<category>Switch</category>
 		<state readOnly="true"/>
 	</channel-type>
-	<channel-type id="productionActivePower">
+	<channel-type id="production-active-power">
 		<item-type>Number:Power</item-type>
 		<label>Producer Power</label>
 		<description>Current active power producer load in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="sellToGridPower">
+	<channel-type id="sell-to-grid-power">
 		<item-type>Number:Power</item-type>
 		<label>Sell Grid Power</label>
 		<description>Current sell to grid exchange power in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="sellToGridEnergy">
+	<channel-type id="sell-to-grid-energy">
 		<item-type>Number:Energy</item-type>
 		<label>Sell Grid Energy</label>
 		<description>Total energy exported to the grid in watt per hour.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="consumptionActivePower">
+	<channel-type id="consumption-active-power">
 		<item-type>Number:Power</item-type>
 		<label>Consumer Power</label>
 		<description>Current active power consumer load in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="buyFromGridPower">
+	<channel-type id="buy-from-grid-power">
 		<item-type>Number:Power</item-type>
 		<label>Buy Grid Power</label>
 		<description>Current buy from grid exchange power in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="buyFromGridEnergy">
+	<channel-type id="buy-from-grid-energy">
 		<item-type>Number:Energy</item-type>
 		<label>Buy Grid Energy</label>
 		<description>Total energy imported from the grid in watt per hour.</description>

From 65187056fde73f56629eaa98fc7ca2509bb89798 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 00:42:55 +0200
Subject: [PATCH 14/36] [Review]: Change emergency-power-mode description

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index d94dbacd8b2ec..27bb941c75286 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -101,7 +101,7 @@
 	<channel-type id="emergency-power-mode">
 		<item-type>Switch</item-type>
 		<label>Emergency Power Mode</label>
-		<description>Indicates if there is grid power is off and the emergency power mode is on.</description>
+		<description>Indicates if there is no power from the grid and the emergency power mode is on.</description>
 		<category>Switch</category>
 		<state readOnly="true"/>
 	</channel-type>

From 6ac4c93f8969d4eb9d961391ae838cb15621b391 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 01:09:31 +0200
Subject: [PATCH 15/36] [Review]: Label / Naming improvements

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 53 ++++++++++---------
 .../fenecon/internal/FeneconHandler.java      | 22 ++++----
 .../resources/OH-INF/thing/thing-types.xml    | 28 +++++-----
 3 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index f52bef28334a3..b7e04912a3558 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -32,20 +32,20 @@ The FENECON Thing only needs to be configured with the `hostname`, all other par
 
 The FENECON binding currently only provides access to read out the values from the energy storage system. 
 
-| Channel                  | Type                 | Read/Write | Description                                                                 |
-|--------------------------|----------------------|------------|-----------------------------------------------------------------------------|
-| state                    | String               | R          | FENECON system state: Ok, Info, Warning or Fault                            |
-| last-update              | DateTime             | R          | Last successful update via REST-API from the FENECON system                 |
-| ess-soc                  | Number:Dimensionless | R          | Battery state of charge in percent                                          |
-| charger-power            | Number:Power         | R          | Current charger power of energy storage system in watt.                     |
-| discharger-power         | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
-| emergency-power-mode     | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
-| production-active-power  | Number:Power         | R          | Current active power producer load in watt.                                 |
-| sell-to-grid-power       | Number:Power         | R          | Current sell to grid exchange power in watt.                                |
-| sell-to-grid-energy      | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
-| consumption-active-power | Number:Power         | R          | Current active power consumer load in watt.                                 |
-| buy-from-grid-power      | Number:Power         | R          | Current buy from grid exchange power in watt.                               |
-| buy-from-grid-energy     | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
+| Channel                   | Type                 | Read/Write | Description                                                                 |
+|---------------------------|----------------------|------------|-----------------------------------------------------------------------------|
+| state                     | String               | R          | FENECON system state: Ok, Info, Warning or Fault                            |
+| last-update               | DateTime             | R          | Last successful update via REST-API from the FENECON system                 |
+| ess-soc                   | Number:Dimensionless | R          | Battery state of charge in percent                                          |
+| charger-power             | Number:Power         | R          | Current charger power of energy storage system in watt.                     |
+| discharger-power          | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
+| emergency-power-mode      | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
+| production-active-power   | Number:Power         | R          | Current active power producer load in watt.                                 |
+| export-to-grid-power      | Number:Power         | R          | Current export power to grid in watt.                                       |
+| exported-to-grid-energy   | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
+| consumption-active-power  | Number:Power         | R          | Current active power consumer load in watt.                                 |
+| import-from-grid-power    | Number:Power         | R          | Current import power from grid in watt.                                     |
+| imported-from-grid-energy | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
 
 
 ## Full Example
@@ -68,25 +68,26 @@ Group   GF_UtilityRoomSolar     "Utility room solar"  <solarplant>           (GF
 
 // FENECON items
 String               EssState               <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:fenecon:1:state"}
-DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:fenecon:1:lastUpdate"}
-Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:fenecon:1:essSoc"}
-Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:chargerPower"}
-Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:dischargerPower"}
-Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:fenecon:1:emergencyPowerMode"}
+DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:fenecon:1:last-update"}
+Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:fenecon:1:ess-soc"}
+Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:charger-power"}
+Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:discharger-power"}
+Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:fenecon:1:emergency-power-mode"}
 
-Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:productionActivePower"}
-Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:sellToGridPower"}
-Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:sellToGridEnergy"}
+Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:production-active-power"}
+Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:export-to-grid-power"}
+Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:exported-to-grid-energy"}
 
-Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:consumptionActivePower"}
-Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:buyFromGridPower"}
-Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:buyFromGridEnergy"}
+Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:consumption-active-power"}
+Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:import-from-grid-power"}
+Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:imported-from-grid-energy"}
 
-// Examples of items for calculating the energy purchased and sold. Look at the demo.rules section. 
+// Examples of items for calculating the energy purchased and sold. Look at the demo.rules section.
 Number:Currency      SoldEnergy "Total sold energy [%.2f €]"           <price> (GF_UtilityRoomSolar)
 Number:Currency      PurchasedEnergy "Total purchased energy [%.2f €]" <price> (GF_UtilityRoomSolar)
 
 
+
 ```
 
 ### demo.sitemap
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 7486d97211c0a..7736b9c5ef6c7 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -135,7 +135,7 @@ private void pollingCode() {
         }
 
         // Set last successful update cycle
-        updateState("lastUpdate", new DateTimeType());
+        updateState("last-update", new DateTimeType());
     }
 
     private void processDataPoint(JsonObject response) {
@@ -154,13 +154,13 @@ private void processDataPoint(JsonObject response) {
                 updateState("state", new StringType(text.substring(begin + 2, end)));
                 break;
             case "_sum/EssSoc":
-                updateState("essSoc", new QuantityType<>(Integer.valueOf(value), Units.PERCENT));
+                updateState("ess-soc", new QuantityType<>(Integer.valueOf(value), Units.PERCENT));
                 break;
             case "_sum/ConsumptionActivePower":
-                updateState("consumptionActivePower", new QuantityType<>(Integer.valueOf(value), Units.WATT));
+                updateState("consumption-active-power", new QuantityType<>(Integer.valueOf(value), Units.WATT));
                 break;
             case "_sum/ProductionActivePower":
-                updateState("productionActivePower", new QuantityType<>(Integer.valueOf(value), Units.WATT));
+                updateState("production-active-power", new QuantityType<>(Integer.valueOf(value), Units.WATT));
                 break;
             case "_sum/GridActivePower":
                 // Grid exchange power. Negative values for sell-to-grid; positive for buy-from-grid"
@@ -172,8 +172,8 @@ private void processDataPoint(JsonObject response) {
                 } else {
                     buyFromGridPower = gridValue;
                 }
-                updateState("sellToGridPower", new QuantityType<>(selltoGridPower, Units.WATT));
-                updateState("buyFromGridPower", new QuantityType<>(buyFromGridPower, Units.WATT));
+                updateState("export-to-grid-power", new QuantityType<>(selltoGridPower, Units.WATT));
+                updateState("import-from-grid-power", new QuantityType<>(buyFromGridPower, Units.WATT));
                 break;
             case "_sum/EssDischargePower":
                 // Actual AC-side battery discharge power of Energy Storage System.
@@ -186,21 +186,21 @@ private void processDataPoint(JsonObject response) {
                 } else {
                     dischargerPower = powerValue;
                 }
-                updateState("chargerPower", new QuantityType<>(chargerPower, Units.WATT));
-                updateState("dischargerPower", new QuantityType<>(dischargerPower, Units.WATT));
+                updateState("charger-power", new QuantityType<>(chargerPower, Units.WATT));
+                updateState("discharger-power", new QuantityType<>(dischargerPower, Units.WATT));
                 break;
             case "_sum/GridMode":
                 // text":"1:On-Grid, 2:Off-Grid","unit":"","value":1
                 Integer gridMod = Integer.valueOf(value);
-                updateState("emergencyPowerMode", gridMod == 2 ? OnOffType.ON : OnOffType.OFF);
+                updateState("emergency-power-mode", gridMod == 2 ? OnOffType.ON : OnOffType.OFF);
                 break;
             case "_sum/GridSellActiveEnergy":
                 // {"address":"_sum/GridSellActiveEnergy","type":"LONG","accessMode":"RO","text":"","unit":"Wh_Σ","value":374242}
-                updateState("sellToGridEnergy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
+                updateState("exported-to-grid-energy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
                 break;
             case "_sum/GridBuyActiveEnergy":
                 // "address":"_sum/GridBuyActiveEnergy","type":"LONG","accessMode":"RO","text":"","unit":"Wh_Σ","value":1105}
-                updateState("buyFromGridEnergy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
+                updateState("imported-from-grid-energy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
                 break;
         }
     }
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index 27bb941c75286..5a96fbea354b0 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -20,10 +20,10 @@
 			<channel id="emergency-power-mode" typeId="emergency-power-mode"/>
 			<channel id="consumption-active-power" typeId="consumption-active-power"/>
 			<channel id="production-active-power" typeId="production-active-power"/>
-			<channel id="sell-to-grid-power" typeId="sell-to-grid-power"/>
-			<channel id="sell-to-grid-energy" typeId="sell-to-grid-energy"/>
-			<channel id="buy-from-grid-power" typeId="buy-from-grid-power"/>
-			<channel id="buy-from-grid-energy" typeId="buy-from-grid-energy"/>
+			<channel id="export-to-grid-power" typeId="export-to-grid-power"/>
+			<channel id="exported-to-grid-energy" typeId="exported-to-grid-energy"/>
+			<channel id="import-from-grid-power" typeId="import-from-grid-power"/>
+			<channel id="imported-from-grid-energy" typeId="imported-from-grid-energy"/>
 		</channels>
 
 		<config-description>
@@ -112,16 +112,16 @@
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="sell-to-grid-power">
+	<channel-type id="export-to-grid-power">
 		<item-type>Number:Power</item-type>
-		<label>Sell Grid Power</label>
-		<description>Current sell to grid exchange power in watt.</description>
+		<label>Export Grid Power</label>
+		<description>Current export power to grid in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="sell-to-grid-energy">
+	<channel-type id="exported-to-grid-energy">
 		<item-type>Number:Energy</item-type>
-		<label>Sell Grid Energy</label>
+		<label>Exported Grid Energy</label>
 		<description>Total energy exported to the grid in watt per hour.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
@@ -133,16 +133,16 @@
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="buy-from-grid-power">
+	<channel-type id="import-from-grid-power">
 		<item-type>Number:Power</item-type>
-		<label>Buy Grid Power</label>
-		<description>Current buy from grid exchange power in watt.</description>
+		<label>Import Grid Power</label>
+		<description>Current import power from grid in watt.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
-	<channel-type id="buy-from-grid-energy">
+	<channel-type id="imported-from-grid-energy">
 		<item-type>Number:Energy</item-type>
-		<label>Buy Grid Energy</label>
+		<label>Imported Grid Energy</label>
 		<description>Total energy imported from the grid in watt per hour.</description>
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>

From d013bf492244ca517d6bc8be7b3b5ab1f13a8be8 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 01:12:31 +0200
Subject: [PATCH 16/36] [Review]: Add default translation file

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../resources/OH-INF/i18n/fenecon.properties  | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
index 1e0ca6a5f2c37..f750a07589a12 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
@@ -1 +1,51 @@
-# 
+# add-on
+
+addon.fenecon.name = FENECON Home Binding
+addon.fenecon.description = This is the binding for FENECON Home.
+
+# thing types
+
+thing-type.fenecon.fenecon.label = FENECON Home
+thing-type.fenecon.fenecon.description = Thing for FENECON Home Device
+
+# thing types config
+
+thing-type.config.fenecon.fenecon.hostname.label = Hostname
+thing-type.config.fenecon.fenecon.hostname.description = Hostname or IP address of the FENECON device, e.g. 192.168.1.11
+thing-type.config.fenecon.fenecon.password.label = Password
+thing-type.config.fenecon.fenecon.password.description = Password to access the device. The password for guest access is set by default.
+thing-type.config.fenecon.fenecon.port.label = Port
+thing-type.config.fenecon.fenecon.port.description = Port of the FENECON device
+thing-type.config.fenecon.fenecon.refreshInterval.label = Refresh Interval
+thing-type.config.fenecon.fenecon.refreshInterval.description = Interval the device is polled in sec.
+
+# channel types
+
+channel-type.fenecon.charger-power.label = Charger Power
+channel-type.fenecon.charger-power.description = Current charger power of energy storage system in watt.
+channel-type.fenecon.consumption-active-power.label = Consumer Power
+channel-type.fenecon.consumption-active-power.description = Current active power consumer load in watt.
+channel-type.fenecon.discharger-power.label = Discharger Power
+channel-type.fenecon.discharger-power.description = Current discharger power of energy storage system in watt.
+channel-type.fenecon.emergency-power-mode.label = Emergency Power Mode
+channel-type.fenecon.emergency-power-mode.description = Indicates if there is no power from the grid and the emergency power mode is on.
+channel-type.fenecon.ess-soc.label = Battery State
+channel-type.fenecon.ess-soc.description = Battery state of charge in percent
+channel-type.fenecon.export-to-grid-power.label = Export Grid Power
+channel-type.fenecon.export-to-grid-power.description = Current export power to grid in watt.
+channel-type.fenecon.exported-to-grid-energy.label = Exported Grid Energy
+channel-type.fenecon.exported-to-grid-energy.description = Total energy exported to the grid in watt per hour.
+channel-type.fenecon.import-from-grid-power.label = Import Grid Power
+channel-type.fenecon.import-from-grid-power.description = Current import power from grid in watt.
+channel-type.fenecon.imported-from-grid-energy.label = Imported Grid Energy
+channel-type.fenecon.imported-from-grid-energy.description = Total energy imported from the grid in watt per hour.
+channel-type.fenecon.last-update.label = Last Update
+channel-type.fenecon.last-update.description = Last successful update via REST-API from the FENECON system
+channel-type.fenecon.production-active-power.label = Producer Power
+channel-type.fenecon.production-active-power.description = Current active power producer load in watt.
+channel-type.fenecon.state.label = System State
+channel-type.fenecon.state.description = FENECON system state
+channel-type.fenecon.state.state.option.OK = Ok
+channel-type.fenecon.state.state.option.INFO = Info
+channel-type.fenecon.state.state.option.WARN = Warning
+channel-type.fenecon.state.state.option.FAULT = Fault

From f71601705c2c1a67d0c3be7eb29c8b5cd8c9c821 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 01:34:54 +0200
Subject: [PATCH 17/36] [Review]: Change thing type id

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 30 +++++++++----------
 .../internal/FeneconBindingConstants.java     |  2 +-
 .../resources/OH-INF/i18n/fenecon.properties  | 20 ++++++-------
 .../resources/OH-INF/thing/thing-types.xml    | 14 ++++-----
 4 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index b7e04912a3558..a94bea888e6cc 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -8,7 +8,7 @@ This makes it possible, for example, to switch on other consumers such as the di
 
 ## Supported Things
 
-Only one Thing is supported: The `fenecon` device.
+Currently only one Thing is supported: The `rest-api` device connection to the FENECON energy storage system.
 
 This Binding was tested with an [FENECON HOME 10](https://fenecon.de/fenecon-home-10/) device.
 
@@ -53,7 +53,7 @@ The FENECON binding currently only provides access to read out the values from t
 ### fenecon.things
 
 ```java
-Thing fenecon:fenecon:1 "FENECON Home" [hostname="192.168.1.11", refreshInterval=5]
+Thing fenecon:rest-api:local "FENECON Home" [hostname="192.168.1.11", refreshInterval=5]
 ```
 
 ### demo.items
@@ -67,27 +67,25 @@ Group   GF_UtilityRoom          "Utility room"        <energy>               (Ho
 Group   GF_UtilityRoomSolar     "Utility room solar"  <solarplant>           (GF_UtilityRoom) ["Inverter"]
 
 // FENECON items
-String               EssState               <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:fenecon:1:state"}
-DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:fenecon:1:last-update"}
-Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:fenecon:1:ess-soc"}
-Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:charger-power"}
-Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:discharger-power"}
-Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:fenecon:1:emergency-power-mode"}
+String               EssState               <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:rest-api:local:state"}
+DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:rest-api:local:last-update"}
+Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:rest-api:local:ess-soc"}
+Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:charger-power"}
+Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:discharger-power"}
+Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:rest-api:local:emergency-power-mode"}
 
-Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:production-active-power"}
-Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:export-to-grid-power"}
-Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:exported-to-grid-energy"}
+Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:production-active-power"}
+Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:export-to-grid-power"}
+Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:rest-api:local:exported-to-grid-energy"}
 
-Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:consumption-active-power"}
-Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:fenecon:1:import-from-grid-power"}
-Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:fenecon:1:imported-from-grid-energy"}
+Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:consumption-active-power"}
+Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:import-from-grid-power"}
+Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:rest-api:local:imported-from-grid-energy"}
 
 // Examples of items for calculating the energy purchased and sold. Look at the demo.rules section.
 Number:Currency      SoldEnergy "Total sold energy [%.2f €]"           <price> (GF_UtilityRoomSolar)
 Number:Currency      PurchasedEnergy "Total purchased energy [%.2f €]" <price> (GF_UtilityRoomSolar)
 
-
-
 ```
 
 ### demo.sitemap
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
index 4215d79f6bec4..1233aef59df91 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -27,5 +27,5 @@ public class FeneconBindingConstants {
     private static final String BINDING_ID = "fenecon";
 
     // List of all Thing Type UIDs
-    public static final ThingTypeUID THING_TYPE_SAMPLE = new ThingTypeUID(BINDING_ID, "fenecon");
+    public static final ThingTypeUID THING_TYPE_SAMPLE = new ThingTypeUID(BINDING_ID, "rest-api");
 }
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
index f750a07589a12..d07891f9285a0 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
@@ -5,19 +5,19 @@ addon.fenecon.description = This is the binding for FENECON Home.
 
 # thing types
 
-thing-type.fenecon.fenecon.label = FENECON Home
-thing-type.fenecon.fenecon.description = Thing for FENECON Home Device
+thing-type.fenecon.rest-api.label = FENECON Home
+thing-type.fenecon.rest-api.description = Thing for FENECON Home Device
 
 # thing types config
 
-thing-type.config.fenecon.fenecon.hostname.label = Hostname
-thing-type.config.fenecon.fenecon.hostname.description = Hostname or IP address of the FENECON device, e.g. 192.168.1.11
-thing-type.config.fenecon.fenecon.password.label = Password
-thing-type.config.fenecon.fenecon.password.description = Password to access the device. The password for guest access is set by default.
-thing-type.config.fenecon.fenecon.port.label = Port
-thing-type.config.fenecon.fenecon.port.description = Port of the FENECON device
-thing-type.config.fenecon.fenecon.refreshInterval.label = Refresh Interval
-thing-type.config.fenecon.fenecon.refreshInterval.description = Interval the device is polled in sec.
+thing-type.config.fenecon.rest-api.hostname.label = Hostname
+thing-type.config.fenecon.rest-api.hostname.description = Hostname or IP address of the FENECON device, e.g. 192.168.1.11
+thing-type.config.fenecon.rest-api.password.label = Password
+thing-type.config.fenecon.rest-api.password.description = Password to access the device. The password for guest access is set by default.
+thing-type.config.fenecon.rest-api.port.label = Port
+thing-type.config.fenecon.rest-api.port.description = Port of the FENECON device
+thing-type.config.fenecon.rest-api.refreshInterval.label = Refresh Interval
+thing-type.config.fenecon.rest-api.refreshInterval.description = Interval the device is polled in sec.
 
 # channel types
 
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index 5a96fbea354b0..84d2b1c2a9d00 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -5,7 +5,7 @@
 	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
 
 	<!-- Sample Thing Type -->
-	<thing-type id="fenecon">
+	<thing-type id="rest-api">
 
 		<label>FENECON Home</label>
 		<description>Thing for FENECON Home Device</description>
@@ -62,12 +62,12 @@
 		<description>FENECON system state</description>
 		<category>Text</category>
 		<state readOnly="true" pattern="%s">
-		      <options>
-                <option value="OK">Ok</option>
-                <option value="INFO">Info</option>
-                <option value="WARN">Warning</option>
-                <option value="FAULT">Fault</option>
-            </options>
+			<options>
+				<option value="OK">Ok</option>
+				<option value="INFO">Info</option>
+				<option value="WARN">Warning</option>
+				<option value="FAULT">Fault</option>
+			</options>
 		</state>
 	</channel-type>
 	<channel-type id="last-update">

From fc1e6e5b5a76284cbf665f0fa715a1c857e88329 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 14:17:13 +0200
Subject: [PATCH 18/36] Remove comment

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../openhab/binding/fenecon/internal/FeneconConfiguration.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java
index 15769a56aa510..8a5127f5f9cfe 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconConfiguration.java
@@ -22,9 +22,6 @@
 @NonNullByDefault
 public class FeneconConfiguration {
 
-    /**
-     * Sample configuration parameters. Replace with your own.
-     */
     public String hostname = "";
     public String password = "user";
     public int port = 8084;

From 40a3199a0878fe8435cc0b53b121cbbdc6362025 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 15:20:03 +0200
Subject: [PATCH 19/36] [Review]: Seperation of concerns and extract strings as
 constants

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../internal/FeneconBindingConstants.java     |  43 ++++-
 .../fenecon/internal/FeneconHandler.java      | 160 ++++++------------
 .../internal/FeneconHandlerFactory.java       |   6 +-
 .../internal/api/FeneconController.java       | 119 +++++++++++++
 .../fenecon/internal/api/FeneconResponse.java |  21 +++
 .../FeneconAuthenticationException.java       |  30 ++++
 .../FeneconCommunicationException.java        |  34 ++++
 .../internal/exception/FeneconException.java  |  42 +++++
 8 files changed, 344 insertions(+), 111 deletions(-)
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconAuthenticationException.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconCommunicationException.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconException.java

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
index 1233aef59df91..c931099accdb8 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -12,6 +12,8 @@
  */
 package org.openhab.binding.fenecon.internal;
 
+import java.util.List;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.thing.ThingTypeUID;
 
@@ -27,5 +29,44 @@ public class FeneconBindingConstants {
     private static final String BINDING_ID = "fenecon";
 
     // List of all Thing Type UIDs
-    public static final ThingTypeUID THING_TYPE_SAMPLE = new ThingTypeUID(BINDING_ID, "rest-api");
+    public static final ThingTypeUID THING_TYPE_RESTAPI = new ThingTypeUID(BINDING_ID, "rest-api");
+
+    // List of all FENECON Addresses
+    public static final String STATE_ADDRESS = "_sum/State";
+    public static final String ESS_SOC_ADDRESS = "_sum/EssSoc";
+    public static final String CONSUMPTION_ACTIVE_POWER_ADDRESS = "_sum/ConsumptionActivePower";
+    public static final String PRODUCTION_ACTIVE_POWER_ADDRESS = "_sum/ProductionActivePower";
+    public static final String GRID_ACTIVE_POWER_ADDRESS = "_sum/GridActivePower";
+    public static final String ESS_DISCHARGE_POWER_ADDRESS = "_sum/EssDischargePower";
+    public static final String GRID_MODE_ADDRESS = "_sum/GridMode";
+    public static final String GRID_SELL_ACTIVE_ENERGY_ADDRESS = "_sum/GridSellActiveEnergy";
+    public static final String GRID_BUY_ACTIVE_ENERGY_ADDRESS = "_sum/GridBuyActiveEnergy";
+    // Group of all FENECON Addresses
+    public static final List<String> ADDRESSES = List.of(GRID_MODE_ADDRESS, STATE_ADDRESS, ESS_SOC_ADDRESS,
+            CONSUMPTION_ACTIVE_POWER_ADDRESS, PRODUCTION_ACTIVE_POWER_ADDRESS, GRID_ACTIVE_POWER_ADDRESS,
+            ESS_DISCHARGE_POWER_ADDRESS, GRID_BUY_ACTIVE_ENERGY_ADDRESS, GRID_SELL_ACTIVE_ENERGY_ADDRESS);
+
+    // List of all Channel IDs
+    public static final String STATE_CHANNEL = "state";
+    public static final String ESS_SOC_CHANNEL = "ess-soc";
+    public static final String CONSUMPTION_ACTIVE_POWER_CHANNEL = "consumption-active-power";
+    public static final String PRODUCTION_ACTIVE_POWER_CHANNEL = "production-active-power";
+    public static final String EXPORT_TO_GRID_POWER_CHANNEL = "export-to-grid-power";
+    public static final String IMPORT_FROM_GRID_POWER_CHANNEL = "import-from-grid-power";
+    public static final String ESS_CHARGER_POWER_CHANNEL = "charger-power";
+    public static final String ESS_DISCHARGER_POWER_CHANNEL = "discharger-power";
+    public static final String EMERGENCY_POWER_MODE_CHANNEL = "emergency-power-mode";
+    public static final String EXPORTED_TO_GRID_ENERGY_CHANNEL = "exported-to-grid-energy";
+    public static final String IMPORTED_FROM_GRID_ENERGY_CHANNEL = "imported-from-grid-energy";
+    public static final String LAST_UPDATE_CHANNEL = "last-update";
+
+    /*
+     * <channel id="charger-power" typeId="charger-power"/>
+     * <channel id="discharger-power" typeId="discharger-power"/>
+     * <channel id="emergency-power-mode" typeId="emergency-power-mode"/>
+     * <channel id="export-to-grid-power" typeId="export-to-grid-power"/>
+     * <channel id="exported-to-grid-energy" typeId="exported-to-grid-energy"/>
+     * <channel id="import-from-grid-power" typeId="import-from-grid-power"/>
+     * <channel id="imported-from-grid-energy" typeId="imported-from-grid-energy"/>
+     */
 }
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 7736b9c5ef6c7..e6ffd1ff55a46 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -12,22 +12,14 @@
  */
 package org.openhab.binding.fenecon.internal;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpRequest.Builder;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.time.Duration;
-import java.util.Base64;
-import java.util.List;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.binding.fenecon.internal.api.FeneconController;
+import org.openhab.binding.fenecon.internal.api.FeneconResponse;
+import org.openhab.binding.fenecon.internal.exception.FeneconException;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.QuantityType;
@@ -43,10 +35,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
-
 /**
  * The {@link FeneconHandler} is responsible for handling commands, which are
  * sent to one of the channels.
@@ -60,74 +48,31 @@ public class FeneconHandler extends BaseThingHandler {
 
     private FeneconConfiguration config = new FeneconConfiguration();
     private @Nullable ScheduledFuture<?> pollingJob;
-
-    private final List<String> channels = List.of("GridMode", "State", "EssSoc", "ConsumptionActivePower",
-            "ProductionActivePower", "GridActivePower", "EssDischargePower", "GridBuyActiveEnergy",
-            "GridSellActiveEnergy");
-
-    private final HttpClient httpClient;
-    private @Nullable Builder baseHttpRequest;
+    private @Nullable FeneconController feneconController;
 
     public FeneconHandler(Thing thing) {
         super(thing);
-        httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
     }
 
     @Override
     public void initialize() {
         config = getConfigAs(FeneconConfiguration.class);
 
-        logger.debug("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(config),
-                config.refreshInterval);
-
         updateStatus(ThingStatus.UNKNOWN);
 
-        baseHttpRequest = createBaseHttpRequest(config);
+        feneconController = new FeneconController(config);
         pollingJob = scheduler.scheduleWithFixedDelay(this::pollingCode, 0, config.refreshInterval, TimeUnit.SECONDS);
     }
 
-    private static final String getBasicAuthHeader(String username, String password) {
-        String valueToEncode = username + ":" + password;
-        return "Basic " + Base64.getEncoder().encodeToString(valueToEncode.getBytes());
-    }
-
-    private String getBaseUrl(FeneconConfiguration config) {
-        return "http://" + config.hostname + ":" + config.port + "/";
-    }
-
-    private Builder createBaseHttpRequest(FeneconConfiguration config) {
-        String basicAuth = getBasicAuthHeader("x", config.password);
-        return HttpRequest.newBuilder().timeout(Duration.ofSeconds(5)).header("Authorization", basicAuth)
-                .header("Content-Type", "application/json").GET();
-    }
-
     private void pollingCode() {
-        for (String eachChannel : channels) {
+        for (String eachChannel : FeneconBindingConstants.ADDRESSES) {
             try {
                 @SuppressWarnings("null")
-                HttpRequest request = baseHttpRequest
-                        .uri(new URI(getBaseUrl(config) + "rest/channel/_sum/" + eachChannel)).build();
-                logger.trace("FENECON - request: {}", request);
-
-                HttpResponse<String> response = httpClient.send(request, BodyHandlers.ofString());
-                logger.trace("FENECON - response status code: {} body: {}", response.statusCode(), response.body());
-
-                if (response.statusCode() > 300) {
-                    // Authentication error
-                    if (response.statusCode() == 401) {
-                        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
-                                parseFeneconError(response));
-                        return;
-                    } else {
-                        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
-                                "http status code: " + response.statusCode());
-                        return;
-                    }
-                } else {
-                    processDataPoint(JsonParser.parseString(response.body()).getAsJsonObject());
-                    updateStatus(ThingStatus.ONLINE);
-                }
-            } catch (URISyntaxException | JsonSyntaxException | IOException | InterruptedException err) {
+                FeneconResponse response = feneconController.requestChannel(eachChannel);
+
+                processDataPoint(response);
+                updateStatus(ThingStatus.ONLINE);
+            } catch (FeneconException err) {
                 logger.trace("FENECON - connection problem on FENECON channel {}", eachChannel, err);
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR, err.getMessage());
                 return;
@@ -135,36 +80,35 @@ private void pollingCode() {
         }
 
         // Set last successful update cycle
-        updateState("last-update", new DateTimeType());
+        updateState(FeneconBindingConstants.LAST_UPDATE_CHANNEL, new DateTimeType());
     }
 
-    private void processDataPoint(JsonObject response) {
-        // Example: {"address":"_sum/EssSoc","type":"INTEGER","accessMode":"RO","text":"Range
-        // 0..100","unit":"%","value":99}
-        String address = response.get("address").getAsString();
-        String text = response.get("text").getAsString();
-        String value = response.get("value").getAsString();
+    private void processDataPoint(FeneconResponse response) throws FeneconException {
 
-        switch (address) {
-            case "_sum/State":
+        switch (response.address()) {
+            case FeneconBindingConstants.STATE_ADDRESS:
                 // {"address":"_sum/State","type":"INTEGER","accessMode":"RO","text":"0:Ok, 1:Info, 2:Warning,
                 // 3:Fault","unit":"","value":0}
-                int begin = text.indexOf(value + ":");
-                int end = text.indexOf(",", begin);
-                updateState("state", new StringType(text.substring(begin + 2, end)));
+                int begin = response.text().indexOf(response.value() + ":");
+                int end = response.text().indexOf(",", begin);
+                updateState(FeneconBindingConstants.STATE_CHANNEL,
+                        new StringType(response.text().substring(begin + 2, end)));
                 break;
-            case "_sum/EssSoc":
-                updateState("ess-soc", new QuantityType<>(Integer.valueOf(value), Units.PERCENT));
+            case FeneconBindingConstants.ESS_SOC_ADDRESS:
+                updateState(FeneconBindingConstants.ESS_SOC_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.PERCENT));
                 break;
-            case "_sum/ConsumptionActivePower":
-                updateState("consumption-active-power", new QuantityType<>(Integer.valueOf(value), Units.WATT));
+            case FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_ADDRESS:
+                updateState(FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
                 break;
-            case "_sum/ProductionActivePower":
-                updateState("production-active-power", new QuantityType<>(Integer.valueOf(value), Units.WATT));
+            case FeneconBindingConstants.PRODUCTION_ACTIVE_POWER_ADDRESS:
+                updateState(FeneconBindingConstants.PRODUCTION_ACTIVE_POWER_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
                 break;
-            case "_sum/GridActivePower":
+            case FeneconBindingConstants.GRID_ACTIVE_POWER_ADDRESS:
                 // Grid exchange power. Negative values for sell-to-grid; positive for buy-from-grid"
-                Integer gridValue = Integer.valueOf(value);
+                Integer gridValue = Integer.valueOf(response.value());
                 int selltoGridPower = 0;
                 int buyFromGridPower = 0;
                 if (gridValue < 0) {
@@ -172,13 +116,15 @@ private void processDataPoint(JsonObject response) {
                 } else {
                     buyFromGridPower = gridValue;
                 }
-                updateState("export-to-grid-power", new QuantityType<>(selltoGridPower, Units.WATT));
-                updateState("import-from-grid-power", new QuantityType<>(buyFromGridPower, Units.WATT));
+                updateState(FeneconBindingConstants.EXPORT_TO_GRID_POWER_CHANNEL,
+                        new QuantityType<>(selltoGridPower, Units.WATT));
+                updateState(FeneconBindingConstants.IMPORT_FROM_GRID_POWER_CHANNEL,
+                        new QuantityType<>(buyFromGridPower, Units.WATT));
                 break;
-            case "_sum/EssDischargePower":
+            case FeneconBindingConstants.ESS_DISCHARGE_POWER_ADDRESS:
                 // Actual AC-side battery discharge power of Energy Storage System.
                 // Negative values for charge; positive for discharge
-                Integer powerValue = Integer.valueOf(value);
+                Integer powerValue = Integer.valueOf(response.value());
                 int chargerPower = 0;
                 int dischargerPower = 0;
                 if (powerValue < 0) {
@@ -186,33 +132,33 @@ private void processDataPoint(JsonObject response) {
                 } else {
                     dischargerPower = powerValue;
                 }
-                updateState("charger-power", new QuantityType<>(chargerPower, Units.WATT));
-                updateState("discharger-power", new QuantityType<>(dischargerPower, Units.WATT));
+                updateState(FeneconBindingConstants.ESS_CHARGER_POWER_CHANNEL,
+                        new QuantityType<>(chargerPower, Units.WATT));
+                updateState(FeneconBindingConstants.ESS_DISCHARGER_POWER_CHANNEL,
+                        new QuantityType<>(dischargerPower, Units.WATT));
                 break;
-            case "_sum/GridMode":
+            case FeneconBindingConstants.GRID_MODE_ADDRESS:
                 // text":"1:On-Grid, 2:Off-Grid","unit":"","value":1
-                Integer gridMod = Integer.valueOf(value);
-                updateState("emergency-power-mode", gridMod == 2 ? OnOffType.ON : OnOffType.OFF);
+                Integer gridMod = Integer.valueOf(response.value());
+                updateState(FeneconBindingConstants.EMERGENCY_POWER_MODE_CHANNEL,
+                        gridMod == 2 ? OnOffType.ON : OnOffType.OFF);
                 break;
-            case "_sum/GridSellActiveEnergy":
+            case FeneconBindingConstants.GRID_SELL_ACTIVE_ENERGY_ADDRESS:
                 // {"address":"_sum/GridSellActiveEnergy","type":"LONG","accessMode":"RO","text":"","unit":"Wh_Σ","value":374242}
-                updateState("exported-to-grid-energy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
+                updateState(FeneconBindingConstants.EXPORTED_TO_GRID_ENERGY_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT_HOUR));
                 break;
-            case "_sum/GridBuyActiveEnergy":
+            case FeneconBindingConstants.GRID_BUY_ACTIVE_ENERGY_ADDRESS:
                 // "address":"_sum/GridBuyActiveEnergy","type":"LONG","accessMode":"RO","text":"","unit":"Wh_Σ","value":1105}
-                updateState("imported-from-grid-energy", new QuantityType<>(Integer.valueOf(value), Units.WATT_HOUR));
+                updateState(FeneconBindingConstants.IMPORTED_FROM_GRID_ENERGY_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT_HOUR));
+                break;
+            default:
+                logger.trace("FENECON - No channel id to address {} found.", response.address());
                 break;
         }
     }
 
-    private String parseFeneconError(HttpResponse<String> response) {
-        // Example error Response
-        // {"jsonrpc":"2.0","id":"00000000-0000-0000-0000-000000000000","error":{"code":1003,"message":"Authentication
-        // failed","data":[]}}
-        JsonObject jsonObject = JsonParser.parseString(response.body()).getAsJsonObject();
-        return jsonObject.getAsJsonObject("error").get("message").getAsString();
-    }
-
     @Override
     public void dispose() {
         ScheduledFuture<?> job = pollingJob;
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
index 762c272ddae5e..44a44f32f0586 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.fenecon.internal;
 
-import static org.openhab.binding.fenecon.internal.FeneconBindingConstants.THING_TYPE_SAMPLE;
+import static org.openhab.binding.fenecon.internal.FeneconBindingConstants.THING_TYPE_RESTAPI;
 
 import java.util.Set;
 
@@ -35,7 +35,7 @@
 @Component(configurationPid = "binding.fenecon", service = ThingHandlerFactory.class)
 public class FeneconHandlerFactory extends BaseThingHandlerFactory {
 
-    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_SAMPLE);
+    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_RESTAPI);
 
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {
@@ -46,7 +46,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
     protected @Nullable ThingHandler createHandler(Thing thing) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
-        if (THING_TYPE_SAMPLE.equals(thingTypeUID)) {
+        if (THING_TYPE_RESTAPI.equals(thingTypeUID)) {
             return new FeneconHandler(thing);
         }
 
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
new file mode 100644
index 0000000000000..99e61778ddd72
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.Builder;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.util.Base64;
+
+import org.openhab.binding.fenecon.internal.FeneconConfiguration;
+import org.openhab.binding.fenecon.internal.exception.FeneconAuthenticationException;
+import org.openhab.binding.fenecon.internal.exception.FeneconCommunicationException;
+import org.openhab.binding.fenecon.internal.exception.FeneconException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+
+/**
+ * The {@link FeneconController} class provides API access to the FENECON system.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+public class FeneconController {
+
+    private final Logger logger = LoggerFactory.getLogger(FeneconController.class);
+
+    private final FeneconConfiguration config;
+    private final HttpClient httpClient;
+    private final Builder baseHttpRequest;
+
+    public FeneconController(FeneconConfiguration config) {
+        this.config = config;
+
+        logger.debug("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(config),
+                config.refreshInterval);
+
+        httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
+        baseHttpRequest = createBaseHttpRequest(config);
+    }
+
+    private String getBasicAuthHeader(String username, String password) {
+        String valueToEncode = username + ":" + password;
+        return "Basic " + Base64.getEncoder().encodeToString(valueToEncode.getBytes());
+    }
+
+    private String getBaseUrl(FeneconConfiguration config) {
+        return "http://" + config.hostname + ":" + config.port + "/";
+    }
+
+    private Builder createBaseHttpRequest(FeneconConfiguration config) {
+        String basicAuth = getBasicAuthHeader("x", config.password);
+        return HttpRequest.newBuilder().timeout(Duration.ofSeconds(5)).header("Authorization", basicAuth)
+                .header("Content-Type", "application/json").GET();
+    }
+
+    /**
+     * Queries the data for a specified channel.
+     *
+     * @param channel Channel to be queried, e.g. _sum/State .
+     * @return {@link FeneconResponse}
+     * @throws FeneconException is thrown if there are problems with the connection or processing of data to the FENECON
+     *             system.
+     */
+    public FeneconResponse requestChannel(String channel) throws FeneconException {
+        try {
+            HttpRequest request = baseHttpRequest.uri(new URI(getBaseUrl(config) + "rest/channel/" + channel)).build();
+            logger.trace("FENECON - request: {}", request);
+
+            HttpResponse<String> response = httpClient.send(request, BodyHandlers.ofString());
+            logger.trace("FENECON - response status code: {} body: {}", response.statusCode(), response.body());
+
+            int statusCode = response.statusCode();
+            if (statusCode > 300) {
+                // Authentication error
+                if (statusCode == 401) {
+                    throw new FeneconAuthenticationException(
+                            "Authentication on the FENECON system was not possible. Check password.");
+                } else {
+                    throw new FeneconCommunicationException("Unexpected http status code: " + statusCode);
+                }
+            } else {
+                return createResponseFromJson(JsonParser.parseString(response.body()).getAsJsonObject());
+            }
+        } catch (IOException | InterruptedException err) {
+            throw new FeneconCommunicationException("Communication error with FENECON system", err);
+        } catch (URISyntaxException | JsonSyntaxException err) {
+            throw new FeneconCommunicationException("Syntax error", err);
+        }
+    }
+
+    private FeneconResponse createResponseFromJson(JsonObject response) {
+        // Example response: {"address":"_sum/EssSoc","type":"INTEGER","accessMode":"RO","text":"Range
+        // 0..100","unit":"%","value":99}
+        String address = response.get("address").getAsString();
+        String text = response.get("text").getAsString();
+        String value = response.get("value").getAsString();
+
+        return new FeneconResponse(address, text, value);
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java
new file mode 100644
index 0000000000000..80d7960cb0f5b
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+/**
+ * The {@link FeneconResponse} class provides the response from the FENECON system.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+public record FeneconResponse(String address, String text, String value) {
+};
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconAuthenticationException.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconAuthenticationException.java
new file mode 100644
index 0000000000000..de93031d26026
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconAuthenticationException.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.exception;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The class {@link FeneconAuthenticationException} is thrown if a authentication on the FENECON system is not possible.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class FeneconAuthenticationException extends FeneconException {
+
+    private static final long serialVersionUID = -9206453599559316730L;
+
+    public FeneconAuthenticationException(String message) {
+        super(message);
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconCommunicationException.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconCommunicationException.java
new file mode 100644
index 0000000000000..6099170f04cec
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconCommunicationException.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.exception;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The class {@link FeneconCommunicationException} is thrown if a communication problem occurs with the FENECON system.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class FeneconCommunicationException extends FeneconException {
+
+    private static final long serialVersionUID = -4334759327203382902L;
+
+    public FeneconCommunicationException(String message) {
+        super(message);
+    }
+
+    public FeneconCommunicationException(String message, Exception exception) {
+        super(message, exception);
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconException.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconException.java
new file mode 100644
index 0000000000000..ffad81841b1a2
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/exception/FeneconException.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.exception;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link FeneconException} class provides general exception for this binding.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class FeneconException extends Exception {
+
+    private static final long serialVersionUID = 4454633961827361165L;
+
+    public FeneconException() {
+        // noop
+    }
+
+    public FeneconException(String message) {
+        super(message);
+    }
+
+    public FeneconException(Exception exception) {
+        super(exception);
+    }
+
+    public FeneconException(String message, Exception exception) {
+        super(message, exception);
+    }
+}

From 1f472f808d780de6b9038bbc24088a1c90ec1733 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 15:45:28 +0200
Subject: [PATCH 20/36] Small refactorings for converting values.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../fenecon/internal/FeneconHandler.java      | 39 +++++++------------
 .../fenecon/internal/api/BatteryPower.java    | 36 +++++++++++++++++
 .../fenecon/internal/api/GridPower.java       | 35 +++++++++++++++++
 .../binding/fenecon/internal/api/State.java   | 29 ++++++++++++++
 4 files changed, 114 insertions(+), 25 deletions(-)
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index e6ffd1ff55a46..eef26e3e5b2a9 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -17,8 +17,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.binding.fenecon.internal.api.BatteryPower;
 import org.openhab.binding.fenecon.internal.api.FeneconController;
 import org.openhab.binding.fenecon.internal.api.FeneconResponse;
+import org.openhab.binding.fenecon.internal.api.GridPower;
+import org.openhab.binding.fenecon.internal.api.State;
 import org.openhab.binding.fenecon.internal.exception.FeneconException;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.OnOffType;
@@ -89,10 +92,8 @@ private void processDataPoint(FeneconResponse response) throws FeneconException
             case FeneconBindingConstants.STATE_ADDRESS:
                 // {"address":"_sum/State","type":"INTEGER","accessMode":"RO","text":"0:Ok, 1:Info, 2:Warning,
                 // 3:Fault","unit":"","value":0}
-                int begin = response.text().indexOf(response.value() + ":");
-                int end = response.text().indexOf(",", begin);
-                updateState(FeneconBindingConstants.STATE_CHANNEL,
-                        new StringType(response.text().substring(begin + 2, end)));
+                State state = State.get(response);
+                updateState(FeneconBindingConstants.STATE_CHANNEL, new StringType(state.state()));
                 break;
             case FeneconBindingConstants.ESS_SOC_ADDRESS:
                 updateState(FeneconBindingConstants.ESS_SOC_CHANNEL,
@@ -108,34 +109,22 @@ private void processDataPoint(FeneconResponse response) throws FeneconException
                 break;
             case FeneconBindingConstants.GRID_ACTIVE_POWER_ADDRESS:
                 // Grid exchange power. Negative values for sell-to-grid; positive for buy-from-grid"
-                Integer gridValue = Integer.valueOf(response.value());
-                int selltoGridPower = 0;
-                int buyFromGridPower = 0;
-                if (gridValue < 0) {
-                    selltoGridPower = gridValue * -1;
-                } else {
-                    buyFromGridPower = gridValue;
-                }
+                GridPower gridPower = GridPower.get(response);
+
                 updateState(FeneconBindingConstants.EXPORT_TO_GRID_POWER_CHANNEL,
-                        new QuantityType<>(selltoGridPower, Units.WATT));
+                        new QuantityType<>(gridPower.sellTo(), Units.WATT));
                 updateState(FeneconBindingConstants.IMPORT_FROM_GRID_POWER_CHANNEL,
-                        new QuantityType<>(buyFromGridPower, Units.WATT));
+                        new QuantityType<>(gridPower.buyFrom(), Units.WATT));
                 break;
             case FeneconBindingConstants.ESS_DISCHARGE_POWER_ADDRESS:
                 // Actual AC-side battery discharge power of Energy Storage System.
                 // Negative values for charge; positive for discharge
-                Integer powerValue = Integer.valueOf(response.value());
-                int chargerPower = 0;
-                int dischargerPower = 0;
-                if (powerValue < 0) {
-                    chargerPower = powerValue * -1;
-                } else {
-                    dischargerPower = powerValue;
-                }
+                BatteryPower batteryPower = BatteryPower.get(response);
+
                 updateState(FeneconBindingConstants.ESS_CHARGER_POWER_CHANNEL,
-                        new QuantityType<>(chargerPower, Units.WATT));
+                        new QuantityType<>(batteryPower.chargerPower(), Units.WATT));
                 updateState(FeneconBindingConstants.ESS_DISCHARGER_POWER_CHANNEL,
-                        new QuantityType<>(dischargerPower, Units.WATT));
+                        new QuantityType<>(batteryPower.dischargerPower(), Units.WATT));
                 break;
             case FeneconBindingConstants.GRID_MODE_ADDRESS:
                 // text":"1:On-Grid, 2:Off-Grid","unit":"","value":1
@@ -154,7 +143,7 @@ private void processDataPoint(FeneconResponse response) throws FeneconException
                         new QuantityType<>(Integer.valueOf(response.value()), Units.WATT_HOUR));
                 break;
             default:
-                logger.trace("FENECON - No channel id to address {} found.", response.address());
+                logger.trace("FENECON - No channel ID to address {} found.", response.address());
                 break;
         }
     }
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java
new file mode 100644
index 0000000000000..1393efcad73f9
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+/**
+ * The {@link BatteryPower} is a small helper class to convert the power value from battery.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+public record BatteryPower(int chargerPower, int dischargerPower) {
+
+    public static BatteryPower get(FeneconResponse response) {
+        // Actual AC-side battery discharge power of Energy Storage System.
+        // Negative values for charge; positive for discharge
+        Integer powerValue = Integer.valueOf(response.value());
+        int chargerPower = 0;
+        int dischargerPower = 0;
+        if (powerValue < 0) {
+            chargerPower = powerValue * -1;
+        } else {
+            dischargerPower = powerValue;
+        }
+
+        return new BatteryPower(chargerPower, dischargerPower);
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java
new file mode 100644
index 0000000000000..28607faf8451f
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+/**
+ * The {@link GridPower} is a small helper class to convert the grid value.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+public record GridPower(int sellTo, int buyFrom) {
+
+    public static GridPower get(FeneconResponse response) {
+        // Grid exchange power. Negative values for sell-to-grid; positive for buy-from-grid"
+        Integer gridValue = Integer.valueOf(response.value());
+        int selltoGridPower = 0;
+        int buyFromGridPower = 0;
+        if (gridValue < 0) {
+            selltoGridPower = gridValue * -1;
+        } else {
+            buyFromGridPower = gridValue;
+        }
+
+        return new GridPower(selltoGridPower, buyFromGridPower);
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java
new file mode 100644
index 0000000000000..e76fe3a2bbf21
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+/**
+ * The {@link State} is a small helper class to convert the state value.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+public record State(String state) {
+
+    public static State get(FeneconResponse response) {
+        // {"address":"_sum/State","type":"INTEGER","accessMode":"RO","text":"0:Ok, 1:Info, 2:Warning,
+        // 3:Fault","unit":"","value":0}
+        int begin = response.text().indexOf(response.value() + ":");
+        int end = response.text().indexOf(",", begin);
+        return new State(response.text().substring(begin + 2, end));
+    }
+}

From 10455d706fac7b91720b861d71057508ff24bcb2 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 16:42:26 +0200
Subject: [PATCH 21/36] Added tests.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../internal/FeneconBindingConstants.java     | 10 ---
 .../fenecon/internal/api/BatteryPower.java    |  3 +
 .../fenecon/internal/api/FeneconResponse.java |  3 +
 .../fenecon/internal/api/GridPower.java       |  3 +
 .../binding/fenecon/internal/api/State.java   | 20 +++++-
 .../internal/FeneconBindingConstantsTest.java | 48 ++++++++++++++
 .../internal/api/BatteryPowerTest.java        | 44 +++++++++++++
 .../fenecon/internal/api/GridPowerTest.java   | 44 +++++++++++++
 .../fenecon/internal/api/StateTest.java       | 63 +++++++++++++++++++
 9 files changed, 225 insertions(+), 13 deletions(-)
 create mode 100644 bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/FeneconBindingConstantsTest.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/BatteryPowerTest.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/GridPowerTest.java
 create mode 100644 bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/StateTest.java

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
index c931099accdb8..dafc6d8da9513 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -59,14 +59,4 @@ public class FeneconBindingConstants {
     public static final String EXPORTED_TO_GRID_ENERGY_CHANNEL = "exported-to-grid-energy";
     public static final String IMPORTED_FROM_GRID_ENERGY_CHANNEL = "imported-from-grid-energy";
     public static final String LAST_UPDATE_CHANNEL = "last-update";
-
-    /*
-     * <channel id="charger-power" typeId="charger-power"/>
-     * <channel id="discharger-power" typeId="discharger-power"/>
-     * <channel id="emergency-power-mode" typeId="emergency-power-mode"/>
-     * <channel id="export-to-grid-power" typeId="export-to-grid-power"/>
-     * <channel id="exported-to-grid-energy" typeId="exported-to-grid-energy"/>
-     * <channel id="import-from-grid-power" typeId="import-from-grid-power"/>
-     * <channel id="imported-from-grid-energy" typeId="imported-from-grid-energy"/>
-     */
 }
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java
index 1393efcad73f9..01587ef9da628 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/BatteryPower.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.fenecon.internal.api;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link BatteryPower} is a small helper class to convert the power value from battery.
  *
  * @author Philipp Schneider - Initial contribution
  */
+@NonNullByDefault
 public record BatteryPower(int chargerPower, int dischargerPower) {
 
     public static BatteryPower get(FeneconResponse response) {
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java
index 80d7960cb0f5b..49b2943e27489 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconResponse.java
@@ -12,10 +12,13 @@
  */
 package org.openhab.binding.fenecon.internal.api;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link FeneconResponse} class provides the response from the FENECON system.
  *
  * @author Philipp Schneider - Initial contribution
  */
+@NonNullByDefault
 public record FeneconResponse(String address, String text, String value) {
 };
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java
index 28607faf8451f..9ad036522e71a 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/GridPower.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.fenecon.internal.api;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link GridPower} is a small helper class to convert the grid value.
  *
  * @author Philipp Schneider - Initial contribution
  */
+@NonNullByDefault
 public record GridPower(int sellTo, int buyFrom) {
 
     public static GridPower get(FeneconResponse response) {
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java
index e76fe3a2bbf21..4de497f819dfc 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/State.java
@@ -12,18 +12,32 @@
  */
 package org.openhab.binding.fenecon.internal.api;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link State} is a small helper class to convert the state value.
  *
  * @author Philipp Schneider - Initial contribution
  */
+@NonNullByDefault
 public record State(String state) {
 
     public static State get(FeneconResponse response) {
         // {"address":"_sum/State","type":"INTEGER","accessMode":"RO","text":"0:Ok, 1:Info, 2:Warning,
         // 3:Fault","unit":"","value":0}
-        int begin = response.text().indexOf(response.value() + ":");
-        int end = response.text().indexOf(",", begin);
-        return new State(response.text().substring(begin + 2, end));
+        String text = response.text();
+        int begin = text.indexOf(response.value() + ":");
+        int end = text.indexOf(",", begin);
+
+        // No value to text mapping
+        if (begin < 0) {
+            return new State("Unknown");
+        }
+
+        // Last text
+        if (end < 0) {
+            end = text.length();
+        }
+        return new State(text.substring(begin + 2, end));
     }
 }
diff --git a/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/FeneconBindingConstantsTest.java b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/FeneconBindingConstantsTest.java
new file mode 100644
index 0000000000000..01d67c89bff23
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/FeneconBindingConstantsTest.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test for {@link FeneconBindingConstants}.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class FeneconBindingConstantsTest {
+
+    @Test
+    void checkAllAddressesAreListed() throws IllegalArgumentException, IllegalAccessException {
+        List<String> findAddresses = new ArrayList<>();
+
+        for (Field eachDeclaredField : FeneconBindingConstants.class.getDeclaredFields()) {
+            if (eachDeclaredField.getName().endsWith("_ADDRESS")) {
+                String address = (String) eachDeclaredField.get(FeneconBindingConstants.class);
+                if (address != null) {
+                    findAddresses.add(address);
+                }
+            }
+        }
+
+        assertEquals(FeneconBindingConstants.ADDRESSES.size(), findAddresses.size());
+        assertTrue(findAddresses.containsAll(FeneconBindingConstants.ADDRESSES));
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/BatteryPowerTest.java b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/BatteryPowerTest.java
new file mode 100644
index 0000000000000..dfa78cb49459d
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/BatteryPowerTest.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+import org.openhab.binding.fenecon.internal.FeneconBindingConstants;
+
+/**
+ * Test for {@link BatteryPower}.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class BatteryPowerTest {
+
+    @Test
+    void testCharging() {
+        BatteryPower batteryPower = BatteryPower
+                .get(new FeneconResponse(FeneconBindingConstants.ESS_DISCHARGE_POWER_ADDRESS, "comment", "-1777"));
+        assertEquals(1777, batteryPower.chargerPower());
+        assertEquals(0, batteryPower.dischargerPower());
+    }
+
+    @Test
+    void testDischarging() {
+        BatteryPower batteryPower = BatteryPower
+                .get(new FeneconResponse(FeneconBindingConstants.ESS_DISCHARGE_POWER_ADDRESS, "comment", "1777"));
+        assertEquals(1777, batteryPower.dischargerPower());
+        assertEquals(0, batteryPower.chargerPower());
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/GridPowerTest.java b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/GridPowerTest.java
new file mode 100644
index 0000000000000..1ed981df9e66e
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/GridPowerTest.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+import org.openhab.binding.fenecon.internal.FeneconBindingConstants;
+
+/**
+ * Test for {@link GridPower}.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class GridPowerTest {
+
+    @Test
+    void testSelling() {
+        GridPower gridValue = GridPower
+                .get(new FeneconResponse(FeneconBindingConstants.GRID_ACTIVE_POWER_ADDRESS, "comment", "-1777"));
+        assertEquals(1777, gridValue.sellTo());
+        assertEquals(0, gridValue.buyFrom());
+    }
+
+    @Test
+    void testBuying() {
+        GridPower gridValue = GridPower
+                .get(new FeneconResponse(FeneconBindingConstants.GRID_ACTIVE_POWER_ADDRESS, "comment", "1777"));
+        assertEquals(1777, gridValue.buyFrom());
+        assertEquals(0, gridValue.sellTo());
+    }
+}
diff --git a/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/StateTest.java b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/StateTest.java
new file mode 100644
index 0000000000000..fa947a2268cab
--- /dev/null
+++ b/bundles/org.openhab.binding.fenecon/src/test/java/org/openhab/binding/fenecon/internal/api/StateTest.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2010-2024 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.fenecon.internal.api;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+import org.openhab.binding.fenecon.internal.FeneconBindingConstants;
+
+/**
+ * Test for {@link State}.
+ *
+ * @author Philipp Schneider - Initial contribution
+ */
+@NonNullByDefault
+public class StateTest {
+
+    @Test
+    void testStateOk() {
+        State state = State.get(
+                new FeneconResponse(FeneconBindingConstants.STATE_ADDRESS, "0:Ok, 1:Info, 2:Warning, 3:Fault", "0"));
+        assertEquals("Ok", state.state());
+    }
+
+    @Test
+    void testStateInfo() {
+        State state = State.get(
+                new FeneconResponse(FeneconBindingConstants.STATE_ADDRESS, "0:Ok, 1:Info, 2:Warning, 3:Fault", "1"));
+        assertEquals("Info", state.state());
+    }
+
+    @Test
+    void testStateWarning() {
+        State state = State.get(
+                new FeneconResponse(FeneconBindingConstants.STATE_ADDRESS, "0:Ok, 1:Info, 2:Warning, 3:Fault", "2"));
+        assertEquals("Warning", state.state());
+    }
+
+    @Test
+    void testStateFault() {
+        State state = State.get(
+                new FeneconResponse(FeneconBindingConstants.STATE_ADDRESS, "0:Ok, 1:Info, 2:Warning, 3:Fault", "3"));
+        assertEquals("Fault", state.state());
+    }
+
+    @Test
+    void testStateUnknown() {
+        State state = State.get(
+                new FeneconResponse(FeneconBindingConstants.STATE_ADDRESS, "0:Ok, 1:Info, 2:Warning, 3:Fault", "4"));
+        assertEquals("Unknown", state.state());
+    }
+}

From 89fb2abfb431c8afd4854b81f87f514e44fb70e7 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 17:09:02 +0200
Subject: [PATCH 22/36] Add connection tag to addon.xml

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../src/main/resources/OH-INF/addon/addon.xml                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml
index 4e394f9d42fe8..0602d75e0a904 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/addon/addon.xml
@@ -6,5 +6,6 @@
 	<type>binding</type>
 	<name>FENECON Home Binding</name>
 	<description>This is the binding for FENECON Home.</description>
+	<connection>local</connection>
 
 </addon:addon>

From 6308e049fad8eb165a3ab38ed8108848e24956df Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 22:05:30 +0200
Subject: [PATCH 23/36] [Review]: Add tabs for DSL demo.rules

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index a94bea888e6cc..9cbb421f83ad2 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -100,6 +100,9 @@ sitemap demo label="FENECON Example Sitemap" {
 
 ### demo.rules
 
+:::: tabs
+
+::: tab DSL
 
 ```java
 rule "Blackout detection"
@@ -144,3 +147,6 @@ then
 end
 ```
 
+:::
+
+::::

From 6e13a9e6d39c156c4a6c38b25bc5c893a52ccf28 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 22:34:53 +0200
Subject: [PATCH 24/36] [Review]: Change thing type id to home-device

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 30 +++++++++----------
 .../internal/FeneconBindingConstants.java     |  2 +-
 .../internal/FeneconHandlerFactory.java       |  6 ++--
 .../resources/OH-INF/i18n/fenecon.properties  | 20 ++++++-------
 .../resources/OH-INF/thing/thing-types.xml    |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index 9cbb421f83ad2..4e1797890b107 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -53,7 +53,7 @@ The FENECON binding currently only provides access to read out the values from t
 ### fenecon.things
 
 ```java
-Thing fenecon:rest-api:local "FENECON Home" [hostname="192.168.1.11", refreshInterval=5]
+Thing fenecon:home-device:local "FENECON Home" [hostname="192.168.1.11", refreshInterval=5]
 ```
 
 ### demo.items
@@ -67,20 +67,20 @@ Group   GF_UtilityRoom          "Utility room"        <energy>               (Ho
 Group   GF_UtilityRoomSolar     "Utility room solar"  <solarplant>           (GF_UtilityRoom) ["Inverter"]
 
 // FENECON items
-String               EssState               <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:rest-api:local:state"}
-DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:rest-api:local:last-update"}
-Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:rest-api:local:ess-soc"}
-Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:charger-power"}
-Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:discharger-power"}
-Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:rest-api:local:emergency-power-mode"}
-
-Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:production-active-power"}
-Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:export-to-grid-power"}
-Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:rest-api:local:exported-to-grid-energy"}
-
-Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:consumption-active-power"}
-Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:rest-api:local:import-from-grid-power"}
-Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:rest-api:local:imported-from-grid-energy"}
+String               EssState               <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:home-device:local:state"}
+DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:home-device:local:last-update"}
+Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:home-device:local:ess-soc"}
+Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:charger-power"}
+Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:discharger-power"}
+Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:home-device:local:emergency-power-mode"}
+
+Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:production-active-power"}
+Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:export-to-grid-power"}
+Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:home-device:local:exported-to-grid-energy"}
+
+Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power"}
+Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:import-from-grid-power"}
+Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:home-device:local:imported-from-grid-energy"}
 
 // Examples of items for calculating the energy purchased and sold. Look at the demo.rules section.
 Number:Currency      SoldEnergy "Total sold energy [%.2f €]"           <price> (GF_UtilityRoomSolar)
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
index dafc6d8da9513..20204e6365b9b 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -29,7 +29,7 @@ public class FeneconBindingConstants {
     private static final String BINDING_ID = "fenecon";
 
     // List of all Thing Type UIDs
-    public static final ThingTypeUID THING_TYPE_RESTAPI = new ThingTypeUID(BINDING_ID, "rest-api");
+    public static final ThingTypeUID THING_TYPE_HOME_DEVICE = new ThingTypeUID(BINDING_ID, "home-device");
 
     // List of all FENECON Addresses
     public static final String STATE_ADDRESS = "_sum/State";
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
index 44a44f32f0586..05906199e7493 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.fenecon.internal;
 
-import static org.openhab.binding.fenecon.internal.FeneconBindingConstants.THING_TYPE_RESTAPI;
+import static org.openhab.binding.fenecon.internal.FeneconBindingConstants.THING_TYPE_HOME_DEVICE;
 
 import java.util.Set;
 
@@ -35,7 +35,7 @@
 @Component(configurationPid = "binding.fenecon", service = ThingHandlerFactory.class)
 public class FeneconHandlerFactory extends BaseThingHandlerFactory {
 
-    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_RESTAPI);
+    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_HOME_DEVICE);
 
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {
@@ -46,7 +46,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
     protected @Nullable ThingHandler createHandler(Thing thing) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
-        if (THING_TYPE_RESTAPI.equals(thingTypeUID)) {
+        if (THING_TYPE_HOME_DEVICE.equals(thingTypeUID)) {
             return new FeneconHandler(thing);
         }
 
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
index d07891f9285a0..c4b10669e816c 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
@@ -5,19 +5,19 @@ addon.fenecon.description = This is the binding for FENECON Home.
 
 # thing types
 
-thing-type.fenecon.rest-api.label = FENECON Home
-thing-type.fenecon.rest-api.description = Thing for FENECON Home Device
+thing-type.fenecon.home-device.label = FENECON Home
+thing-type.fenecon.home-device.description = Thing for FENECON Home Device
 
 # thing types config
 
-thing-type.config.fenecon.rest-api.hostname.label = Hostname
-thing-type.config.fenecon.rest-api.hostname.description = Hostname or IP address of the FENECON device, e.g. 192.168.1.11
-thing-type.config.fenecon.rest-api.password.label = Password
-thing-type.config.fenecon.rest-api.password.description = Password to access the device. The password for guest access is set by default.
-thing-type.config.fenecon.rest-api.port.label = Port
-thing-type.config.fenecon.rest-api.port.description = Port of the FENECON device
-thing-type.config.fenecon.rest-api.refreshInterval.label = Refresh Interval
-thing-type.config.fenecon.rest-api.refreshInterval.description = Interval the device is polled in sec.
+thing-type.config.fenecon.home-device.hostname.label = Hostname
+thing-type.config.fenecon.home-device.hostname.description = Hostname or IP address of the FENECON device, e.g. 192.168.1.11
+thing-type.config.fenecon.home-device.password.label = Password
+thing-type.config.fenecon.home-device.password.description = Password to access the device. The password for guest access is set by default.
+thing-type.config.fenecon.home-device.port.label = Port
+thing-type.config.fenecon.home-device.port.description = Port of the FENECON device
+thing-type.config.fenecon.home-device.refreshInterval.label = Refresh Interval
+thing-type.config.fenecon.home-device.refreshInterval.description = Interval the device is polled in sec.
 
 # channel types
 
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index 84d2b1c2a9d00..59f34570ca5b4 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -5,7 +5,7 @@
 	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
 
 	<!-- Sample Thing Type -->
-	<thing-type id="rest-api">
+	<thing-type id="home-device">
 
 		<label>FENECON Home</label>
 		<description>Thing for FENECON Home Device</description>

From 6f101bf94414bbdc311875eb8f8a9bfd602b6702 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 22:49:53 +0200
Subject: [PATCH 25/36] Remove a checkstyle and PMD info and warning.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../openhab/binding/fenecon/internal/FeneconHandler.java    | 6 +-----
 .../binding/fenecon/internal/api/FeneconController.java     | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index eef26e3e5b2a9..faae9b78ef632 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -34,7 +34,6 @@
 import org.openhab.core.thing.ThingStatusDetail;
 import org.openhab.core.thing.binding.BaseThingHandler;
 import org.openhab.core.types.Command;
-import org.openhab.core.types.RefreshType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,7 +86,6 @@ private void pollingCode() {
     }
 
     private void processDataPoint(FeneconResponse response) throws FeneconException {
-
         switch (response.address()) {
             case FeneconBindingConstants.STATE_ADDRESS:
                 // {"address":"_sum/State","type":"INTEGER","accessMode":"RO","text":"0:Ok, 1:Info, 2:Warning,
@@ -159,8 +157,6 @@ public void dispose() {
 
     @Override
     public void handleCommand(ChannelUID channelUID, Command command) {
-        if (command == RefreshType.REFRESH) {
-            // Noop
-        }
+        // Noop
     }
 }
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
index 99e61778ddd72..525388e3de5da 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
@@ -23,6 +23,7 @@
 import java.time.Duration;
 import java.util.Base64;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.fenecon.internal.FeneconConfiguration;
 import org.openhab.binding.fenecon.internal.exception.FeneconAuthenticationException;
 import org.openhab.binding.fenecon.internal.exception.FeneconCommunicationException;
@@ -39,6 +40,7 @@
  *
  * @author Philipp Schneider - Initial contribution
  */
+@NonNullByDefault
 public class FeneconController {
 
     private final Logger logger = LoggerFactory.getLogger(FeneconController.class);

From 0d0570eadacaaa5bef4076740d9d8cad9a191f14 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 3 Aug 2024 22:56:07 +0200
Subject: [PATCH 26/36] [Review]: Update readme.md to new thing type id.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index 4e1797890b107..57a1e66515dbd 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -8,7 +8,7 @@ This makes it possible, for example, to switch on other consumers such as the di
 
 ## Supported Things
 
-Currently only one Thing is supported: The `rest-api` device connection to the FENECON energy storage system.
+Currently only one Thing is supported: The `home-device` connection to the FENECON energy storage system.
 
 This Binding was tested with an [FENECON HOME 10](https://fenecon.de/fenecon-home-10/) device.
 

From 1dd5e07321f85b15e375bcef5bc756cd91da1722 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Thu, 15 Aug 2024 23:04:08 +0200
Subject: [PATCH 27/36] Error handling improved.

If Fenecon delivers partially faulty data because parts of the system
are offline, an attempt is made to read out as much data as possible.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../binding/fenecon/internal/FeneconBindingConstants.java  | 5 +++--
 .../binding/fenecon/internal/api/FeneconController.java    | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
index 20204e6365b9b..524e3d250a269 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -42,9 +42,10 @@ public class FeneconBindingConstants {
     public static final String GRID_SELL_ACTIVE_ENERGY_ADDRESS = "_sum/GridSellActiveEnergy";
     public static final String GRID_BUY_ACTIVE_ENERGY_ADDRESS = "_sum/GridBuyActiveEnergy";
     // Group of all FENECON Addresses
-    public static final List<String> ADDRESSES = List.of(GRID_MODE_ADDRESS, STATE_ADDRESS, ESS_SOC_ADDRESS,
+    public static final List<String> ADDRESSES = List.of(STATE_ADDRESS, GRID_MODE_ADDRESS,
             CONSUMPTION_ACTIVE_POWER_ADDRESS, PRODUCTION_ACTIVE_POWER_ADDRESS, GRID_ACTIVE_POWER_ADDRESS,
-            ESS_DISCHARGE_POWER_ADDRESS, GRID_BUY_ACTIVE_ENERGY_ADDRESS, GRID_SELL_ACTIVE_ENERGY_ADDRESS);
+            GRID_BUY_ACTIVE_ENERGY_ADDRESS, GRID_SELL_ACTIVE_ENERGY_ADDRESS, ESS_SOC_ADDRESS,
+            ESS_DISCHARGE_POWER_ADDRESS);
 
     // List of all Channel IDs
     public static final String STATE_CHANNEL = "state";
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
index 525388e3de5da..42887066c354b 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
@@ -102,10 +102,11 @@ public FeneconResponse requestChannel(String channel) throws FeneconException {
             } else {
                 return createResponseFromJson(JsonParser.parseString(response.body()).getAsJsonObject());
             }
-        } catch (IOException | InterruptedException err) {
-            throw new FeneconCommunicationException("Communication error with FENECON system", err);
+        } catch (IOException | UnsupportedOperationException | InterruptedException err) {
+            throw new FeneconCommunicationException("Communication error with FENECON system on channel: " + channel,
+                    err);
         } catch (URISyntaxException | JsonSyntaxException err) {
-            throw new FeneconCommunicationException("Syntax error", err);
+            throw new FeneconCommunicationException("Syntax error on channel: " + channel, err);
         }
     }
 

From 1a567a4054627c2bdb9fa0c289b43d29f7e967a5 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Fri, 16 Aug 2024 18:28:20 +0200
Subject: [PATCH 28/36] Handling improved for values that are not available.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../binding/fenecon/internal/FeneconHandler.java |  8 ++++++--
 .../fenecon/internal/api/FeneconController.java  | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index faae9b78ef632..b74a2a8eb4593 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -12,6 +12,7 @@
  */
 package org.openhab.binding.fenecon.internal;
 
+import java.util.Optional;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -70,9 +71,12 @@ private void pollingCode() {
         for (String eachChannel : FeneconBindingConstants.ADDRESSES) {
             try {
                 @SuppressWarnings("null")
-                FeneconResponse response = feneconController.requestChannel(eachChannel);
+                Optional<FeneconResponse> response = feneconController.requestChannel(eachChannel);
+
+                if (response.isPresent()) {
+                    processDataPoint(response.get());
+                }
 
-                processDataPoint(response);
                 updateStatus(ThingStatus.ONLINE);
             } catch (FeneconException err) {
                 logger.trace("FENECON - connection problem on FENECON channel {}", eachChannel, err);
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
index 42887066c354b..544a270662541 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
@@ -22,6 +22,7 @@
 import java.net.http.HttpResponse.BodyHandlers;
 import java.time.Duration;
 import java.util.Base64;
+import java.util.Optional;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.fenecon.internal.FeneconConfiguration;
@@ -78,11 +79,11 @@ private Builder createBaseHttpRequest(FeneconConfiguration config) {
      * Queries the data for a specified channel.
      *
      * @param channel Channel to be queried, e.g. _sum/State .
-     * @return {@link FeneconResponse}
+     * @return {@link FeneconResponse} can be optional if values are not available.
      * @throws FeneconException is thrown if there are problems with the connection or processing of data to the FENECON
      *             system.
      */
-    public FeneconResponse requestChannel(String channel) throws FeneconException {
+    public Optional<FeneconResponse> requestChannel(String channel) throws FeneconException {
         try {
             HttpRequest request = baseHttpRequest.uri(new URI(getBaseUrl(config) + "rest/channel/" + channel)).build();
             logger.trace("FENECON - request: {}", request);
@@ -110,13 +111,20 @@ public FeneconResponse requestChannel(String channel) throws FeneconException {
         }
     }
 
-    private FeneconResponse createResponseFromJson(JsonObject response) {
+    private Optional<FeneconResponse> createResponseFromJson(JsonObject response) {
         // Example response: {"address":"_sum/EssSoc","type":"INTEGER","accessMode":"RO","text":"Range
         // 0..100","unit":"%","value":99}
+
+        if (response.get("value").isJsonNull()) {
+            // Example problem response: {"address":"_sum/EssSoc","type":"INTEGER","accessMode":"RO","text":"Range
+            // 0..100","unit":"%","value":null}
+            return Optional.empty();
+        }
+
         String address = response.get("address").getAsString();
         String text = response.get("text").getAsString();
         String value = response.get("value").getAsString();
 
-        return new FeneconResponse(address, text, value);
+        return Optional.of(new FeneconResponse(address, text, value));
     }
 }

From de826404e373ea2b97b03fd6680c0d7ee34ea652 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Fri, 16 Aug 2024 19:00:08 +0200
Subject: [PATCH 29/36] Added new channels for each
 consumption-active-power-phase 1, 2 and 3.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 63 ++++++++++---------
 .../internal/FeneconBindingConstants.java     | 13 +++-
 .../fenecon/internal/FeneconHandler.java      | 12 ++++
 .../resources/OH-INF/i18n/fenecon.properties  |  2 +
 .../resources/OH-INF/thing/thing-types.xml    | 10 +++
 5 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index 57a1e66515dbd..6df6c5db58ac1 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -32,20 +32,23 @@ The FENECON Thing only needs to be configured with the `hostname`, all other par
 
 The FENECON binding currently only provides access to read out the values from the energy storage system. 
 
-| Channel                   | Type                 | Read/Write | Description                                                                 |
-|---------------------------|----------------------|------------|-----------------------------------------------------------------------------|
-| state                     | String               | R          | FENECON system state: Ok, Info, Warning or Fault                            |
-| last-update               | DateTime             | R          | Last successful update via REST-API from the FENECON system                 |
-| ess-soc                   | Number:Dimensionless | R          | Battery state of charge in percent                                          |
-| charger-power             | Number:Power         | R          | Current charger power of energy storage system in watt.                     |
-| discharger-power          | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
-| emergency-power-mode      | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
-| production-active-power   | Number:Power         | R          | Current active power producer load in watt.                                 |
-| export-to-grid-power      | Number:Power         | R          | Current export power to grid in watt.                                       |
-| exported-to-grid-energy   | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
-| consumption-active-power  | Number:Power         | R          | Current active power consumer load in watt.                                 |
-| import-from-grid-power    | Number:Power         | R          | Current import power from grid in watt.                                     |
-| imported-from-grid-energy | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
+| Channel                       | Type                 | Read/Write | Description                                                                 |
+|-------------------------------|----------------------|------------|-----------------------------------------------------------------------------|
+| state                         | String               | R          | FENECON system state: Ok, Info, Warning or Fault                            |
+| last-update                   | DateTime             | R          | Last successful update via REST-API from the FENECON system                 |
+| ess-soc                       | Number:Dimensionless | R          | Battery state of charge in percent                                          |
+| charger-power                 | Number:Power         | R          | Current charger power of energy storage system in watt.                     |
+| discharger-power              | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
+| emergency-power-mode          | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
+| production-active-power       | Number:Power         | R          | Current active power producer load in watt.                                 |
+| export-to-grid-power          | Number:Power         | R          | Current export power to grid in watt.                                       |
+| exported-to-grid-energy       | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
+| consumption-active-power      | Number:Power         | R          | Current active power consumer load in watt.                                 |
+| consumption-active-power-l1   | Number:Power         | R          | Current active power consumer load in watt on phase 1.                      |
+| consumption-active-power-l2   | Number:Power         | R          | Current active power consumer load in watt on phase 2.                      |
+| consumption-active-power-l3   | Number:Power         | R          | Current active power consumer load in watt on phase 3.                      |
+| import-from-grid-power        | Number:Power         | R          | Current import power from grid in watt.                                     |
+| imported-from-grid-energy     | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
 
 
 ## Full Example
@@ -67,25 +70,29 @@ Group   GF_UtilityRoom          "Utility room"        <energy>               (Ho
 Group   GF_UtilityRoomSolar     "Utility room solar"  <solarplant>           (GF_UtilityRoom) ["Inverter"]
 
 // FENECON items
-String               EssState               <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:home-device:local:state"}
-DateTime             LastFeneconUpdate      <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:home-device:local:last-update"}
-Number:Dimensionless EssSoc                 <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:home-device:local:ess-soc"}
-Number:Power         ChargerPower           <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:charger-power"}
-Number:Power         DischargerPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:discharger-power"}
-Switch               EmergencyPowerMode     <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:home-device:local:emergency-power-mode"}
-
-Number:Power         ProductionActivePower  <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:production-active-power"}
-Number:Power         SellToGridPower        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:export-to-grid-power"}
-Number:Energy        TotalSellEnergy        <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:home-device:local:exported-to-grid-energy"}
-
-Number:Power         ConsumptionActivePower <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power"}
-Number:Power         BuyFromGridPower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:import-from-grid-power"}
-Number:Energy        TotalBuyEnergy         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:home-device:local:imported-from-grid-energy"}
+String               EssState                       <text>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:home-device:local:state"}
+DateTime             LastFeneconUpdate              <time>         (GF_UtilityRoomSolar) ["Status"]                {channel="fenecon:home-device:local:last-update"}
+Number:Dimensionless EssSoc                         <batterylevel> (GF_UtilityRoomSolar) ["Measurement"]           {unit="%", channel="fenecon:home-device:local:ess-soc"}
+Number:Power         ChargerPower                   <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:charger-power"}
+Number:Power         DischargerPower                <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:discharger-power"}
+Switch               EmergencyPowerMode             <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:home-device:local:emergency-power-mode"}
+
+Number:Power         ProductionActivePower          <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:production-active-power"}
+Number:Power         SellToGridPower                <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:export-to-grid-power"}
+Number:Energy        TotalSellEnergy                <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:home-device:local:exported-to-grid-energy"}
+
+Number:Power         ConsumptionActivePower         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power"}
+Number:Power         ConsumptionActivePowerPhase1   <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power-l1"}
+Number:Power         ConsumptionActivePowerPhase2   <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power-l2"}
+Number:Power         ConsumptionActivePowerPhase3   <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power-l3"}
+Number:Power         BuyFromGridPower               <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:import-from-grid-power"}
+Number:Energy        TotalBuyEnergy                 <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:home-device:local:imported-from-grid-energy"}
 
 // Examples of items for calculating the energy purchased and sold. Look at the demo.rules section.
 Number:Currency      SoldEnergy "Total sold energy [%.2f €]"           <price> (GF_UtilityRoomSolar)
 Number:Currency      PurchasedEnergy "Total purchased energy [%.2f €]" <price> (GF_UtilityRoomSolar)
 
+
 ```
 
 ### demo.sitemap
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
index 524e3d250a269..e324c9d60ae76 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -35,6 +35,9 @@ public class FeneconBindingConstants {
     public static final String STATE_ADDRESS = "_sum/State";
     public static final String ESS_SOC_ADDRESS = "_sum/EssSoc";
     public static final String CONSUMPTION_ACTIVE_POWER_ADDRESS = "_sum/ConsumptionActivePower";
+    public static final String CONSUMPTION_ACTIVE_POWER_PHASE1_ADDRESS = "_sum/ConsumptionActivePowerL1";
+    public static final String CONSUMPTION_ACTIVE_POWER_PHASE2_ADDRESS = "_sum/ConsumptionActivePowerL2";
+    public static final String CONSUMPTION_ACTIVE_POWER_PHASE3_ADDRESS = "_sum/ConsumptionActivePowerL3";
     public static final String PRODUCTION_ACTIVE_POWER_ADDRESS = "_sum/ProductionActivePower";
     public static final String GRID_ACTIVE_POWER_ADDRESS = "_sum/GridActivePower";
     public static final String ESS_DISCHARGE_POWER_ADDRESS = "_sum/EssDischargePower";
@@ -43,14 +46,18 @@ public class FeneconBindingConstants {
     public static final String GRID_BUY_ACTIVE_ENERGY_ADDRESS = "_sum/GridBuyActiveEnergy";
     // Group of all FENECON Addresses
     public static final List<String> ADDRESSES = List.of(STATE_ADDRESS, GRID_MODE_ADDRESS,
-            CONSUMPTION_ACTIVE_POWER_ADDRESS, PRODUCTION_ACTIVE_POWER_ADDRESS, GRID_ACTIVE_POWER_ADDRESS,
-            GRID_BUY_ACTIVE_ENERGY_ADDRESS, GRID_SELL_ACTIVE_ENERGY_ADDRESS, ESS_SOC_ADDRESS,
-            ESS_DISCHARGE_POWER_ADDRESS);
+            CONSUMPTION_ACTIVE_POWER_ADDRESS, CONSUMPTION_ACTIVE_POWER_PHASE1_ADDRESS,
+            CONSUMPTION_ACTIVE_POWER_PHASE2_ADDRESS, CONSUMPTION_ACTIVE_POWER_PHASE3_ADDRESS,
+            PRODUCTION_ACTIVE_POWER_ADDRESS, GRID_ACTIVE_POWER_ADDRESS, GRID_BUY_ACTIVE_ENERGY_ADDRESS,
+            GRID_SELL_ACTIVE_ENERGY_ADDRESS, ESS_SOC_ADDRESS, ESS_DISCHARGE_POWER_ADDRESS);
 
     // List of all Channel IDs
     public static final String STATE_CHANNEL = "state";
     public static final String ESS_SOC_CHANNEL = "ess-soc";
     public static final String CONSUMPTION_ACTIVE_POWER_CHANNEL = "consumption-active-power";
+    public static final String CONSUMPTION_ACTIVE_POWER_PHASE1_CHANNEL = "consumption-active-power-l1";
+    public static final String CONSUMPTION_ACTIVE_POWER_PHASE2_CHANNEL = "consumption-active-power-l2";
+    public static final String CONSUMPTION_ACTIVE_POWER_PHASE3_CHANNEL = "consumption-active-power-l3";
     public static final String PRODUCTION_ACTIVE_POWER_CHANNEL = "production-active-power";
     public static final String EXPORT_TO_GRID_POWER_CHANNEL = "export-to-grid-power";
     public static final String IMPORT_FROM_GRID_POWER_CHANNEL = "import-from-grid-power";
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index b74a2a8eb4593..4f3110fa15c03 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -105,6 +105,18 @@ private void processDataPoint(FeneconResponse response) throws FeneconException
                 updateState(FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_CHANNEL,
                         new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
                 break;
+            case FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_PHASE1_ADDRESS:
+                updateState(FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_PHASE1_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
+                break;
+            case FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_PHASE2_ADDRESS:
+                updateState(FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_PHASE2_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
+                break;
+            case FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_PHASE3_ADDRESS:
+                updateState(FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_PHASE3_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
+                break;
             case FeneconBindingConstants.PRODUCTION_ACTIVE_POWER_ADDRESS:
                 updateState(FeneconBindingConstants.PRODUCTION_ACTIVE_POWER_CHANNEL,
                         new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
index c4b10669e816c..651069007ca36 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
@@ -23,6 +23,8 @@ thing-type.config.fenecon.home-device.refreshInterval.description = Interval the
 
 channel-type.fenecon.charger-power.label = Charger Power
 channel-type.fenecon.charger-power.description = Current charger power of energy storage system in watt.
+channel-type.fenecon.consumption-active-power-phase.label = Consumer Power Phase
+channel-type.fenecon.consumption-active-power-phase.description = Current active power consumer load in watt on the corresponding phase.
 channel-type.fenecon.consumption-active-power.label = Consumer Power
 channel-type.fenecon.consumption-active-power.description = Current active power consumer load in watt.
 channel-type.fenecon.discharger-power.label = Discharger Power
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index 59f34570ca5b4..653c6a6eeed23 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -19,6 +19,9 @@
 			<channel id="discharger-power" typeId="discharger-power"/>
 			<channel id="emergency-power-mode" typeId="emergency-power-mode"/>
 			<channel id="consumption-active-power" typeId="consumption-active-power"/>
+			<channel id="consumption-active-power-l1" typeId="consumption-active-power-phase"/>
+			<channel id="consumption-active-power-l2" typeId="consumption-active-power-phase"/>
+			<channel id="consumption-active-power-l3" typeId="consumption-active-power-phase"/>
 			<channel id="production-active-power" typeId="production-active-power"/>
 			<channel id="export-to-grid-power" typeId="export-to-grid-power"/>
 			<channel id="exported-to-grid-energy" typeId="exported-to-grid-energy"/>
@@ -133,6 +136,13 @@
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
+	<channel-type id="consumption-active-power-phase">
+		<item-type>Number:Power</item-type>
+		<label>Consumer Power Phase</label>
+		<description>Current active power consumer load in watt on the corresponding phase.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
 	<channel-type id="import-from-grid-power">
 		<item-type>Number:Power</item-type>
 		<label>Import Grid Power</label>

From c7af0d99bffd6d3e769a21c38d042257f2fab699 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Fri, 16 Aug 2024 19:29:22 +0200
Subject: [PATCH 30/36] Added new channels for consumption and production max
 active power.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md    |  4 ++++
 .../internal/FeneconBindingConstants.java        |  9 +++++++--
 .../binding/fenecon/internal/FeneconHandler.java |  8 ++++++++
 .../resources/OH-INF/i18n/fenecon.properties     |  4 ++++
 .../main/resources/OH-INF/thing/thing-types.xml  | 16 ++++++++++++++++
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index 6df6c5db58ac1..5afd3f944ec76 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -41,9 +41,11 @@ The FENECON binding currently only provides access to read out the values from t
 | discharger-power              | Number:Power         | R          | Current discharger power of energy storage system in watt.                  |
 | emergency-power-mode          | Switch               | R          | Indicates if there is grid power is off and the emergency power mode is on. |
 | production-active-power       | Number:Power         | R          | Current active power producer load in watt.                                 |
+| production-max-active-power   | Number:Power         | R          | Maximum active production power in watt that was measured.                  |
 | export-to-grid-power          | Number:Power         | R          | Current export power to grid in watt.                                       |
 | exported-to-grid-energy       | Number:Energy        | R          | Total energy exported to the grid in watt per hour.                         |
 | consumption-active-power      | Number:Power         | R          | Current active power consumer load in watt.                                 |
+| consumption-max-active-power  | Number:Power         | R          | Maximum active consumption power in watt that was measured.                 |
 | consumption-active-power-l1   | Number:Power         | R          | Current active power consumer load in watt on phase 1.                      |
 | consumption-active-power-l2   | Number:Power         | R          | Current active power consumer load in watt on phase 2.                      |
 | consumption-active-power-l3   | Number:Power         | R          | Current active power consumer load in watt on phase 3.                      |
@@ -78,10 +80,12 @@ Number:Power         DischargerPower                <energy>       (GF_UtilityRo
 Switch               EmergencyPowerMode             <switch>       (GF_UtilityRoomSolar) ["Switch"]                {channel="fenecon:home-device:local:emergency-power-mode"}
 
 Number:Power         ProductionActivePower          <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:production-active-power"}
+Number:Power         ProductionMaxActivePower       <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:production-max-active-power"}
 Number:Power         SellToGridPower                <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:export-to-grid-power"}
 Number:Energy        TotalSellEnergy                <energy>       (GF_UtilityRoomSolar) ["Measurement", "Energy"] {channel="fenecon:home-device:local:exported-to-grid-energy"}
 
 Number:Power         ConsumptionActivePower         <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power"}
+Number:Power         ConsumptionMaxActivePower      <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-max-active-power"}
 Number:Power         ConsumptionActivePowerPhase1   <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power-l1"}
 Number:Power         ConsumptionActivePowerPhase2   <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power-l2"}
 Number:Power         ConsumptionActivePowerPhase3   <energy>       (GF_UtilityRoomSolar) ["Measurement", "Power"]  {channel="fenecon:home-device:local:consumption-active-power-l3"}
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
index e324c9d60ae76..d8218ab8dbead 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconBindingConstants.java
@@ -38,6 +38,8 @@ public class FeneconBindingConstants {
     public static final String CONSUMPTION_ACTIVE_POWER_PHASE1_ADDRESS = "_sum/ConsumptionActivePowerL1";
     public static final String CONSUMPTION_ACTIVE_POWER_PHASE2_ADDRESS = "_sum/ConsumptionActivePowerL2";
     public static final String CONSUMPTION_ACTIVE_POWER_PHASE3_ADDRESS = "_sum/ConsumptionActivePowerL3";
+    public static final String CONSUMPTION_MAX_ACTIVE_POWER_ADDRESS = "_sum/ConsumptionMaxActivePower";
+    public static final String PRODUCTION_MAX_ACTIVE_POWER_ADDRESS = "_sum/ProductionMaxActivePower";
     public static final String PRODUCTION_ACTIVE_POWER_ADDRESS = "_sum/ProductionActivePower";
     public static final String GRID_ACTIVE_POWER_ADDRESS = "_sum/GridActivePower";
     public static final String ESS_DISCHARGE_POWER_ADDRESS = "_sum/EssDischargePower";
@@ -48,8 +50,9 @@ public class FeneconBindingConstants {
     public static final List<String> ADDRESSES = List.of(STATE_ADDRESS, GRID_MODE_ADDRESS,
             CONSUMPTION_ACTIVE_POWER_ADDRESS, CONSUMPTION_ACTIVE_POWER_PHASE1_ADDRESS,
             CONSUMPTION_ACTIVE_POWER_PHASE2_ADDRESS, CONSUMPTION_ACTIVE_POWER_PHASE3_ADDRESS,
-            PRODUCTION_ACTIVE_POWER_ADDRESS, GRID_ACTIVE_POWER_ADDRESS, GRID_BUY_ACTIVE_ENERGY_ADDRESS,
-            GRID_SELL_ACTIVE_ENERGY_ADDRESS, ESS_SOC_ADDRESS, ESS_DISCHARGE_POWER_ADDRESS);
+            CONSUMPTION_MAX_ACTIVE_POWER_ADDRESS, PRODUCTION_MAX_ACTIVE_POWER_ADDRESS, PRODUCTION_ACTIVE_POWER_ADDRESS,
+            GRID_ACTIVE_POWER_ADDRESS, GRID_BUY_ACTIVE_ENERGY_ADDRESS, GRID_SELL_ACTIVE_ENERGY_ADDRESS, ESS_SOC_ADDRESS,
+            ESS_DISCHARGE_POWER_ADDRESS);
 
     // List of all Channel IDs
     public static final String STATE_CHANNEL = "state";
@@ -58,6 +61,8 @@ public class FeneconBindingConstants {
     public static final String CONSUMPTION_ACTIVE_POWER_PHASE1_CHANNEL = "consumption-active-power-l1";
     public static final String CONSUMPTION_ACTIVE_POWER_PHASE2_CHANNEL = "consumption-active-power-l2";
     public static final String CONSUMPTION_ACTIVE_POWER_PHASE3_CHANNEL = "consumption-active-power-l3";
+    public static final String CONSUMPTION_MAX_ACTIVE_POWER_CHANNEL = "consumption-max-active-power";
+    public static final String PRODUCTION_MAX_ACTIVE_POWER_CHANNEL = "production-max-active-power";
     public static final String PRODUCTION_ACTIVE_POWER_CHANNEL = "production-active-power";
     public static final String EXPORT_TO_GRID_POWER_CHANNEL = "export-to-grid-power";
     public static final String IMPORT_FROM_GRID_POWER_CHANNEL = "import-from-grid-power";
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 4f3110fa15c03..78ab5c1329957 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -117,6 +117,14 @@ private void processDataPoint(FeneconResponse response) throws FeneconException
                 updateState(FeneconBindingConstants.CONSUMPTION_ACTIVE_POWER_PHASE3_CHANNEL,
                         new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
                 break;
+            case FeneconBindingConstants.CONSUMPTION_MAX_ACTIVE_POWER_ADDRESS:
+                updateState(FeneconBindingConstants.CONSUMPTION_MAX_ACTIVE_POWER_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
+                break;
+            case FeneconBindingConstants.PRODUCTION_MAX_ACTIVE_POWER_ADDRESS:
+                updateState(FeneconBindingConstants.PRODUCTION_MAX_ACTIVE_POWER_CHANNEL,
+                        new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
+                break;
             case FeneconBindingConstants.PRODUCTION_ACTIVE_POWER_ADDRESS:
                 updateState(FeneconBindingConstants.PRODUCTION_ACTIVE_POWER_CHANNEL,
                         new QuantityType<>(Integer.valueOf(response.value()), Units.WATT));
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
index 651069007ca36..ea8a61f272b47 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/i18n/fenecon.properties
@@ -27,6 +27,8 @@ channel-type.fenecon.consumption-active-power-phase.label = Consumer Power Phase
 channel-type.fenecon.consumption-active-power-phase.description = Current active power consumer load in watt on the corresponding phase.
 channel-type.fenecon.consumption-active-power.label = Consumer Power
 channel-type.fenecon.consumption-active-power.description = Current active power consumer load in watt.
+channel-type.fenecon.consumption-max-active-power.label = Consumer Max Power
+channel-type.fenecon.consumption-max-active-power.description = Maximum active consumption power in watt that was measured.
 channel-type.fenecon.discharger-power.label = Discharger Power
 channel-type.fenecon.discharger-power.description = Current discharger power of energy storage system in watt.
 channel-type.fenecon.emergency-power-mode.label = Emergency Power Mode
@@ -45,6 +47,8 @@ channel-type.fenecon.last-update.label = Last Update
 channel-type.fenecon.last-update.description = Last successful update via REST-API from the FENECON system
 channel-type.fenecon.production-active-power.label = Producer Power
 channel-type.fenecon.production-active-power.description = Current active power producer load in watt.
+channel-type.fenecon.production-max-active-power.label = Producer Max Power
+channel-type.fenecon.production-max-active-power.description = Maximum active production power in watt that was measured.
 channel-type.fenecon.state.label = System State
 channel-type.fenecon.state.description = FENECON system state
 channel-type.fenecon.state.state.option.OK = Ok
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index 653c6a6eeed23..a42377667185b 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -22,6 +22,8 @@
 			<channel id="consumption-active-power-l1" typeId="consumption-active-power-phase"/>
 			<channel id="consumption-active-power-l2" typeId="consumption-active-power-phase"/>
 			<channel id="consumption-active-power-l3" typeId="consumption-active-power-phase"/>
+			<channel id="consumption-max-active-power" typeId="consumption-max-active-power"/>
+			<channel id="production-max-active-power" typeId="production-max-active-power"/>
 			<channel id="production-active-power" typeId="production-active-power"/>
 			<channel id="export-to-grid-power" typeId="export-to-grid-power"/>
 			<channel id="exported-to-grid-energy" typeId="exported-to-grid-energy"/>
@@ -143,6 +145,20 @@
 		<category>Energy</category>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>
+	<channel-type id="consumption-max-active-power">
+		<item-type>Number:Power</item-type>
+		<label>Consumer Max Power</label>
+		<description>Maximum active consumption power in watt that was measured.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
+	<channel-type id="production-max-active-power">
+		<item-type>Number:Power</item-type>
+		<label>Producer Max Power</label>
+		<description>Maximum active production power in watt that was measured.</description>
+		<category>Energy</category>
+		<state readOnly="true" pattern="%.0f %unit%"/>
+	</channel-type>
 	<channel-type id="import-from-grid-power">
 		<item-type>Number:Power</item-type>
 		<label>Import Grid Power</label>

From a66b870d35306a35efad2660492d0fec41260f49 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 24 Aug 2024 14:04:56 +0200
Subject: [PATCH 31/36] Fix format conflict.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/pom.xml | 684 +-----------------------------------------------
 1 file changed, 1 insertion(+), 683 deletions(-)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 6d0bc08fc539a..5646c6396344a 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -5,1384 +5,702 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-
     <groupId>org.openhab.addons</groupId>
-
     <artifactId>org.openhab.addons.reactor</artifactId>
-
     <version>4.3.0-SNAPSHOT</version>
-
   </parent>
 
   <groupId>org.openhab.addons.bundles</groupId>
-
   <artifactId>org.openhab.addons.reactor.bundles</artifactId>
-
   <packaging>pom</packaging>
 
   <name>openHAB Add-ons :: Bundles</name>
 
   <modules>
-
     <!-- automation -->
-
     <module>org.openhab.automation.groovyscripting</module>
-
     <module>org.openhab.automation.jrubyscripting</module>
-
     <module>org.openhab.automation.jsscripting</module>
-
     <module>org.openhab.automation.jsscriptingnashorn</module>
-
     <module>org.openhab.automation.jythonscripting</module>
-
     <module>org.openhab.automation.pidcontroller</module>
-
     <module>org.openhab.automation.pwm</module>
-
     <!-- io -->
-
     <module>org.openhab.io.homekit</module>
-
     <module>org.openhab.io.hueemulation</module>
-
     <module>org.openhab.io.metrics</module>
-
     <module>org.openhab.io.neeo</module>
-
     <module>org.openhab.io.openhabcloud</module>
-
     <!-- transformations -->
-
     <module>org.openhab.transform.basicprofiles</module>
-
     <module>org.openhab.transform.bin2json</module>
-
     <module>org.openhab.transform.exec</module>
-
     <module>org.openhab.transform.jinja</module>
-
     <module>org.openhab.transform.jsonpath</module>
-
     <module>org.openhab.transform.map</module>
-
     <module>org.openhab.transform.regex</module>
-
     <module>org.openhab.transform.rollershutterposition</module>
-
     <module>org.openhab.transform.scale</module>
-
     <module>org.openhab.transform.vat</module>
-
     <module>org.openhab.transform.xpath</module>
-
     <module>org.openhab.transform.xslt</module>
-
     <!-- bindings -->
-
     <module>org.openhab.binding.adorne</module>
-
     <module>org.openhab.binding.ahawastecollection</module>
-
     <module>org.openhab.binding.airgradient</module>
-
     <module>org.openhab.binding.airq</module>
-
     <module>org.openhab.binding.airquality</module>
-
     <module>org.openhab.binding.airvisualnode</module>
-
     <module>org.openhab.binding.alarmdecoder</module>
-
     <module>org.openhab.binding.allplay</module>
-
     <module>org.openhab.binding.amazondashbutton</module>
-
     <module>org.openhab.binding.amazonechocontrol</module>
-
     <module>org.openhab.binding.amberelectric</module>
-
     <module>org.openhab.binding.ambientweather</module>
-
     <module>org.openhab.binding.amplipi</module>
-
     <module>org.openhab.binding.androiddebugbridge</module>
-
     <module>org.openhab.binding.androidtv</module>
-
     <module>org.openhab.binding.anel</module>
-
     <module>org.openhab.binding.anthem</module>
-
     <module>org.openhab.binding.argoclima</module>
-
     <module>org.openhab.binding.astro</module>
-
     <module>org.openhab.binding.asuswrt</module>
-
     <module>org.openhab.binding.atlona</module>
-
     <module>org.openhab.binding.autelis</module>
-
     <module>org.openhab.binding.automower</module>
-
     <module>org.openhab.binding.avmfritz</module>
-
     <module>org.openhab.binding.awattar</module>
-
     <module>org.openhab.binding.benqprojector</module>
-
     <module>org.openhab.binding.bigassfan</module>
-
     <module>org.openhab.binding.bluetooth</module>
-
     <module>org.openhab.binding.bluetooth.airthings</module>
-
     <module>org.openhab.binding.bluetooth.am43</module>
-
     <module>org.openhab.binding.bluetooth.bluegiga</module>
-
     <module>org.openhab.binding.bluetooth.bluez</module>
-
     <module>org.openhab.binding.bluetooth.blukii</module>
-
     <module>org.openhab.binding.bluetooth.daikinmadoka</module>
-
     <module>org.openhab.binding.bluetooth.enoceanble</module>
-
     <module>org.openhab.binding.bluetooth.generic</module>
-
     <module>org.openhab.binding.bluetooth.govee</module>
-
     <module>org.openhab.binding.bluetooth.grundfosalpha</module>
-
     <module>org.openhab.binding.bluetooth.radoneye</module>
-
     <module>org.openhab.binding.bluetooth.roaming</module>
-
     <module>org.openhab.binding.bluetooth.ruuvitag</module>
-
     <module>org.openhab.binding.bondhome</module>
-
     <module>org.openhab.binding.boschindego</module>
-
     <module>org.openhab.binding.boschshc</module>
-
     <module>org.openhab.binding.bosesoundtouch</module>
-
     <module>org.openhab.binding.broadlinkthermostat</module>
-
     <module>org.openhab.binding.bsblan</module>
-
     <module>org.openhab.binding.bticinosmarther</module>
-
     <module>org.openhab.binding.buienradar</module>
-
     <module>org.openhab.binding.caddx</module>
-
     <module>org.openhab.binding.cbus</module>
-
     <module>org.openhab.binding.chatgpt</module>
-
     <module>org.openhab.binding.chromecast</module>
-
     <module>org.openhab.binding.cm11a</module>
-
     <module>org.openhab.binding.comfoair</module>
-
     <module>org.openhab.binding.coolmasternet</module>
-
     <module>org.openhab.binding.coronastats</module>
-
     <module>org.openhab.binding.daikin</module>
-
     <module>org.openhab.binding.dali</module>
-
     <module>org.openhab.binding.danfossairunit</module>
-
     <module>org.openhab.binding.dbquery</module>
-
     <module>org.openhab.binding.deconz</module>
-
     <module>org.openhab.binding.denonmarantz</module>
-
     <module>org.openhab.binding.deutschebahn</module>
-
     <module>org.openhab.binding.digiplex</module>
-
     <module>org.openhab.binding.digitalstrom</module>
-
     <module>org.openhab.binding.dlinksmarthome</module>
-
     <module>org.openhab.binding.dmx</module>
-
     <module>org.openhab.binding.dolbycp</module>
-
     <module>org.openhab.binding.dominoswiss</module>
-
     <module>org.openhab.binding.doorbird</module>
-
     <module>org.openhab.binding.draytonwiser</module>
-
     <module>org.openhab.binding.dscalarm</module>
-
     <module>org.openhab.binding.dsmr</module>
-
     <module>org.openhab.binding.dwdpollenflug</module>
-
     <module>org.openhab.binding.dwdunwetter</module>
-
     <module>org.openhab.binding.easee</module>
-
     <module>org.openhab.binding.echonetlite</module>
-
     <module>org.openhab.binding.ecobee</module>
-
     <module>org.openhab.binding.ecotouch</module>
-
     <module>org.openhab.binding.ecovacs</module>
-
     <module>org.openhab.binding.ecowatt</module>
-
     <module>org.openhab.binding.ekey</module>
-
     <module>org.openhab.binding.electroluxair</module>
-
     <module>org.openhab.binding.elerotransmitterstick</module>
-
     <module>org.openhab.binding.elroconnects</module>
-
     <module>org.openhab.binding.emotiva</module>
-
     <module>org.openhab.binding.energenie</module>
-
     <module>org.openhab.binding.energidataservice</module>
-
     <module>org.openhab.binding.enigma2</module>
-
     <module>org.openhab.binding.enocean</module>
-
     <module>org.openhab.binding.enphase</module>
-
     <module>org.openhab.binding.enturno</module>
-
     <module>org.openhab.binding.ephemeris</module>
-
     <module>org.openhab.binding.epsonprojector</module>
-
     <module>org.openhab.binding.etherrain</module>
-
     <module>org.openhab.binding.evcc</module>
-
     <module>org.openhab.binding.evohome</module>
-
     <module>org.openhab.binding.exec</module>
-
     <module>org.openhab.binding.feed</module>
-
     <module>org.openhab.binding.feican</module>
-
     <module>org.openhab.binding.fenecon</module>
-
     <module>org.openhab.binding.fineoffsetweatherstation</module>
-
     <module>org.openhab.binding.flicbutton</module>
-
     <module>org.openhab.binding.fmiweather</module>
-
     <module>org.openhab.binding.folderwatcher</module>
-
     <module>org.openhab.binding.folding</module>
-
     <module>org.openhab.binding.foobot</module>
-
     <module>org.openhab.binding.freeathome</module>
-
     <module>org.openhab.binding.freebox</module>
-
     <module>org.openhab.binding.freeboxos</module>
-
     <module>org.openhab.binding.freecurrency</module>
-
     <module>org.openhab.binding.frenchgovtenergydata</module>
-
     <module>org.openhab.binding.fronius</module>
-
     <module>org.openhab.binding.fsinternetradio</module>
-
     <module>org.openhab.binding.ftpupload</module>
-
     <module>org.openhab.binding.gardena</module>
-
     <module>org.openhab.binding.gce</module>
-
     <module>org.openhab.binding.generacmobilelink</module>
-
     <module>org.openhab.binding.goecharger</module>
-
     <module>org.openhab.binding.govee</module>
-
     <module>org.openhab.binding.gpio</module>
-
     <module>org.openhab.binding.globalcache</module>
-
     <module>org.openhab.binding.gpstracker</module>
-
     <module>org.openhab.binding.gree</module>
-
     <module>org.openhab.binding.gridbox</module>
-
     <module>org.openhab.binding.groheondus</module>
-
     <module>org.openhab.binding.groupepsa</module>
-
     <module>org.openhab.binding.growatt</module>
-
     <module>org.openhab.binding.guntamatic</module>
-
     <module>org.openhab.binding.haassohnpelletstove</module>
-
     <module>org.openhab.binding.harmonyhub</module>
-
     <module>org.openhab.binding.haywardomnilogic</module>
-
     <module>org.openhab.binding.hccrubbishcollection</module>
-
     <module>org.openhab.binding.hdanywhere</module>
-
     <module>org.openhab.binding.hdpowerview</module>
-
     <module>org.openhab.binding.helios</module>
-
     <module>org.openhab.binding.heliosventilation</module>
-
     <module>org.openhab.binding.heos</module>
-
     <module>org.openhab.binding.herzborg</module>
-
     <module>org.openhab.binding.homeconnect</module>
-
     <module>org.openhab.binding.homematic</module>
-
     <module>org.openhab.binding.homewizard</module>
-
     <module>org.openhab.binding.hpprinter</module>
-
     <module>org.openhab.binding.http</module>
-
     <module>org.openhab.binding.hue</module>
-
     <module>org.openhab.binding.hydrawise</module>
-
     <module>org.openhab.binding.hyperion</module>
-
     <module>org.openhab.binding.iammeter</module>
-
     <module>org.openhab.binding.iaqualink</module>
-
     <module>org.openhab.binding.icalendar</module>
-
     <module>org.openhab.binding.icloud</module>
-
     <module>org.openhab.binding.ihc</module>
-
     <module>org.openhab.binding.insteon</module>
-
     <module>org.openhab.binding.ipcamera</module>
-
     <module>org.openhab.binding.ipobserver</module>
-
     <module>org.openhab.binding.intesis</module>
-
     <module>org.openhab.binding.iotawatt</module>
-
     <module>org.openhab.binding.ipp</module>
-
     <module>org.openhab.binding.irobot</module>
-
     <module>org.openhab.binding.irtrans</module>
-
     <module>org.openhab.binding.ism8</module>
-
     <module>org.openhab.binding.jablotron</module>
-
     <module>org.openhab.binding.jeelink</module>
-
     <module>org.openhab.binding.jellyfin</module>
-
     <module>org.openhab.binding.juicenet</module>
-
     <module>org.openhab.binding.kaleidescape</module>
-
     <module>org.openhab.binding.keba</module>
-
     <module>org.openhab.binding.km200</module>
-
     <module>org.openhab.binding.knx</module>
-
     <module>org.openhab.binding.kodi</module>
-
     <module>org.openhab.binding.konnected</module>
-
     <module>org.openhab.binding.kostalinverter</module>
-
     <module>org.openhab.binding.kvv</module>
-
     <module>org.openhab.binding.lametrictime</module>
-
     <module>org.openhab.binding.lcn</module>
-
     <module>org.openhab.binding.leapmotion</module>
-
     <module>org.openhab.binding.lghombot</module>
-
     <module>org.openhab.binding.lgtvserial</module>
-
     <module>org.openhab.binding.lgwebos</module>
-
     <module>org.openhab.binding.lifx</module>
-
     <module>org.openhab.binding.linky</module>
-
     <module>org.openhab.binding.linuxinput</module>
-
     <module>org.openhab.binding.liquidcheck</module>
-
     <module>org.openhab.binding.lirc</module>
-
     <module>org.openhab.binding.livisismarthome</module>
-
     <module>org.openhab.binding.logreader</module>
-
     <module>org.openhab.binding.loxone</module>
-
     <module>org.openhab.binding.lutron</module>
-
     <module>org.openhab.binding.luxom</module>
-
     <module>org.openhab.binding.luxtronikheatpump</module>
-
     <module>org.openhab.binding.magentatv</module>
-
     <module>org.openhab.binding.mail</module>
-
     <module>org.openhab.binding.max</module>
-
     <module>org.openhab.binding.mcd</module>
-
     <module>org.openhab.binding.mcp23017</module>
-
     <module>org.openhab.binding.meater</module>
-
     <module>org.openhab.binding.mecmeter</module>
-
     <module>org.openhab.binding.melcloud</module>
-
     <module>org.openhab.binding.mercedesme</module>
-
     <module>org.openhab.binding.meteoalerte</module>
-
     <module>org.openhab.binding.meteoblue</module>
-
     <module>org.openhab.binding.meteostick</module>
-
     <module>org.openhab.binding.mffan</module>
-
     <module>org.openhab.binding.miele</module>
-
     <module>org.openhab.binding.mielecloud</module>
-
     <module>org.openhab.binding.mihome</module>
-
     <module>org.openhab.binding.miio</module>
-
     <module>org.openhab.binding.mikrotik</module>
-
     <module>org.openhab.binding.millheat</module>
-
     <module>org.openhab.binding.milight</module>
-
     <module>org.openhab.binding.minecraft</module>
-
     <module>org.openhab.binding.modbus</module>
-
     <module>org.openhab.binding.modbus.e3dc</module>
-
     <module>org.openhab.binding.modbus.sbc</module>
-
     <module>org.openhab.binding.modbus.studer</module>
-
     <module>org.openhab.binding.modbus.sungrow</module>
-
     <module>org.openhab.binding.modbus.sunspec</module>
-
     <module>org.openhab.binding.modbus.stiebeleltron</module>
-
     <module>org.openhab.binding.modbus.helioseasycontrols</module>
-
     <module>org.openhab.binding.monopriceaudio</module>
-
     <module>org.openhab.binding.mpd</module>
-
     <module>org.openhab.binding.mqtt</module>
-
     <module>org.openhab.binding.mqtt.espmilighthub</module>
-
     <module>org.openhab.binding.mqtt.generic</module>
-
     <module>org.openhab.binding.mqtt.homeassistant</module>
-
     <module>org.openhab.binding.mqtt.homie</module>
-
     <module>org.openhab.binding.mqtt.ruuvigateway</module>
-
     <module>org.openhab.binding.mybmw</module>
-
     <module>org.openhab.binding.mycroft</module>
-
     <module>org.openhab.binding.mynice</module>
-
     <module>org.openhab.binding.mystrom</module>
-
     <module>org.openhab.binding.nanoleaf</module>
-
     <module>org.openhab.binding.neato</module>
-
     <module>org.openhab.binding.neeo</module>
-
     <module>org.openhab.binding.neohub</module>
-
     <module>org.openhab.binding.nest</module>
-
     <module>org.openhab.binding.netatmo</module>
-
     <module>org.openhab.binding.network</module>
-
     <module>org.openhab.binding.networkupstools</module>
-
     <module>org.openhab.binding.nibeheatpump</module>
-
     <module>org.openhab.binding.nibeuplink</module>
-
     <module>org.openhab.binding.nikobus</module>
-
     <module>org.openhab.binding.nikohomecontrol</module>
-
     <module>org.openhab.binding.nobohub</module>
-
     <module>org.openhab.binding.novafinedust</module>
-
     <module>org.openhab.binding.ntp</module>
-
     <module>org.openhab.binding.nuki</module>
-
     <module>org.openhab.binding.nuvo</module>
-
     <module>org.openhab.binding.nzwateralerts</module>
-
     <module>org.openhab.binding.oceanic</module>
-
     <module>org.openhab.binding.ojelectronics</module>
-
     <module>org.openhab.binding.omnikinverter</module>
-
     <module>org.openhab.binding.omnilink</module>
-
     <module>org.openhab.binding.onebusaway</module>
-
     <module>org.openhab.binding.onewiregpio</module>
-
     <module>org.openhab.binding.onewire</module>
-
     <module>org.openhab.binding.onkyo</module>
-
     <module>org.openhab.binding.opengarage</module>
-
     <module>org.openhab.binding.opensprinkler</module>
-
     <module>org.openhab.binding.openthermgateway</module>
-
     <module>org.openhab.binding.openuv</module>
-
     <module>org.openhab.binding.openweathermap</module>
-
     <module>org.openhab.binding.openwebnet</module>
-
     <module>org.openhab.binding.oppo</module>
-
     <module>org.openhab.binding.orbitbhyve</module>
-
     <module>org.openhab.binding.orvibo</module>
-
     <module>org.openhab.binding.panasonicbdp</module>
-
     <module>org.openhab.binding.paradoxalarm</module>
-
     <module>org.openhab.binding.pegelonline</module>
-
     <module>org.openhab.binding.pentair</module>
-
     <module>org.openhab.binding.phc</module>
-
     <module>org.openhab.binding.pihole</module>
-
     <module>org.openhab.binding.pilight</module>
-
     <module>org.openhab.binding.pioneeravr</module>
-
     <module>org.openhab.binding.pixometer</module>
-
     <module>org.openhab.binding.pjlinkdevice</module>
-
     <module>org.openhab.binding.playstation</module>
-
     <module>org.openhab.binding.plclogo</module>
-
     <module>org.openhab.binding.plex</module>
-
     <module>org.openhab.binding.plugwise</module>
-
     <module>org.openhab.binding.plugwiseha</module>
-
     <module>org.openhab.binding.powermax</module>
-
     <module>org.openhab.binding.proteusecometer</module>
-
     <module>org.openhab.binding.prowl</module>
-
     <module>org.openhab.binding.publictransportswitzerland</module>
-
     <module>org.openhab.binding.pulseaudio</module>
-
     <module>org.openhab.binding.pushbullet</module>
-
     <module>org.openhab.binding.pushover</module>
-
     <module>org.openhab.binding.pushsafer</module>
-
     <module>org.openhab.binding.qbus</module>
-
     <module>org.openhab.binding.qolsysiq</module>
-
     <module>org.openhab.binding.radiobrowser</module>
-
     <module>org.openhab.binding.radiothermostat</module>
-
     <module>org.openhab.binding.regoheatpump</module>
-
     <module>org.openhab.binding.revogi</module>
-
     <module>org.openhab.binding.remoteopenhab</module>
-
     <module>org.openhab.binding.renault</module>
-
     <module>org.openhab.binding.resol</module>
-
     <module>org.openhab.binding.rfxcom</module>
-
     <module>org.openhab.binding.rme</module>
-
     <module>org.openhab.binding.robonect</module>
-
     <module>org.openhab.binding.roku</module>
-
     <module>org.openhab.binding.rotel</module>
-
     <module>org.openhab.binding.russound</module>
-
     <module>org.openhab.binding.sagercaster</module>
-
     <module>org.openhab.binding.saicismart</module>
-
     <module>org.openhab.binding.salus</module>
-
     <module>org.openhab.binding.samsungtv</module>
-
     <module>org.openhab.binding.satel</module>
-
     <module>org.openhab.binding.semsportal</module>
-
     <module>org.openhab.binding.senechome</module>
-
     <module>org.openhab.binding.seneye</module>
-
     <module>org.openhab.binding.sensebox</module>
-
     <module>org.openhab.binding.sensibo</module>
-
     <module>org.openhab.binding.sensorcommunity</module>
-
     <module>org.openhab.binding.serial</module>
-
     <module>org.openhab.binding.serialbutton</module>
-
     <module>org.openhab.binding.shelly</module>
-
     <module>org.openhab.binding.silvercrestwifisocket</module>
-
     <module>org.openhab.binding.siemenshvac</module>
-
     <module>org.openhab.binding.siemensrds</module>
-
     <module>org.openhab.binding.sinope</module>
-
     <module>org.openhab.binding.sleepiq</module>
-
     <module>org.openhab.binding.smaenergymeter</module>
-
     <module>org.openhab.binding.smartmeter</module>
-
     <module>org.openhab.binding.smartthings</module>
-
     <module>org.openhab.binding.smgw</module>
-
     <module>org.openhab.binding.smhi</module>
-
     <module>org.openhab.binding.smsmodem</module>
-
     <module>org.openhab.binding.sncf</module>
-
     <module>org.openhab.binding.snmp</module>
-
     <module>org.openhab.binding.solaredge</module>
-
     <module>org.openhab.binding.solarforecast</module>
-
     <module>org.openhab.binding.solarlog</module>
-
     <module>org.openhab.binding.solarmax</module>
-
     <module>org.openhab.binding.solarwatt</module>
-
     <module>org.openhab.binding.solax</module>
-
     <module>org.openhab.binding.somfymylink</module>
-
     <module>org.openhab.binding.somfytahoma</module>
-
     <module>org.openhab.binding.somneo</module>
-
     <module>org.openhab.binding.sonnen</module>
-
     <module>org.openhab.binding.sonos</module>
-
     <module>org.openhab.binding.sonyaudio</module>
-
     <module>org.openhab.binding.sonyprojector</module>
-
     <module>org.openhab.binding.souliss</module>
-
     <module>org.openhab.binding.speedtest</module>
-
     <module>org.openhab.binding.spotify</module>
-
     <module>org.openhab.binding.squeezebox</module>
-
     <module>org.openhab.binding.surepetcare</module>
-
     <module>org.openhab.binding.synopanalyzer</module>
-
     <module>org.openhab.binding.systeminfo</module>
-
     <module>org.openhab.binding.tacmi</module>
-
     <module>org.openhab.binding.tado</module>
-
     <module>org.openhab.binding.tankerkoenig</module>
-
     <module>org.openhab.binding.tapocontrol</module>
-
     <module>org.openhab.binding.tasmotaplug</module>
-
     <module>org.openhab.binding.telegram</module>
-
     <module>org.openhab.binding.teleinfo</module>
-
     <module>org.openhab.binding.tellstick</module>
-
     <module>org.openhab.binding.tesla</module>
-
     <module>org.openhab.binding.teslapowerwall</module>
-
     <module>org.openhab.binding.teslascope</module>
-
     <module>org.openhab.binding.tibber</module>
-
     <module>org.openhab.binding.tivo</module>
-
     <module>org.openhab.binding.touchwand</module>
-
     <module>org.openhab.binding.tplinkrouter</module>
-
     <module>org.openhab.binding.tplinksmarthome</module>
-
     <module>org.openhab.binding.tr064</module>
-
     <module>org.openhab.binding.tradfri</module>
-
     <module>org.openhab.binding.unifi</module>
-
     <module>org.openhab.binding.unifiedremote</module>
-
     <module>org.openhab.binding.upnpcontrol</module>
-
     <module>org.openhab.binding.upb</module>
-
     <module>org.openhab.binding.urtsi</module>
-
     <module>org.openhab.binding.valloxmv</module>
-
     <module>org.openhab.binding.vdr</module>
-
     <module>org.openhab.binding.vektiva</module>
-
     <module>org.openhab.binding.velbus</module>
-
     <module>org.openhab.binding.velux</module>
-
     <module>org.openhab.binding.venstarthermostat</module>
-
     <module>org.openhab.binding.ventaair</module>
-
     <module>org.openhab.binding.verisure</module>
-
     <module>org.openhab.binding.vesync</module>
-
     <module>org.openhab.binding.vigicrues</module>
-
     <module>org.openhab.binding.vitotronic</module>
-
     <module>org.openhab.binding.vizio</module>
-
     <module>org.openhab.binding.volvooncall</module>
-
     <module>org.openhab.binding.volumio</module>
-
     <module>org.openhab.binding.warmup</module>
-
     <module>org.openhab.binding.weathercompany</module>
-
     <module>org.openhab.binding.weatherunderground</module>
-
     <module>org.openhab.binding.webexteams</module>
-
     <module>org.openhab.binding.webthing</module>
-
     <module>org.openhab.binding.wemo</module>
-
     <module>org.openhab.binding.wifiled</module>
-
     <module>org.openhab.binding.windcentrale</module>
-
     <module>org.openhab.binding.wlanthermo</module>
-
     <module>org.openhab.binding.wled</module>
-
     <module>org.openhab.binding.wolfsmartset</module>
-
     <module>org.openhab.binding.wundergroundupdatereceiver</module>
-
     <module>org.openhab.binding.x</module>
-
     <module>org.openhab.binding.xmltv</module>
-
     <module>org.openhab.binding.xmppclient</module>
-
     <module>org.openhab.binding.yamahamusiccast</module>
-
     <module>org.openhab.binding.yamahareceiver</module>
-
     <module>org.openhab.binding.yioremote</module>
-
     <module>org.openhab.binding.yeelight</module>
-
     <module>org.openhab.binding.zoneminder</module>
-
     <module>org.openhab.binding.zway</module>
-
     <!-- persistence -->
-
     <module>org.openhab.persistence.dynamodb</module>
-
     <module>org.openhab.persistence.influxdb</module>
-
     <module>org.openhab.persistence.inmemory</module>
-
     <module>org.openhab.persistence.jdbc</module>
-
     <module>org.openhab.persistence.jpa</module>
-
     <module>org.openhab.persistence.mapdb</module>
-
     <module>org.openhab.persistence.mongodb</module>
-
     <module>org.openhab.persistence.rrd4j</module>
-
     <!-- voice -->
-
     <module>org.openhab.voice.googlestt</module>
-
     <module>org.openhab.voice.googletts</module>
-
     <module>org.openhab.voice.mactts</module>
-
     <module>org.openhab.voice.marytts</module>
-
     <module>org.openhab.voice.mimictts</module>
-
     <module>org.openhab.voice.picotts</module>
-
     <module>org.openhab.voice.pipertts</module>
-
     <module>org.openhab.voice.pollytts</module>
-
     <module>org.openhab.voice.rustpotterks</module>
-
     <module>org.openhab.voice.voicerss</module>
-
     <module>org.openhab.voice.voskstt</module>
-
     <module>org.openhab.voice.watsonstt</module>
-
     <module>org.openhab.voice.whisperstt</module>
-
-
   </modules>
 
   <properties>
-
     <m2e.jdt.annotationpath>target/dependency</m2e.jdt.annotationpath>
-
     <dep.noembedding/>
-
   </properties>
 
   <dependencies>
-
     <dependency>
-
       <groupId>org.lastnpe.eea</groupId>
-
       <artifactId>eea-all</artifactId>
-
       <version>${eea.version}</version>
-
     </dependency>
-
     <!-- openHAB core -->
-
     <dependency>
-
       <groupId>org.openhab.core.bom</groupId>
-
       <artifactId>org.openhab.core.bom.compile</artifactId>
-
       <type>pom</type>
-
       <scope>provided</scope>
-
     </dependency>
-
     <dependency>
-
       <groupId>org.openhab.core.bom</groupId>
-
       <artifactId>org.openhab.core.bom.openhab-core</artifactId>
-
       <type>pom</type>
-
       <scope>provided</scope>
-
       <exclusions>
-
         <exclusion>
-
           <groupId>commons-net</groupId>
-
           <artifactId>commons-net</artifactId>
-
         </exclusion>
-
       </exclusions>
-
     </dependency>
-
     <dependency>
-
       <groupId>org.openhab.core.bom</groupId>
-
       <artifactId>org.openhab.core.bom.test</artifactId>
-
       <type>pom</type>
-
       <scope>test</scope>
-
     </dependency>
-
     <!-- Distribution -->
-
     <dependency>
-
       <groupId>org.apache.karaf.features</groupId>
-
       <artifactId>framework</artifactId>
-
       <version>${karaf.version}</version>
-
       <type>kar</type>
-
       <optional>true</optional>
-
       <exclusions>
-
         <exclusion>
-
           <groupId>*</groupId>
-
           <artifactId>*</artifactId>
-
         </exclusion>
-
       </exclusions>
-
     </dependency>
-
     <!-- Repositories -->
-
     <dependency>
-
       <groupId>org.apache.karaf.features</groupId>
-
       <artifactId>standard</artifactId>
-
       <version>${karaf.version}</version>
-
       <classifier>features</classifier>
-
       <type>xml</type>
-
       <scope>provided</scope>
-
     </dependency>
-
   </dependencies>
 
   <build>
-
     <pluginManagement>
-
       <plugins>
-
         <plugin>
-
           <groupId>org.apache.maven.plugins</groupId>
-
           <artifactId>maven-jar-plugin</artifactId>
-
           <configuration>
-
             <archive>
-
               <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-
             </archive>
-
             <skipIfEmpty>true</skipIfEmpty>
-
           </configuration>
-
         </plugin>
-
         <plugin>
-
           <groupId>org.apache.karaf.tooling</groupId>
-
           <artifactId>karaf-maven-plugin</artifactId>
-
           <version>${karaf.version}</version>
-
           <extensions>true</extensions>
-
           <configuration>
-
             <startLevel>80</startLevel>
-
             <aggregateFeatures>true</aggregateFeatures>
-
             <checkDependencyChange>true</checkDependencyChange>
-
             <failOnDependencyChange>false</failOnDependencyChange>
-
             <logDependencyChanges>true</logDependencyChanges>
-
             <overwriteChangedDependencies>true</overwriteChangedDependencies>
-
           </configuration>
-
           <executions>
-
             <execution>
-
               <id>compile</id>
-
               <goals>
-
                 <goal>features-generate-descriptor</goal>
-
               </goals>
-
               <phase>generate-resources</phase>
-
               <configuration>
-
                 <inputFile>${feature.directory}</inputFile>
-
               </configuration>
-
             </execution>
-
             <execution>
-
               <id>karaf-feature-verification</id>
-
               <goals>
-
                 <goal>verify</goal>
-
               </goals>
-
               <phase>verify</phase>
-
               <configuration>
-
                 <descriptors combine.children="append">
-
                   <!-- Apache Karaf -->
-
                   <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
-
                   <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
-
                   <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
-
                   <!-- Current feature under verification -->
-
                   <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
-
                 </descriptors>
-
                 <distribution>org.apache.karaf.features:framework</distribution>
-
                 <javase>${oh.java.version}</javase>
-
                 <framework>
-
                   <feature>framework</feature>
-
                 </framework>
-
                 <features>
-
                   <feature>openhab-*</feature>
-
                 </features>
-
                 <verifyTransitive>false</verifyTransitive>
-
                 <ignoreMissingConditions>true</ignoreMissingConditions>
-
                 <fail>first</fail>
-
               </configuration>
-
             </execution>
-
           </executions>
-
         </plugin>
-
       </plugins>
-
     </pluginManagement>
 
     <plugins>
-
       <plugin>
-
         <groupId>biz.aQute.bnd</groupId>
-
         <artifactId>bnd-maven-plugin</artifactId>
-
       </plugin>
-
       <plugin>
-
         <groupId>org.apache.maven.plugins</groupId>
-
         <artifactId>maven-source-plugin</artifactId>
-
         <executions>
-
           <execution>
-
             <id>attach-sources</id>
-
             <goals>
-
               <goal>jar-no-fork</goal>
-
             </goals>
-
           </execution>
-
         </executions>
-
       </plugin>
-
       <plugin>
-
         <groupId>org.apache.karaf.tooling</groupId>
-
         <artifactId>karaf-maven-plugin</artifactId>
-
       </plugin>
-
       <!-- embed compile time dependencies by unpacking -->
-
       <plugin>
-
         <groupId>org.apache.maven.plugins</groupId>
-
         <artifactId>maven-dependency-plugin</artifactId>
-
         <version>3.6.1</version>
-
         <executions>
-
           <execution>
-
             <id>embed-dependencies</id>
-
             <goals>
-
               <goal>unpack-dependencies</goal>
-
             </goals>
-
             <configuration>
-
               <includeScope>runtime</includeScope>
-
               <includeTypes>jar</includeTypes>
-
               <excludes>**/module-info.class</excludes>
-
               <excludeGroupIds>javax.activation,org.apache.karaf.features,org.lastnpe.eea</excludeGroupIds>
-
               <excludeArtifactIds>${dep.noembedding}</excludeArtifactIds>
-
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
-
               <overWriteReleases>true</overWriteReleases>
-
               <overWriteSnapshots>true</overWriteSnapshots>
-
               <excludeTransitive>true</excludeTransitive>
-
               <type>jar</type>
-
             </configuration>
-
           </execution>
-
           <execution>
-
             <id>unpack-eea</id>
-
             <goals>
-
               <goal>unpack</goal>
-
             </goals>
-
             <configuration>
-
               <artifactItems>
-
                 <artifactItem>
-
                   <groupId>org.lastnpe.eea</groupId>
-
                   <artifactId>eea-all</artifactId>
-
                   <version>${eea.version}</version>
-
                   <overWrite>true</overWrite>
-
                 </artifactItem>
-
               </artifactItems>
-
             </configuration>
-
           </execution>
-
         </executions>
-
       </plugin>
-
     </plugins>
-
   </build>
 
   <profiles>
-
     <!-- suppress embedding of dependencies -->
-
     <profile>
-
       <id>no-embed-dependencies</id>
-
       <activation>
-
         <file>
-
           <exists>noEmbedDependencies.profile</exists>
-
         </file>
-
       </activation>
-
       <build>
-
         <plugins>
-
           <plugin>
-
             <groupId>org.apache.maven.plugins</groupId>
-
             <artifactId>maven-dependency-plugin</artifactId>
-
             <executions>
-
               <execution>
-
                 <id>embed-dependencies</id>
-
                 <phase>none</phase>
-
               </execution>
-
             </executions>
-
           </plugin>
-
         </plugins>
-
       </build>
-
     </profile>
-
   </profiles>
 
-</project>
+</project>
\ No newline at end of file

From 4c081d1019b807316ba2d6284375f11d0e3454c8 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sat, 24 Aug 2024 14:18:42 +0200
Subject: [PATCH 32/36] Fix format conflict.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 5646c6396344a..452cf82e9ead5 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -703,4 +703,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>

From 77b4893a8a531f0d1f4a5614c1c46d1d2ba0a6f8 Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Thu, 29 Aug 2024 21:00:50 +0200
Subject: [PATCH 33/36] [Review]: Removed unnecessary tags.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/pom.xml b/bundles/org.openhab.binding.fenecon/pom.xml
index 6a60b4839a315..fd76dac5b0b88 100644
--- a/bundles/org.openhab.binding.fenecon/pom.xml
+++ b/bundles/org.openhab.binding.fenecon/pom.xml
@@ -14,15 +14,4 @@
 
   <name>openHAB Add-ons :: Bundles :: FENECON Binding</name>
 
-  <inceptionYear>2024</inceptionYear>
-
-  <developers>
-    <developer>
-      <id>nixoso</id>
-      <name>Philipp Schneider</name>
-      <email>philipp.schneider@nixo-soft.de</email>
-      <timezone>Europe/​Berlin</timezone>
-    </developer>
-  </developers>
-
 </project>

From 8f72843f64592e42f3e5443d1c7560510ab1b36f Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Thu, 29 Aug 2024 21:14:11 +0200
Subject: [PATCH 34/36] [Review]: Removed unnecessary comment.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index a42377667185b..1ae8c93676abe 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -63,7 +63,7 @@
 	<!-- Channel Types -->
 	<channel-type id="state">
 		<item-type>String</item-type>
-		<label>System State</label><!-- Use uppercase words, except prepositions. 2-3 words, max 25 chars -->
+		<label>System State</label>
 		<description>FENECON system state</description>
 		<category>Text</category>
 		<state readOnly="true" pattern="%s">

From 354c41e8c51af6605fcae2841e2ed770167e386b Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Thu, 29 Aug 2024 21:21:38 +0200
Subject: [PATCH 35/36] [Review]: Removed unnecessary blank lines.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 bundles/org.openhab.binding.fenecon/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/README.md b/bundles/org.openhab.binding.fenecon/README.md
index 5afd3f944ec76..a2369af576917 100644
--- a/bundles/org.openhab.binding.fenecon/README.md
+++ b/bundles/org.openhab.binding.fenecon/README.md
@@ -27,7 +27,6 @@ The FENECON Thing only needs to be configured with the `hostname`, all other par
 | port            | Port of the FENECON device. Default: 8084                                        |
 | refreshInterval | Interval the device is polled in sec. Default 30 seconds                         |
 
-
 ## Channels
 
 The FENECON binding currently only provides access to read out the values from the energy storage system. 
@@ -52,7 +51,6 @@ The FENECON binding currently only provides access to read out the values from t
 | import-from-grid-power        | Number:Power         | R          | Current import power from grid in watt.                                     |
 | imported-from-grid-energy     | Number:Energy        | R          | Total energy imported from the grid in watt per hour.                       |
 
-
 ## Full Example
 
 ### fenecon.things
@@ -96,7 +94,6 @@ Number:Energy        TotalBuyEnergy                 <energy>       (GF_UtilityRo
 Number:Currency      SoldEnergy "Total sold energy [%.2f €]"           <price> (GF_UtilityRoomSolar)
 Number:Currency      PurchasedEnergy "Total purchased energy [%.2f €]" <price> (GF_UtilityRoomSolar)
 
-
 ```
 
 ### demo.sitemap

From 9bd890851bea6a9f31263af647465bfba31136ec Mon Sep 17 00:00:00 2001
From: Philipp Schneider <philipp.schneider@nixo-soft.de>
Date: Sun, 8 Sep 2024 00:15:30 +0200
Subject: [PATCH 36/36] [Review]: Change from java to jetty common httpclient.

Signed-off-by: Philipp Schneider <philipp.schneider@nixo-soft.de>
---
 .../fenecon/internal/FeneconHandler.java      |  7 ++-
 .../internal/FeneconHandlerFactory.java       | 11 +++-
 .../internal/api/FeneconController.java       | 53 +++++++++----------
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
index 78ab5c1329957..4598079e633af 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandler.java
@@ -18,6 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.jetty.client.HttpClient;
 import org.openhab.binding.fenecon.internal.api.BatteryPower;
 import org.openhab.binding.fenecon.internal.api.FeneconController;
 import org.openhab.binding.fenecon.internal.api.FeneconResponse;
@@ -52,9 +53,11 @@ public class FeneconHandler extends BaseThingHandler {
     private FeneconConfiguration config = new FeneconConfiguration();
     private @Nullable ScheduledFuture<?> pollingJob;
     private @Nullable FeneconController feneconController;
+    private final HttpClient httpClient;
 
-    public FeneconHandler(Thing thing) {
+    public FeneconHandler(Thing thing, HttpClient httpClient) {
         super(thing);
+        this.httpClient = httpClient;
     }
 
     @Override
@@ -63,7 +66,7 @@ public void initialize() {
 
         updateStatus(ThingStatus.UNKNOWN);
 
-        feneconController = new FeneconController(config);
+        feneconController = new FeneconController(config, this.httpClient);
         pollingJob = scheduler.scheduleWithFixedDelay(this::pollingCode, 0, config.refreshInterval, TimeUnit.SECONDS);
     }
 
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
index 05906199e7493..0ac1eaaf5cb8d 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/FeneconHandlerFactory.java
@@ -18,12 +18,15 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.binding.BaseThingHandlerFactory;
 import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 /**
  * The {@link FeneconHandlerFactory} is responsible for creating things and thing
@@ -36,6 +39,12 @@
 public class FeneconHandlerFactory extends BaseThingHandlerFactory {
 
     private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_HOME_DEVICE);
+    private final HttpClientFactory httpClientFactory;
+
+    @Activate
+    public FeneconHandlerFactory(@Reference HttpClientFactory httpClientFactory) {
+        this.httpClientFactory = httpClientFactory;
+    }
 
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {
@@ -47,7 +56,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
         if (THING_TYPE_HOME_DEVICE.equals(thingTypeUID)) {
-            return new FeneconHandler(thing);
+            return new FeneconHandler(thing, httpClientFactory.getCommonHttpClient());
         }
 
         return null;
diff --git a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
index 544a270662541..36fff36bb1f0a 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
+++ b/bundles/org.openhab.binding.fenecon/src/main/java/org/openhab/binding/fenecon/internal/api/FeneconController.java
@@ -12,19 +12,20 @@
  */
 package org.openhab.binding.fenecon.internal.api;
 
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpRequest.Builder;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.time.Duration;
-import java.util.Base64;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.api.AuthenticationStore;
+import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.util.BasicAuthentication;
+import org.eclipse.jetty.http.HttpMethod;
 import org.openhab.binding.fenecon.internal.FeneconConfiguration;
 import org.openhab.binding.fenecon.internal.exception.FeneconAuthenticationException;
 import org.openhab.binding.fenecon.internal.exception.FeneconCommunicationException;
@@ -48,33 +49,24 @@ public class FeneconController {
 
     private final FeneconConfiguration config;
     private final HttpClient httpClient;
-    private final Builder baseHttpRequest;
 
-    public FeneconController(FeneconConfiguration config) {
+    public FeneconController(FeneconConfiguration config, HttpClient httpClient) {
         this.config = config;
+        this.httpClient = httpClient;
 
         logger.debug("FENECON: initialize REST-API connection to {} with polling interval: {} sec", getBaseUrl(config),
                 config.refreshInterval);
 
-        httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
-        baseHttpRequest = createBaseHttpRequest(config);
-    }
-
-    private String getBasicAuthHeader(String username, String password) {
-        String valueToEncode = username + ":" + password;
-        return "Basic " + Base64.getEncoder().encodeToString(valueToEncode.getBytes());
+        // Set BasicAuthentication for all requests on the http connection
+        AuthenticationStore auth = httpClient.getAuthenticationStore();
+        URI uri = URI.create(getBaseUrl(config));
+        auth.addAuthenticationResult(new BasicAuthentication.BasicResult(uri, "x", config.password));
     }
 
     private String getBaseUrl(FeneconConfiguration config) {
         return "http://" + config.hostname + ":" + config.port + "/";
     }
 
-    private Builder createBaseHttpRequest(FeneconConfiguration config) {
-        String basicAuth = getBasicAuthHeader("x", config.password);
-        return HttpRequest.newBuilder().timeout(Duration.ofSeconds(5)).header("Authorization", basicAuth)
-                .header("Content-Type", "application/json").GET();
-    }
-
     /**
      * Queries the data for a specified channel.
      *
@@ -85,13 +77,16 @@ private Builder createBaseHttpRequest(FeneconConfiguration config) {
      */
     public Optional<FeneconResponse> requestChannel(String channel) throws FeneconException {
         try {
-            HttpRequest request = baseHttpRequest.uri(new URI(getBaseUrl(config) + "rest/channel/" + channel)).build();
+            URI uri = new URI(getBaseUrl(config) + "rest/channel/" + channel);
+
+            Request request = httpClient.newRequest(uri).timeout(10, TimeUnit.SECONDS).method(HttpMethod.GET);
             logger.trace("FENECON - request: {}", request);
 
-            HttpResponse<String> response = httpClient.send(request, BodyHandlers.ofString());
-            logger.trace("FENECON - response status code: {} body: {}", response.statusCode(), response.body());
+            ContentResponse response = request.send();
+            logger.trace("FENECON - response status code: {} body: {}", response.getStatus(),
+                    response.getContentAsString());
 
-            int statusCode = response.statusCode();
+            int statusCode = response.getStatus();
             if (statusCode > 300) {
                 // Authentication error
                 if (statusCode == 401) {
@@ -101,9 +96,9 @@ public Optional<FeneconResponse> requestChannel(String channel) throws FeneconEx
                     throw new FeneconCommunicationException("Unexpected http status code: " + statusCode);
                 }
             } else {
-                return createResponseFromJson(JsonParser.parseString(response.body()).getAsJsonObject());
+                return createResponseFromJson(JsonParser.parseString(response.getContentAsString()).getAsJsonObject());
             }
-        } catch (IOException | UnsupportedOperationException | InterruptedException err) {
+        } catch (TimeoutException | ExecutionException | UnsupportedOperationException | InterruptedException err) {
             throw new FeneconCommunicationException("Communication error with FENECON system on channel: " + channel,
                     err);
         } catch (URISyntaxException | JsonSyntaxException err) {