From 220dec743d473edf691df4a8ccd6fc69c82ab307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Markst=C3=A4dter?= Date: Thu, 6 Mar 2025 08:50:55 +0100 Subject: [PATCH] fix merge errors --- dbus-goecharger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbus-goecharger.py b/dbus-goecharger.py index 80b0552..07afd15 100755 --- a/dbus-goecharger.py +++ b/dbus-goecharger.py @@ -210,14 +210,14 @@ class DbusGoeChargerService: #send data to DBus self._dbusservice['/Ac/Voltage'] = int(data['nrg'][0]) - if hardwareVersion < 4 + if hardwareVersion < 4: self._dbusservice['/Ac/L1/Power'] = int(data['nrg'][7]) self._dbusservice['/Ac/L2/Power'] = int(data['nrg'][8]) self._dbusservice['/Ac/L3/Power'] = int(data['nrg'][9]) self._dbusservice['/Ac/Power'] = int(data['nrg'][11]) self._dbusservice['/Ac/Energy/Forward'] = int(float(data['eto']) / 1000.0) self._dbusservice['/Current'] = max(data['nrg'][4], data['nrg'][5], data['nrg'][6]) - else + else: self._dbusservice['/Ac/L1/Power'] = int(data['nrg'][7] * 0.1 * 1000) self._dbusservice['/Ac/L2/Power'] = int(data['nrg'][8] * 0.1 * 1000) self._dbusservice['/Ac/L3/Power'] = int(data['nrg'][9] * 0.1 * 1000)