From 645178b3f99eb94da192129ac7ec33078020472c Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Thu, 5 Mar 2026 09:47:01 +0100
Subject: [PATCH] PV devices added

---
 apps/abstraction/vendors/hottis_pv_modbus.py | 80 +++++++++++++++++++-
 config/devices.yaml                          | 16 ++--
 config/layout.yaml                           |  8 +-
 3 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/apps/abstraction/vendors/hottis_pv_modbus.py b/apps/abstraction/vendors/hottis_pv_modbus.py
index ecc423f..e6f4706 100644
--- a/apps/abstraction/vendors/hottis_pv_modbus.py
+++ b/apps/abstraction/vendors/hottis_pv_modbus.py
@@ -79,13 +79,90 @@ def transform_three_phase_powermeter_to_vendor(payload: dict[str, Any]) -> str:
 
 def transform_three_phase_powermeter_to_abstract(payload: str) -> dict[str, Any]:
     """Transform hottis_pv_modbus three_phase_powermeter payload to abstract format.
-    
+
+
     Transformations:
     - totalImportEnergy        -> energy
     - powerL1/powerL2/powerL3  -> phase1_power/phase2_power/phase3_power
     - voltageL1/voltageL2/voltageL3 -> phase1_voltage/phase2_voltage/phase3_voltage
     - currentL1/currentL2/currentL3 -> phase1_current/phase2_current/phase3_current
     - Sum of powerL1..3        -> total_power
+
+    """
+    data = json.loads(payload)
+
+    def _get_float(key: str, default: float = 0.0) -> float:
+        return float(data.get(key, default))
+
+
+    phase1_power = _get_float("powerL1")
+    phase2_power = _get_float("powerL2")
+    phase3_power = _get_float("powerL3")
+
+    phase1_voltage = _get_float("voltageL1")
+    phase2_voltage = _get_float("voltageL2")
+    phase3_voltage = _get_float("voltageL3")
+
+    phase1_current = _get_float("currentL1")
+    phase2_current = _get_float("currentL2")
+    phase3_current = _get_float("currentL3")
+
+    energy = _get_float("totalImportEnergy")
+
+    return {
+        "energy": energy,
+        "total_power": phase1_power + phase2_power + phase3_power,
+        "phase1_power": phase1_power,
+        "phase2_power": phase2_power,
+        "phase3_power": phase3_power,
+        "phase1_voltage": phase1_voltage,
+        "phase2_voltage": phase2_voltage,
+        "phase3_voltage": phase3_voltage,
+        "phase1_current": phase1_current,
+        "phase2_current": phase2_current,
+        "phase3_current": phase3_current,
+    }
+
+def transform_one_phase_powermeter_to_vendor(payload: dict[str, Any]) -> str:
+    """Transform abstract one_phase_powermeter payload to hottis_pv_modbus format."""
+    vendor_payload = {
+        "energy": payload.get("energy", 0.0),
+        "total_power": payload.get("total_power", 0.0),
+        "phase1_power": payload.get("phase1_power", 0.0),
+        "phase2_power": payload.get("phase2_power", 0.0),
+        "phase3_power": payload.get("phase3_power", 0.0),
+        "phase1_voltage": payload.get("phase1_voltage", 0.0),
+        "phase2_voltage": payload.get("phase2_voltage", 0.0),
+        "phase3_voltage": payload.get("phase3_voltage", 0.0),
+        "phase1_current": payload.get("phase1_current", 0.0),
+        "phase2_current": payload.get("phase2_current", 0.0),
+        "phase3_current": payload.get("phase3_current", 0.0),
+    }
+    return json.dumps(vendor_payload)
+
+
+def transform_one_phase_powermeter_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform hottis_pv_modbus one_phase_powermeter payload to abstract format.
+    
+    {
+      "status": "Ok", 
+      "timestamp": "2026-03-05T08:32:45.523805", 
+      "importEnergyActive": 0.04, 
+      "importEnergyReactive": 0.0, 
+      "exportEnergyActive": 5.44, 
+      "exportEnergyReactive": 2.4, 
+      "powerApparent": 27.06, 
+      "powerActive": 0.0, 
+      "powerReactive": -27.12, 
+      "powerDemandPositive": 0.4, 
+      "powerDemandReverse": 0.0, 
+      "factor": 0.01, 
+      "angle": 271.17, 
+      "voltage": 228.04, 
+      "current": 0.12, 
+      "cnt": 73500
+    }
+
     """
     data = json.loads(payload)
 
@@ -121,6 +198,7 @@ def transform_three_phase_powermeter_to_abstract(payload: str) -> dict[str, Any]
     }
 
 
+
 # Registry of handlers for this vendor
 HANDLERS = {
     ("relay", "to_vendor"): transform_relay_to_vendor,
diff --git a/config/devices.yaml b/config/devices.yaml
index 400155f..2eba63a 100644
--- a/config/devices.yaml
+++ b/config/devices.yaml
@@ -1224,14 +1224,14 @@ devices:
   topics:
     set: "IoT/PV/Control"
     state: "IoT/PV/Control/State"
-- device_id: powermeter_caroutlet
-  homekit_aid: 104
-  name: PV Inverter
-  type: one_phase_powermeter
-  cap_version: "one_phase_powermeter@1.0.0"
-  technology: hottis_pv_modbus
-  topics:
-    state: "IoT/PV/Values"
+#- device_id: powermeter_pv
+#  homekit_aid: 104
+#  name: PV Inverter
+#  type: one_phase_powermeter
+#  cap_version: "one_phase_powermeter@1.0.0"
+#  technology: hottis_pv_modbus
+#  topics:
+#    state: "IoT/PV/Values"
 - device_id: contact_pv
   homekit_aid: 105
   name: PV Contact
diff --git a/config/layout.yaml b/config/layout.yaml
index cb33efa..52fab57 100644
--- a/config/layout.yaml
+++ b/config/layout.yaml
@@ -426,10 +426,10 @@ rooms:
     title: PV Schützzustand
     icon: 🔌
     rank: 425
-  - device_id: powermeter_pv
-    title: PV Messwerte
-    icon: 📊
-    rank: 430
+  #- device_id: powermeter_pv
+  #  title: PV Messwerte
+  #  icon: 📊
+  #  rank: 430