vikt0rm/dbus-goecharger
1
0
Fork 1
mirror of https://github.com/vikt0rm/dbus-goecharger.git synced 2025-07-30 02:17:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Viktor Markstädter
2025-03-06 08:50:55 +01:00
parent 1981b01ce6
commit 220dec743d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbus-goecharger.py
View File

@ -210,14 +210,14 @@ class DbusGoeChargerService:
#send data to DBus #send data to DBus
self._dbusservice['/Ac/Voltage'] = int(data['nrg'][0]) 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/L1/Power'] = int(data['nrg'][7])
self._dbusservice['/Ac/L2/Power'] = int(data['nrg'][8]) self._dbusservice['/Ac/L2/Power'] = int(data['nrg'][8])
self._dbusservice['/Ac/L3/Power'] = int(data['nrg'][9]) self._dbusservice['/Ac/L3/Power'] = int(data['nrg'][9])
self._dbusservice['/Ac/Power'] = int(data['nrg'][11]) self._dbusservice['/Ac/Power'] = int(data['nrg'][11])
self._dbusservice['/Ac/Energy/Forward'] = int(float(data['eto']) / 1000.0) self._dbusservice['/Ac/Energy/Forward'] = int(float(data['eto']) / 1000.0)
self._dbusservice['/Current'] = max(data['nrg'][4], data['nrg'][5], data['nrg'][6]) 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/L1/Power'] = int(data['nrg'][7] * 0.1 * 1000)
self._dbusservice['/Ac/L2/Power'] = int(data['nrg'][8] * 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) self._dbusservice['/Ac/L3/Power'] = int(data['nrg'][9] * 0.1 * 1000)