From 0ebce0d45e5b43223e5742c94dd62a6bc33181bf Mon Sep 17 00:00:00 2001
From: kruger <kruger@astron.nl>
Date: Wed, 21 Jun 2023 10:26:10 +0200
Subject: [PATCH] renamed software version opcua point to align with sdptr
---
pypcc/pypcc.py | 2 +-
setup.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pypcc/pypcc.py b/pypcc/pypcc.py
index 1e121ca..45b48e0 100755
--- a/pypcc/pypcc.py
+++ b/pypcc/pypcc.py
@@ -68,7 +68,7 @@ configs=[]
if not(args.test):
handler=opcuaserv.InitServer(port=args.port)
logging.info("Load OPCUA variables & start i2c listing thread")
- opcuaserv.AddVarR("pypcc_git_hash",git_hash,[],False)
+ opcuaserv.AddVarR("TR_software_version_R",git_hash,[],False)
for i,name in enumerate(I2Cports):
RCU_I2C=I2Cclients[i]
RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=name)
diff --git a/setup.py b/setup.py
index 16a86eb..bb1e001 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,8 @@ import subprocess
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", "rev-parse","HEAD"],
+ p = subprocess.Popen(["git", "show","-s","--format=%ci"],
# p = subprocess.Popen(["git", "log","-1","--format='%H'"],
stdout=subprocess.PIPE)
except EnvironmentError:
--
GitLab