mirror of
https://github.com/vikt0rm/dbus-goecharger.git
synced 2025-06-25 01:11:42 +02:00
fix merge errors
This commit is contained in:
@ -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)
|
||||
|
Reference in New Issue
Block a user