From 7bc30655c9065c793be0801ffeafa75281212555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E6=B1=82=E5=9C=A3=E5=89=91?= Date: Mon, 24 Nov 2025 14:32:39 +0800 Subject: [PATCH] refactor: update energy point identifiers in data transmission example and JackeryHome sensor - Updated home energy, grid import/export, and battery charge/discharge point identifiers to new values for consistency across the project. - Adjusted the default device serial number in the JackeryDataCoordinator to an empty string for improved flexibility. --- custom_components/JackeryHome/sensor.py | 10 +++++----- data_transmission_example.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/custom_components/JackeryHome/sensor.py b/custom_components/JackeryHome/sensor.py index fe3f9aa..7db241b 100644 --- a/custom_components/JackeryHome/sensor.py +++ b/custom_components/JackeryHome/sensor.py @@ -29,10 +29,10 @@ METER_SN_MAP = { "battery_soc": "21548033", "solar_energy": "16961537", "home_energy": "16936961", - "grid_import_energy": "16959489", - "grid_export_energy": "16960513", - "battery_charge_energy": "16952321", - "battery_discharge_energy": "16953345", + "grid_import_energy": "16969729", + "grid_export_energy": "16970753", + "battery_charge_energy": "16964609", + "battery_discharge_energy": "16965633", "solar_power": "1026001", "home_power": "21171201", "grid_import_power": "16930817", @@ -149,7 +149,7 @@ class JackeryDataCoordinator: self._data_topic = "v1/iot_gw/gw/data" # 接收设备响应数据的主题 self._data_get_topic = "v1/iot_gw/cloud/data" # 发送数据请求的主题 self._gw_lwt_topic = "v1/iot_gw/gw_lwt" # LWT 主题 - self._device_sn = "26392658575364" # 默认设备序列号 + self._device_sn = "" # 默认设备序列号 self._sensors = {} # 存储所有传感器实体的引用 {sensor_id: entity} self._data_task = None # 定时数据请求任务 self._subscribed = False # 标记是否已订阅 diff --git a/data_transmission_example.py b/data_transmission_example.py index 2c3f6f2..36bbd57 100644 --- a/data_transmission_example.py +++ b/data_transmission_example.py @@ -11,11 +11,11 @@ import paho.mqtt.client as mqtt battery_soc_point = "21548033" ## 能量累计 solar_energy_point = "16961537" -home_energy_point = "16936961" -grid_import_energy_point = "16959489" -grid_export_energy_point = "16960513" -battery_charge_energy_point = "16952321" -battery_discharge_energy_point = "16953345" +home_energy_point = "16980993" +grid_import_energy_point = "16969729" +grid_export_energy_point = "16970753" +battery_charge_energy_point = "16964609" +battery_discharge_energy_point = "16965633" ## 实时功率 solar_power_point = "1026001" home_power_point = "21171201"