Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aggiunta gestione invio M/S/T veloce + inizio riconf web.config OSAI/FANUC x tempi differenti da SIEMENS

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-06-07 12:34:20 +02:00
parent c5c2b88bef
commit 2ca4008c93
7 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Adapter/MTC/baseUtils.cs
+4
View File
@@ -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>
MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+7 -2
View File
@@ -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)
{
MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
+5
View File
@@ -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)"/>
MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config
+5
View File
@@ -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)"/>
MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config
+5 -1
View File
@@ -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)"/>
MTC_Adapter/MTC_Adapter/App.config
+4 -4
View File
@@ -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-->
MTC_Adapter/MTC_Adapter/MainForm.cs
+7
View File
@@ -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...