Change TR version format

pypcc/pypcc.py

@@ -69,7 +69,7 @@ I2C_threads=[]
 if not(args.test):  
     handler=opcuaserv.InitServer(port=args.port)
     logging.info("Load OPCUA variables & start i2c listing thread")   
-    opcuaserv.AddVarR("TR_software_version_R",git_hash,[],False)
+    opcuaserv.AddVarR("TR_software_version_R",git_hash+"_"+args.config,[],False)
     for i,name in enumerate(I2Cports):
         RCU_I2C=I2Cclients[i]
         RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=name)

setup.py

@@ -5,15 +5,20 @@ def _get_version_hash():
     """Talk to git and find out the tag/hash of our latest commit"""
     try:
 #        p = subprocess.Popen(["git", "rev-parse","HEAD"],
-        p = subprocess.Popen(["git", "show","-s","--format=%ci"],
+#        p = subprocess.Popen(["git", "show","-s","--format=%ci"],
 #        p = subprocess.Popen(["git", "log","-1","--format='%H'"],
+        p = subprocess.Popen(["git", "log","-1","--format='%ct %h'","--abbrev-commit"],
                              stdout=subprocess.PIPE)
     except EnvironmentError:
         print("Couldn't run git to get a version number for setup.py")
         return
+
     ver = p.communicate()[0]
-    ver=ver.strip()
-    ver=str(ver)[2:-1]
+    ver = ver.decode('ascii')[1:-2].split()
+    from datetime import datetime
+    ver="%s_%s"%(datetime.utcfromtimestamp(int(ver[0])).isoformat(),ver[1])
+#    ver=ver.strip()
+#    ver=str(ver)[2:-1]
     print("Git hash=",ver)
     return ver