From 8a915624e67a23b7d7bbdabc25d866f39db8c818 Mon Sep 17 00:00:00 2001
From: Thijs <snijder@astron.nl>
Date: Tue, 8 Jun 2021 15:52:22 +0200
Subject: [PATCH] aprocessed further reviews
---
CDB/thijs_ConfigDb.json | 35 -----------------------------------
devices/Statistics.py | 2 ++
2 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/CDB/thijs_ConfigDb.json b/CDB/thijs_ConfigDb.json
index 442d5d0d1..85d7df9a6 100644
--- a/CDB/thijs_ConfigDb.json
+++ b/CDB/thijs_ConfigDb.json
@@ -36,13 +36,6 @@
"1": {
"example_device": {
"LTS/example_device/1": {
- "attribute_properties": {
- "Ant_mask_RW": {
- "archive_period": [
- "600000"
- ]
- }
- },
"properties": {
"OPC_Server_Name": [
"host.docker.internal"
@@ -62,13 +55,6 @@
"1": {
"ini_device": {
"LTS/ini_device/1": {
- "attribute_properties": {
- "Ant_mask_RW": {
- "archive_period": [
- "600000"
- ]
- }
- },
"properties": {
"OPC_Server_Name": [
"host.docker.internal"
@@ -88,13 +74,6 @@
"1": {
"APSCTL": {
"LTS/APSCTL/1": {
- "attribute_properties": {
- "Ant_mask_RW": {
- "archive_period": [
- "600000"
- ]
- }
- },
"properties": {
"OPC_Server_Name": [
"ltspi.astron.nl"
@@ -114,13 +93,6 @@
"1": {
"SST": {
"LTS/SST/1": {
- "attribute_properties": {
- "Ant_mask_RW": {
- "archive_period": [
- "600000"
- ]
- }
- },
"properties": {
"SST_Port": [
"5001"
@@ -134,13 +106,6 @@
"1": {
"SNMP": {
"LTS/SNMP/1": {
- "attribute_properties": {
- "Ant_mask_RW": {
- "archive_period": [
- "600000"
- ]
- }
- },
"properties": {
"SNMP_community": [
"public"
diff --git a/devices/Statistics.py b/devices/Statistics.py
index 7625ef54e..6b56b1aaa 100644
--- a/devices/Statistics.py
+++ b/devices/Statistics.py
@@ -45,6 +45,8 @@ class SST(hardware_device):
# ----------
# --------
+ # SST client annotation consists of a dict that contains the parameter name that needs to be read.
+ # Example: comms_annotation={"parameter": "this_value_R"}
packet_count_R = attribute_wrapper(comms_annotation={"parameter": "packet_count_R"}, datatype=numpy.int64)
last_packet_timestamp_R = attribute_wrapper(comms_annotation={"parameter": "last_packet_timestamp_R"}, datatype=numpy.int64)
--
GitLab