vikt0rm/dbus-goecharger
1
0
Fork 1
mirror of https://github.com/vikt0rm/dbus-goecharger.git synced 2025-08-03 12:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from Naiki92/patch-1

Browse Source 
Add HardwareVersion check
This commit is contained in:
vikt0rm
2023-07-04 16:33:01 +02:00
committed by GitHub
parent b184a995b0 2d4917771c
commit 63f3ea80bd
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.ini
View File

@@ -2,6 +2,8 @@
AccessType = OnPremise AccessType = OnPremise
SignOfLifeLog = 1 SignOfLifeLog = 1
Deviceinstance = 43 Deviceinstance = 43
# Go-e charger hardware version: 1 = v1, 2 = v2, 3 = v3
HardwareVersion = 3
[ONPREMISE] [ONPREMISE]
Host=192.168.178.97 Host=192.168.178.97

13
dbus-goecharger.py
View File

@@ -24,7 +24,8 @@ class DbusGoeChargerService:
def __init__(self, servicename, paths, productname='go-eCharger', connection='go-eCharger HTTP JSON service'): def __init__(self, servicename, paths, productname='go-eCharger', connection='go-eCharger HTTP JSON service'):
config = self._getConfig() config = self._getConfig()
deviceinstance = int(config['DEFAULT']['Deviceinstance']) deviceinstance = int(config['DEFAULT']['Deviceinstance'])
hardwareVersion = int(config['DEFAULT']['HardwareVersion'])
self._dbusservice = VeDbusService("{}.http_{:02d}".format(servicename, deviceinstance)) self._dbusservice = VeDbusService("{}.http_{:02d}".format(servicename, deviceinstance))
self._paths = paths self._paths = paths
@@ -49,7 +50,7 @@ class DbusGoeChargerService:
self._dbusservice.add_path('/ProductName', productname) self._dbusservice.add_path('/ProductName', productname)
self._dbusservice.add_path('/CustomName', productname) self._dbusservice.add_path('/CustomName', productname)
self._dbusservice.add_path('/FirmwareVersion', int(data['fwv'].replace('.', ''))) 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('/Serial', data['sse'])
self._dbusservice.add_path('/Connected', 1) self._dbusservice.add_path('/Connected', 1)
self._dbusservice.add_path('/UpdateIndex', 0) self._dbusservice.add_path('/UpdateIndex', 0)
@@ -186,7 +187,13 @@ class DbusGoeChargerService:
self._dbusservice['/ChargingTime'] = int(self._chargingTime) self._dbusservice['/ChargingTime'] = int(self._chargingTime)
self._dbusservice['/Mode'] = 0 # Manual, no control 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 # value 'car' 1: charging station ready, no vehicle 2: vehicle loads 3: Waiting for vehicle 4: Charge finished, vehicle still connected
status = 0 status = 0