From 67371a7b8cd1c149d8ae10afe889a97c57d24528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E6=B1=82=E5=9C=A3=E5=89=91?=
 <suyulingxm@hotmail.com>
Date: Tue, 25 Nov 2025 10:09:52 +0800
Subject: [PATCH] refactor: update energy flow card configuration for improved
 clarity and functionality

- Reorganized entity references in the energy flow card configuration, introducing a clearer structure for grid, solar, and battery entities.
- Updated sensor mappings for grid consumption and production, battery charge/discharge, and state of charge.
- Removed outdated individual entity configurations to streamline the setup.
---
 custom_components/JackeryHome/sensor.py | 16 ++++-----
 energy_flow_card_config.yaml            | 44 ++++++++-----------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/custom_components/JackeryHome/sensor.py b/custom_components/JackeryHome/sensor.py
index df610ff..09b991a 100644
--- a/custom_components/JackeryHome/sensor.py
+++ b/custom_components/JackeryHome/sensor.py
@@ -465,15 +465,15 @@ class JackeryHomeSensor(SensorEntity):
         
           ## 电池充放电功率 负值为充电，正值为放电
           ## 电网功率 负值为购买，正值为出售
-        # if self._sensor_id == "grid_import_power":
-        #     meter_value
-        # elif self._sensor_id == "grid_export_power":
-        #     return meter_value if meter_value > 0 else 0
+        if self._sensor_id == "grid_import_power":
+            return abs(meter_value) if meter_value < 0 else 0
+        elif self._sensor_id == "grid_export_power":
+            return meter_value if meter_value > 0 else 0
         # # 电池功率：同一个 meter_sn，同步更新 battery_charge_power / battery_discharge_power
-        # elif self._sensor_id == "battery_charge_power":
-        #     return abs(meter_value) if meter_value < 0 else 0
-        # elif self._sensor_id == "battery_discharge_power":
-        #     return meter_value if meter_value > 0 else 0
+        elif self._sensor_id == "battery_charge_power":
+            return abs(meter_value) if meter_value < 0 else 0
+        elif self._sensor_id == "battery_discharge_power":
+            return meter_value if meter_value > 0 else 0
         if self._sensor_id == "battery_soc":
             # Battery SOC 需要乘以 0.1 转换为百分比
             meter_value = meter_value * 0.1
diff --git a/energy_flow_card_config.yaml b/energy_flow_card_config.yaml
index e16779c..672c4c1 100644
--- a/energy_flow_card_config.yaml
+++ b/energy_flow_card_config.yaml
@@ -1,36 +1,20 @@
 type: custom:power-flow-card-plus
 entities:
-  home:
-    entity: sensor.home_power
-    color_icon: solar
-  fossil_fuel_percentage:
-    entity: sensor.battery_soc
-    icon: mdi:pine-tree
-    color_icon: true
+  grid:
+    entity:
+      consumption: sensor.grid_import
+      production: sensor.grid_import
+    display_state: one_way
+    color_circle: true
   solar:
-    icon: mdi:solar-panel-large
     entity: sensor.solar_power
   battery:
-    name: Bateria
-    icon: mdi:bat
     entity:
-      consumption: sensor.battery_charge_power
-      production: sensor.battery_discharge_power
-  individual:
-    - entity: sensor.grid_import_power
-      icon: mdi:transmission-tower-import
-      color: "#80b8ff"
-      name: Grid Import
-      color_icon: false
-    - entity: sensor.grid_export_power
-      icon: mdi:transmission-tower-export
-      color: "#ff8080"
-      name: Grid Export
-      color_icon: true
-w_decimals: 0
-kw_decimals: 2
-min_flow_rate: 0.9
-max_flow_rate: 6
-watt_threshold: 10000
-clickable_entities: true
-title: Power Flow Card Plus
\ No newline at end of file
+      consumption: sensor.battery_charge
+      production: sensor.battery_discharge
+    state_of_charge: sensor.battery_state_of_charge
+    display_state: one_way
+    color_circle: true
+  home:
+    color_icon: true
+watt_threshold: 10000
\ No newline at end of file