From 1af51bb6c7ff6a6fd93860f38374ad90c6195db3 Mon Sep 17 00:00:00 2001
From: Sergei S
Date: Tue, 3 Nov 2020 05:14:01 +0100
Subject: [PATCH] id prefix/suffix
---
scripts/enip-logix/gen_pull.py | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/scripts/enip-logix/gen_pull.py b/scripts/enip-logix/gen_pull.py
index 01bec9c..cc46b3b 100755
--- a/scripts/enip-logix/gen_pull.py
+++ b/scripts/enip-logix/gen_pull.py
@@ -25,6 +25,8 @@ def generate(tag_list,
tag_file=None,
tag_data=None,
config=None,
+ id_prefix='',
+ id_suffix='',
output_stats=True):
def find_tag_in_struct(tag, data):
@@ -105,7 +107,7 @@ def gen_offset(o1, o2, int_if_possible=False):
'type':
DATA_TYPES[d['data_type']],
'set-id':
- tag_name + '.' + tag
+ f'{id_prefix}{tag_name}.{tag}{id_suffix}'
})
return result
@@ -127,7 +129,7 @@ def gen_offset(o1, o2, int_if_possible=False):
TAG,
'process': [{
'offset': 0,
- 'set-id': TAG,
+ 'set-id': f'{id_prefix}{TAG}{id_suffix}',
'type': DATA_TYPES[data['data_type']]
}]
})
@@ -189,6 +191,16 @@ def gen_offset(o1, o2, int_if_possible=False):
type=float,
default=DEFAULT_TIMEOUT)
+ ap.add_argument('--id-prefix',
+ metavar='VALUE',
+ help='ID prefix',
+ default='')
+
+ ap.add_argument('--id-suffix',
+ metavar='VALUE',
+ help='ID suffix',
+ default='')
+
a = ap.parse_args()
if a.source:
@@ -200,4 +212,8 @@ def gen_offset(o1, o2, int_if_possible=False):
else:
config = None
- generate(tag_file=a.tag_file, tag_list=a.tag.split(','), config=config)
+ generate(tag_file=a.tag_file,
+ tag_list=a.tag.split(','),
+ config=config,
+ id_prefix=a.id_prefix,
+ id_suffix=a.id_suffix)