From 235a52df9293cfe264b70969625b78c301905644 Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Fri, 4 Nov 2022 16:06:11 +0100
Subject: [PATCH] fix decoding of ASCII string parameters
---
Ccs/ccs_function_lib.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py
index 8b3976f..e21c8a7 100644
--- a/Ccs/ccs_function_lib.py
+++ b/Ccs/ccs_function_lib.py
@@ -949,11 +949,12 @@ def parameter_tooltip_text(x):
if isinstance(x, int):
h = hex(x)[2:].upper()
if np.sign(x) == -1:
- h = h.replace('x', '-') + '(THIS IS WRONG!)'
+ h = hex(x)[3:].upper()
elif isinstance(x, float):
h = struct.pack('>f', x).hex().upper()
else:
- h = str(x)
+ # h = str(x)
+ return str(x)
return 'HEX: 0x{}\nDEC: {}'.format(h, x)
@@ -1293,6 +1294,8 @@ def get_calibrated(pcf_name, rawval, properties=None, numerical=False, dbcon=Non
if type_par == timepack[0]:
#return timecal(rawval, 'uint:32,uint:15,uint:1')
return timecal(rawval)
+ elif categ == 'T':
+ return rawval
elif curtx is None:
try:
return rawval if isinstance(rawval, int) else rawval[0]
--
GitLab