From 95df3cc6ebd6d1d9ed0e8812b83781b1fa9c0bf5 Mon Sep 17 00:00:00 2001
From: 0x7878 <17197791+0x7878@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:33:41 +0200
Subject: [PATCH] Improved and added v4 go-charger compatibility

---
 dbus-goecharger.py | 61 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/dbus-goecharger.py b/dbus-goecharger.py
index e193f7f..68a202c 100755
--- a/dbus-goecharger.py
+++ b/dbus-goecharger.py
@@ -25,6 +25,14 @@ class DbusGoeChargerService:
     config = self._getConfig()
     deviceinstance = int(config['DEFAULT']['Deviceinstance'])
     hardwareVersion = int(config['DEFAULT']['HardwareVersion'])
+    pauseBetweenRequests = int(config['ONPREMISE']['PauseBetweenRequests']) # in ms
+    position = int(config['DEFAULT'].get('Position', '1'))
+
+    if pauseBetweenRequests <= 20:
+      raise ValueError("Pause between requests must be greater than 20")
+
+    if hardwareVersion < 4:
+      raise ValueError("Minimum hardware version required is 4.")
 
     self._dbusservice = VeDbusService("{}.http_{:02d}".format(servicename, deviceinstance))
     self._paths = paths
@@ -55,6 +63,7 @@ class DbusGoeChargerService:
     self._dbusservice.add_path('/HardwareVersion', hardwareVersion)
     self._dbusservice.add_path('/Connected', 1)
     self._dbusservice.add_path('/UpdateIndex', 0)
+    self._dbusservice.add_path("/Position", position)
     
     # add paths without units
     for path in paths_wo_unit:
@@ -72,7 +81,7 @@ class DbusGoeChargerService:
     self._chargingTime = 0.0
 
     # add _update function 'timer'
-    gobject.timeout_add(250, self._update) # pause 250ms before the next request
+    gobject.timeout_add(pauseBetweenRequests, self._update)
     
     # add _signOfLife 'timer' to get feedback in log every 5minutes
     gobject.timeout_add(self._getSignOfLifeInterval()*60*1000, self._signOfLife)
@@ -98,7 +107,7 @@ class DbusGoeChargerService:
     accessType = config['DEFAULT']['AccessType']
     
     if accessType == 'OnPremise': 
-        URL = "http://%s/status" % (config['ONPREMISE']['Host'])
+        URL = "http://%s/api/status?filter=fwv,sse,nrg,wh,alw,amp,ama,car" % (config['ONPREMISE']['Host'])
     else:
         raise ValueError("AccessType %s is not supported" % (config['DEFAULT']['AccessType']))
     
@@ -170,19 +179,38 @@ class DbusGoeChargerService:
        data = self._getGoeChargerData()
        
        if data is not None:
+
+          '''
+          data['nrg']
+          0 = U L1
+          1 = U L2
+          2 = U L3
+          3 = U N
+          4 = I L1
+          5 = I L2
+          6 = I L3
+          7 = P L1
+          8 = P L2
+          9 = P L3
+          10 = P N
+          11 = P Total
+          12 = PF L1
+          13 = PF L2
+          14 = PF L3
+          15 = PF N
+          '''
+
           #send data to DBus
-          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)
-          self._dbusservice['/Ac/Power'] = int(data['nrg'][11] * 0.01 * 1000)
-          self._dbusservice['/Ac/Voltage'] = int(data['nrg'][0])
-          self._dbusservice['/Current'] = max(data['nrg'][4] * 0.1, data['nrg'][5] * 0.1, data['nrg'][6] * 0.1)
-          self._dbusservice['/Ac/Energy/Forward'] = int(float(data['eto']) / 10.0)
+          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['/Current'] = max(data['nrg'][4], data['nrg'][5], data['nrg'][6])
+          self._dbusservice['/Ac/Energy/Forward'] = round(data['wh'] / 1000, 2)
           
           self._dbusservice['/StartStop'] = int(data['alw'])
           self._dbusservice['/SetCurrent'] = int(data['amp'])
           self._dbusservice['/MaxCurrent'] = int(data['ama']) 
-          
           # update chargingTime, increment charge time only on active charging (2), reset when no car connected (1)
           timeDelta = time.time() - self._lastUpdate
           if int(data['car']) == 2 and self._lastUpdate > 0:  # vehicle loads
@@ -192,13 +220,6 @@ class DbusGoeChargerService:
           self._dbusservice['/ChargingTime'] = int(self._chargingTime)
 
           self._dbusservice['/Mode'] = 0  # Manual, no control
-          
-          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
@@ -250,9 +271,13 @@ class DbusGoeChargerService:
 
 def main():
   #configure logging
+  config = configparser.ConfigParser()
+  config.read(f"{(os.path.dirname(os.path.realpath(__file__)))}/config.ini")
+  logging_level = config["DEFAULT"]["Logging"].upper()
+
   logging.basicConfig(      format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s',
                             datefmt='%Y-%m-%d %H:%M:%S',
-                            level=logging.INFO,
+                            level=logging_level,
                             handlers=[
                                 logging.FileHandler("%s/current.log" % (os.path.dirname(os.path.realpath(__file__)))),
                                 logging.StreamHandler()