From c3e88ca45a610fae6eb6cb33dd4313cf90216f36 Mon Sep 17 00:00:00 2001 From: Naiki92 <44921964+Naiki92@users.noreply.github.com> Date: Wed, 17 May 2023 22:54:28 +0200 Subject: [PATCH] Add hardwareVersion check HardwareVersion check is needed, because GoE v3 is using a different parameter to get controller temperature (`tma` instead of `tmp`) --- dbus-goecharger.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dbus-goecharger.py b/dbus-goecharger.py index 68042b6..2ec7c4c 100755 --- a/dbus-goecharger.py +++ b/dbus-goecharger.py @@ -24,7 +24,8 @@ class DbusGoeChargerService: def __init__(self, servicename, paths, productname='go-eCharger', connection='go-eCharger HTTP JSON service'): config = self._getConfig() deviceinstance = int(config['DEFAULT']['Deviceinstance']) - + hardwareVersion = int(config['DEFAULT']['HardwareVersion']) + self._dbusservice = VeDbusService("{}.http_{:02d}".format(servicename, deviceinstance)) self._paths = paths @@ -49,7 +50,7 @@ class DbusGoeChargerService: self._dbusservice.add_path('/ProductName', productname) self._dbusservice.add_path('/CustomName', productname) self._dbusservice.add_path('/FirmwareVersion', int(data['fwv'].replace('.', ''))) - self._dbusservice.add_path('/HardwareVersion', 2) + self._dbusservice.add_path('/HardwareVersion', hardwareVersion) self._dbusservice.add_path('/Serial', data['sse']) self._dbusservice.add_path('/Connected', 1) self._dbusservice.add_path('/UpdateIndex', 0) @@ -186,7 +187,13 @@ class DbusGoeChargerService: self._dbusservice['/ChargingTime'] = int(self._chargingTime) self._dbusservice['/Mode'] = 0 # Manual, no control - self._dbusservice['/MCU/Temperature'] = int(data['tmp']) + + config = self._getConfig() + hardwareVersion = int(config['DEFAULT']['HardwareVersion']) + if hardwareVersion == 3: + self._dbusservice['/MCU/Temperature'] = int(data['tma'][0]) + else: + self._dbusservice['/MCU/Temperature'] = int(data['tmp']) # value 'car' 1: charging station ready, no vehicle 2: vehicle loads 3: Waiting for vehicle 4: Charge finished, vehicle still connected status = 0