From e5e69e0244164950f80c007887d96c7f3c019590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Bron=C3=A8s?=
<romain.broucquart@synchrotron-soleil.fr>
Date: Mon, 18 Dec 2023 17:01:15 +0100
Subject: [PATCH] fix(opcua) fix lnm names
---
.../generic_chimeratk_server_configuration.xml | 2 +-
recipes-app/fofb-opcua-server/files/lnm_cell.xlmap | 10 ++++++++--
.../fofb-opcua-server/files/lnm_central.xlmap | 14 +++++++-------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/recipes-app/fofb-opcua-server/files/generic_chimeratk_server_configuration.xml b/recipes-app/fofb-opcua-server/files/generic_chimeratk_server_configuration.xml
index 192268d..5c08042 100644
--- a/recipes-app/fofb-opcua-server/files/generic_chimeratk_server_configuration.xml
+++ b/recipes-app/fofb-opcua-server/files/generic_chimeratk_server_configuration.xml
@@ -20,7 +20,7 @@
<!-- Configure device -->
<module name="LNM">
<variable name="triggerPath" type="string" value="/secTimer/tick" />
- <variable name="pathInDevice" type="string" value="/LNM/" />
+ <variable name="pathInDevice" type="string" value="/" />
<variable name="initScript" type="string" value="" />
</module>
diff --git a/recipes-app/fofb-opcua-server/files/lnm_cell.xlmap b/recipes-app/fofb-opcua-server/files/lnm_cell.xlmap
index 5245b26..084c76e 100644
--- a/recipes-app/fofb-opcua-server/files/lnm_cell.xlmap
+++ b/recipes-app/fofb-opcua-server/files/lnm_cell.xlmap
@@ -59,7 +59,7 @@
<redirectedRegister name="ccnpack0_error">
<targetDevice>APPUIO</targetDevice>
- <targetRegister>APP.ccn_packeter_0.UNPACK_ERROR</targetRegister>
+ <targetRegister>APP.ccn_packeter_0.PACKETER_ERROR</targetRegister>
</redirectedRegister>
<redirectedRegister name="ccnpack0_reset_error">
@@ -132,7 +132,7 @@
<redirectedRegister name="combpm_frameseq">
<targetDevice>APPUIO</targetDevice>
- <targetRegister>APP.combpm_0.FRAME_SEQ</targetRegister>
+ <targetRegister>APP.combpm_0.FRAMESEQ</targetRegister>
</redirectedRegister>
<redirectedRegister name="combpm_filter_table">
@@ -140,6 +140,12 @@
<targetRegister>APP.combpm_0.FILTERTABLE</targetRegister>
</redirectedRegister>
+ <redirectedRegister name="combpm_reset_error">
+ <targetDevice>APPUIO</targetDevice>
+ <targetRegister>APP.combpm_0.RESET_ERROR</targetRegister>
+ </redirectedRegister>
+
+
<redirectedRegister name="comcorr_line_id">
<targetDevice>APPUIO</targetDevice>
<targetRegister>APP.comcorr_0.bld_arr</targetRegister>
diff --git a/recipes-app/fofb-opcua-server/files/lnm_central.xlmap b/recipes-app/fofb-opcua-server/files/lnm_central.xlmap
index ad9e663..87fc17e 100644
--- a/recipes-app/fofb-opcua-server/files/lnm_central.xlmap
+++ b/recipes-app/fofb-opcua-server/files/lnm_central.xlmap
@@ -59,7 +59,7 @@
<redirectedRegister name="ccnpack0_error">
<targetDevice>APPUIO</targetDevice>
- <targetRegister>APP.ccn_packeter_0.UNPACK_ERROR</targetRegister>
+ <targetRegister>APP.ccn_packeter_0.PACKETER_ERROR</targetRegister>
</redirectedRegister>
<redirectedRegister name="ccnpack0_reset_error">
@@ -150,7 +150,7 @@
<redirectedRegister name="ccnpack1_error">
<targetDevice>APPUIO</targetDevice>
- <targetRegister>APP.ccn_packeter_1.UNPACK_ERROR</targetRegister>
+ <targetRegister>APP.ccn_packeter_1.PACKETER_ERROR</targetRegister>
</redirectedRegister>
<redirectedRegister name="ccnpack1_reset_error">
@@ -241,7 +241,7 @@
<redirectedRegister name="ccnpack2_error">
<targetDevice>APPUIO</targetDevice>
- <targetRegister>APP.ccn_packeter_2.UNPACK_ERROR</targetRegister>
+ <targetRegister>APP.ccn_packeter_2.PACKETER_ERROR</targetRegister>
</redirectedRegister>
<redirectedRegister name="ccnpack2_reset_error">
@@ -332,7 +332,7 @@
<redirectedRegister name="ccnpack3_error">
<targetDevice>APPUIO</targetDevice>
- <targetRegister>APP.ccn_packeter_3.UNPACK_ERROR</targetRegister>
+ <targetRegister>APP.ccn_packeter_3.PACKETER_ERROR</targetRegister>
</redirectedRegister>
<redirectedRegister name="ccnpack3_reset_error">
@@ -426,14 +426,14 @@
<targetDevice>APPUIO</targetDevice>
<targetRegister>APP.corr_matrix_0.MATRIXCOEF</targetRegister>
<targetStartIndex>0</targetStartIndex>
- <numberOfElements>50</numberOfElements>
+ <numberOfElements>6400</numberOfElements>
</redirectedRegister>
<redirectedRegister name="corr_coeff_y">
<targetDevice>APPUIO</targetDevice>
<targetRegister>APP.corr_matrix_0.MATRIXCOEF</targetRegister>
- <targetStartIndex>50</targetStartIndex>
- <numberOfElements>50</numberOfElements>
+ <targetStartIndex>6400</targetStartIndex>
+ <numberOfElements>6400</numberOfElements>
</redirectedRegister>
<redirectedRegister name="corr_pscid">
--
GitLab