From edc90b79cbc5fa9011a5d89e04dcd3965cc5e827 Mon Sep 17 00:00:00 2001 From: Carsten Schmiemann Date: Wed, 20 Sep 2023 21:54:53 +0200 Subject: [PATCH] Rename grid-meter to grid_meter --- dbus-node-red-grid-meter/grid_meter.py | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dbus-node-red-grid-meter/grid_meter.py b/dbus-node-red-grid-meter/grid_meter.py index 4f965fc..060359b 100644 --- a/dbus-node-red-grid-meter/grid_meter.py +++ b/dbus-node-red-grid-meter/grid_meter.py @@ -20,7 +20,7 @@ from vedbus import VeDbusService class NodeRedGridMeter: - def __init__(self, servicename, deviceinstance, paths, productname='grid-meter', connection='Node RED HTTP JSON service'): + def __init__(self, servicename, deviceinstance, paths, productname='Zähler Einspeisung', connection='Node RED HTTP JSON service'): self._dbusservice = VeDbusService("{}.http_{:02d}".format(servicename, deviceinstance)) self._paths = paths @@ -115,25 +115,25 @@ class NodeRedGridMeter: meter_data = self._getNodeRedData() #send data to DBus - self._dbusservice['/Ac/Power'] = meter_data['grid-meter']['total_power'] # positive: consumption, negative: feed into grid - self._dbusservice['/Ac/Current'] = meter_data['grid-meter']['total_current'] - self._dbusservice['/Ac/L1/Voltage'] = meter_data['grid-meter']['l1_voltage'] - self._dbusservice['/Ac/L2/Voltage'] = meter_data['grid-meter']['l2_voltage'] - self._dbusservice['/Ac/L3/Voltage'] = meter_data['grid-meter']['l3_voltage'] - self._dbusservice['/Ac/L1/Current'] = meter_data['grid-meter']['l1_current'] - self._dbusservice['/Ac/L2/Current'] = meter_data['grid-meter']['l2_current'] - self._dbusservice['/Ac/L3/Current'] = meter_data['grid-meter']['l3_current'] - self._dbusservice['/Ac/L1/Power'] = meter_data['grid-meter']['l1_power'] - self._dbusservice['/Ac/L2/Power'] = meter_data['grid-meter']['l2_power'] - self._dbusservice['/Ac/L3/Power'] = meter_data['grid-meter']['l3_power'] - self._dbusservice['/Ac/L1/Energy/Forward'] = meter_data['grid-meter']['l1_import'] - self._dbusservice['/Ac/L2/Energy/Forward'] = meter_data['grid-meter']['l2_import'] - self._dbusservice['/Ac/L3/Energy/Forward'] = meter_data['grid-meter']['l3_import'] - self._dbusservice['/Ac/L1/Energy/Reverse'] = meter_data['grid-meter']['l1_export'] - self._dbusservice['/Ac/L2/Energy/Reverse'] = meter_data['grid-meter']['l2_export'] - self._dbusservice['/Ac/L3/Energy/Reverse'] = meter_data['grid-meter']['l3_export'] - self._dbusservice['/Ac/Energy/Forward'] = meter_data['grid-meter']['total_import'] - self._dbusservice['/Ac/Energy/Reverse'] = meter_data['grid-meter']['total_export'] + self._dbusservice['/Ac/Power'] = meter_data['grid_meter']['total_power'] # positive: consumption, negative: feed into grid + self._dbusservice['/Ac/Current'] = meter_data['grid_meter']['total_current'] + self._dbusservice['/Ac/L1/Voltage'] = meter_data['grid_meter']['l1_voltage'] + self._dbusservice['/Ac/L2/Voltage'] = meter_data['grid_meter']['l2_voltage'] + self._dbusservice['/Ac/L3/Voltage'] = meter_data['grid_meter']['l3_voltage'] + self._dbusservice['/Ac/L1/Current'] = meter_data['grid_meter']['l1_current'] + self._dbusservice['/Ac/L2/Current'] = meter_data['grid_meter']['l2_current'] + self._dbusservice['/Ac/L3/Current'] = meter_data['grid_meter']['l3_current'] + self._dbusservice['/Ac/L1/Power'] = meter_data['grid_meter']['l1_power'] + self._dbusservice['/Ac/L2/Power'] = meter_data['grid_meter']['l2_power'] + self._dbusservice['/Ac/L3/Power'] = meter_data['grid_meter']['l3_power'] + self._dbusservice['/Ac/L1/Energy/Forward'] = meter_data['grid_meter']['l1_import'] + self._dbusservice['/Ac/L2/Energy/Forward'] = meter_data['grid_meter']['l2_import'] + self._dbusservice['/Ac/L3/Energy/Forward'] = meter_data['grid_meter']['l3_import'] + self._dbusservice['/Ac/L1/Energy/Reverse'] = meter_data['grid_meter']['l1_export'] + self._dbusservice['/Ac/L2/Energy/Reverse'] = meter_data['grid_meter']['l2_export'] + self._dbusservice['/Ac/L3/Energy/Reverse'] = meter_data['grid_meter']['l3_export'] + self._dbusservice['/Ac/Energy/Forward'] = meter_data['grid_meter']['total_import'] + self._dbusservice['/Ac/Energy/Reverse'] = meter_data['grid_meter']['total_export'] #logging logging.debug("House Consumption (/Ac/Power): %s" % (self._dbusservice['/Ac/Power']))