From 46d079bcd5e49a4cec083eecdaecd0aca3566e5d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 24 Mar 2017 14:23:39 +0100 Subject: [PATCH] =?UTF-8?q?Conf=202=C2=B0=20path=20x=20osai=20ed=20inizio?= =?UTF-8?q?=20gestione=202=C2=B0=20path=20in=20strobes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MTC_Adapter/MTC_Adapter/AdapterOsai.cs | 19 +++++++++++++++---- .../DATA/CONF/Adapter_ItemList.xml | 4 ++++ .../MTC_Adapter/Resources/CMS/OSAI.xml | 4 ++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs index 2862604..665f001 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs @@ -305,9 +305,21 @@ namespace MTC_Adapter base.processStrobe(); // gestione multipath: inizializzo al primo (poi verifico da config SE ci sia il secondo...) - int idxPath = 0; - + // cicl su path + for (int i = 0; i < currAdpConf.nPath; i++) + { + processPath(i); + } + // gestione bit di watchdog... sulal DWord successiva + sendWatchDog(); + } + /// + /// Processa strobe x un dato path + /// + /// + private void processPath(int idxPath) + { // verifico i vari strobe x recuperare i dati... DW1 per path1 (indice 0) e DW2 x path1... int memIndex = 0; @@ -446,9 +458,8 @@ namespace MTC_Adapter #endif if (utils.CRB("recTime")) TimingData.addResult(string.Format("W{0}-DW1", retACK_DW1.Length), DateTime.Now.Subtract(inizio).Ticks); } - - sendWatchDog(); } + /// /// Invia (se necessario) il watchdog di stato in vita... blink 0/1 ogni secondo /// diff --git a/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml b/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml index 27c7257..33a225c 100644 --- a/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml +++ b/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml @@ -70,6 +70,10 @@ Path_01 + + Path_02 + + diff --git a/MTC_Adapter/MTC_Adapter/Resources/CMS/OSAI.xml b/MTC_Adapter/MTC_Adapter/Resources/CMS/OSAI.xml index 27c7257..33a225c 100644 --- a/MTC_Adapter/MTC_Adapter/Resources/CMS/OSAI.xml +++ b/MTC_Adapter/MTC_Adapter/Resources/CMS/OSAI.xml @@ -70,6 +70,10 @@ Path_01 + + Path_02 + +