From 2ca4008c9313c1c2a0bc8f6b14b5a1864fa8c321 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 7 Jun 2017 12:34:20 +0200
Subject: [PATCH] aggiunta gestione invio M/S/T veloce + inizio riconf
 web.config OSAI/FANUC x tempi differenti da SIEMENS

---
 MTC_Adapter/MTC/baseUtils.cs                   | 4 ++++
 MTC_Adapter/MTC_Adapter/AdapterGeneric.cs      | 9 +++++++--
 MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config   | 5 +++++
 MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config    | 5 +++++
 MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config | 6 +++++-
 MTC_Adapter/MTC_Adapter/App.config             | 8 ++++----
 MTC_Adapter/MTC_Adapter/MainForm.cs            | 7 +++++++
 7 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/MTC_Adapter/MTC/baseUtils.cs b/MTC_Adapter/MTC/baseUtils.cs
index 15ff1ff..2a6960b 100644
--- a/MTC_Adapter/MTC/baseUtils.cs
+++ b/MTC_Adapter/MTC/baseUtils.cs
@@ -462,6 +462,10 @@ namespace MTC
 
     public enum gatherCycle
     {
+        /// <summary>
+        /// Very High Frequency (solo x invii...)
+        /// </summary>
+        VHF,
         /// <summary>
         /// lettura dati ad alta frequenza
         /// </summary>
diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
index 8e8522e..8c23376 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
@@ -1934,6 +1934,13 @@ namespace MTC_Adapter
                             // oppure in "modalità classica" con multistep...
                             else
                             {
+                                // ciclo VHF x invii...
+                                if (ciclo == gatherCycle.VHF)
+                                {
+                                    // processo e svuoto eventuali code di invio per Codici M/S/T
+                                    trySendCodMST();
+                                }
+                                // POI CONTROLLO cicli + lenti di lettura...
                                 // ciclo HF: recupero update status & strobes vari
                                 if (ciclo == gatherCycle.HF)
                                 {
@@ -1984,8 +1991,6 @@ namespace MTC_Adapter
                                     // faccio comunque rilettura completa allarmi...
                                     forceAlarmCheck();
                                 }
-                                // processo e svuoto eventuali code di invio per Codici M/S/T
-                                trySendCodMST();
                             }
                             if (showDebugData)
                             {
diff --git a/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config b/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
index 8d04238..00d5271 100644
--- a/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
+++ b/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
@@ -2,6 +2,11 @@
 <!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <appSettings>
+    <!--<add key="timerIntMs" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="fastCount" value="40" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="normCount" value="100" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="slowCount" value="1000" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="alarmSyncCount" value="6000" xdt:Transform="Replace" xdt:Locator="Match(key)"/>-->
     <add key="waitEndCycle" value="0" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="loglevel" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="mode" value="prod" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
diff --git a/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config b/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config
index 8d04238..00d5271 100644
--- a/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config
+++ b/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config
@@ -2,6 +2,11 @@
 <!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <appSettings>
+    <!--<add key="timerIntMs" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="fastCount" value="40" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="normCount" value="100" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="slowCount" value="1000" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="alarmSyncCount" value="6000" xdt:Transform="Replace" xdt:Locator="Match(key)"/>-->
     <add key="waitEndCycle" value="0" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="loglevel" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="mode" value="prod" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
diff --git a/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config b/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config
index 4f368ad..afcbe9d 100644
--- a/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config
+++ b/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config
@@ -2,7 +2,11 @@
 <!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <appSettings>
-    <add key="timerIntMs" value="20" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="timerIntMs" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="fastCount" value="40" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="normCount" value="100" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="slowCount" value="1000" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <add key="alarmSyncCount" value="6000" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="waitEndCycle" value="0" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="loglevel" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="mode" value="prod" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
diff --git a/MTC_Adapter/MTC_Adapter/App.config b/MTC_Adapter/MTC_Adapter/App.config
index b64e1c8..d551a30 100644
--- a/MTC_Adapter/MTC_Adapter/App.config
+++ b/MTC_Adapter/MTC_Adapter/App.config
@@ -9,10 +9,10 @@
     <add key="appName" value="MTConnect Adapter"/>
     <!--gestione TIMERS e periodi multipli x thread lenti-->
     <add key="startTimerMs" value="250"/>
-    <add key="timerIntMs" value="10"/><!--invio da adapter ad agent: 10ms-->
-    <add key="fastCount" value="20"/><!--100ms-->
-    <add key="normCount" value="50"/><!--500ms-->
-    <add key="slowCount" value="500"/><!--5 sec-->
+    <add key="timerIntMs" value="5"/><!--invio da adapter ad agent: 5ms-->
+    <add key="fastCount" value="40"/><!--100ms-->
+    <add key="normCount" value="100"/><!--500ms-->
+    <add key="slowCount" value="1000"/><!--5 sec-->
     <add key="alarmSyncCount" value="6000"/><!--30 sec-->
     <add key="waitEndCycle" value="0"/><!--ms attesa dopo ogni ciclo lettura...-->
     <!--30 sec-->
diff --git a/MTC_Adapter/MTC_Adapter/MainForm.cs b/MTC_Adapter/MTC_Adapter/MainForm.cs
index aef3eca..d319f44 100644
--- a/MTC_Adapter/MTC_Adapter/MainForm.cs
+++ b/MTC_Adapter/MTC_Adapter/MainForm.cs
@@ -571,6 +571,8 @@ namespace MTC_Adapter
                     checkSlowTask();
                     // check esecuzione AlarmSync
                     checkAlarmSync();
+                    // check esecuzione SendTask (VHF)
+                    checkSendTask();
                     if (utils.CRI("waitEndCycle") > 0)
                     {
                         Thread.Sleep(utils.CRI("waitEndCycle"));
@@ -719,6 +721,11 @@ namespace MTC_Adapter
             { }
         }
 
+        private void checkSendTask()
+        {
+            // avvio fase invio con adapter (code MST)
+            agObj.gaterAndSend(gatherCycle.VHF);
+        }
         private void checkFastTask()
         {
             // decremento...