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

completata gestione eventi "unbound", però rimessa gestione legacy valori già gestiti CMS/SCM, fix tempi x trasformazione app.config OSAI

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-06-28 18:53:18 +02:00
parent dfd69c86c9
commit bdc049eb57
3 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+46 -49
View File
@@ -1152,7 +1152,7 @@ namespace MTC_Adapter
// testing e autodiagnostica
mAdapter.AddDataItem(mTestingData);
// strobe/status non riconosciuti
mAdapter.AddDataItem(mUnkStatus);
mAdapter.AddDataItem(mUnkStrobe);
@@ -1486,7 +1486,7 @@ namespace MTC_Adapter
mStatusEvents = new Event[numRiga];
for (int i = 0; i < numRiga; i++)
{
mStatusEvents[i] = new Event(statusData[i].varName);
mStatusEvents[i] = new Event("ST_" + statusData[i].varName);
mAdapter.AddDataItem(mStatusEvents[i]);
}
if (utils.CRB("verbose")) lg.Info(string.Format("inizializzato vettore di {0} MTC.EVENTS di status", numRiga));
@@ -3589,65 +3589,62 @@ namespace MTC_Adapter
status = "INACTIVE";
}
// vecchia versione
if (false)
// gestione AGGIUNTIVA vettori memorie "vecchie" per retrocompatibilità...
if (statusData[i].varName.StartsWith("VacPump_"))
{
if (statusData[i].varName.StartsWith("VacPump_"))
if (statusData[i].varName.EndsWith("_Status"))
{
if (statusData[i].varName.EndsWith("_Status"))
try
{
try
{
numero = Convert.ToInt32(statusData[i].varName.Replace("VacPump_", "").Replace("_Status", ""));
}
catch
{
}
if (numero > 0)
{
vettVacPump[numero - 1].mVacPumpStatus.Value = status;
}
numero = Convert.ToInt32(statusData[i].varName.Replace("VacPump_", "").Replace("_Status", ""));
}
}
else if (statusData[i].varName.StartsWith("Cooler_"))
{
if (statusData[i].varName.EndsWith("_Status"))
catch
{
try
{
numero = Convert.ToInt32(statusData[i].varName.Replace("Cooler_", "").Replace("_Status", ""));
}
catch
{ }
if (numero > 0)
{
vettCooler[numero - 1].mCoolStatus.Value = status;
}
}
}
else if (statusData[i].varName.StartsWith("UnOp_"))
{
if (statusData[i].varName.EndsWith("_Status"))
if (numero > 0)
{
try
{
numero = Convert.ToInt32(statusData[i].varName.Replace("UnOp_", "").Replace("_Status", ""));
}
catch
{ }
if (numero > 0)
{
vettUnOp[numero - 1].mUnOpStatus.Value = status;
}
vettVacPump[numero - 1].mVacPumpStatus.Value = status;
}
}
}
else
else if (statusData[i].varName.StartsWith("Cooler_"))
{
mStatusEvents[i].Value = status;
// accodo ultimi codici in visualizzazione...
sb.AppendLine(string.Format("STS | {0}", mStatusEvents[i]).Replace("|", " | "));
if (statusData[i].varName.EndsWith("_Status"))
{
try
{
numero = Convert.ToInt32(statusData[i].varName.Replace("Cooler_", "").Replace("_Status", ""));
}
catch
{ }
if (numero > 0)
{
vettCooler[numero - 1].mCoolStatus.Value = status;
}
}
}
else if (statusData[i].varName.StartsWith("UnOp_"))
{
if (statusData[i].varName.EndsWith("_Status"))
{
try
{
numero = Convert.ToInt32(statusData[i].varName.Replace("UnOp_", "").Replace("_Status", ""));
}
catch
{ }
if (numero > 0)
{
vettUnOp[numero - 1].mUnOpStatus.Value = status;
}
}
}
// salvo vettore eventi...
mStatusEvents[i].Value = status;
// accodo ultimi codici in visualizzazione...
sb.AppendLine(string.Format("{0}", mStatusEvents[i]).Replace("|", " | "));
//sb.AppendLine(string.Format("STS | {0}", mStatusEvents[i]).Replace("|", " | "));
}
// aggiungo i vari status rilevati
parentForm.dataMonitor_2 += sb.ToString();
MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config
+2 -2
View File
@@ -3,7 +3,7 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--clock di base update...-->
<add key="timerIntMs" value="10" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="timerIntMs" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="fastCount" value="20" 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)"/>
@@ -14,7 +14,7 @@
<add key="autoLoadConf" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="openDumpOnStart" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="procIotMem" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="2" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="3" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<!--COMMENTATO IN DEBUG LOCALE-->
<add key="startMinimized" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="windowCanMax" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
MTC_Adapter/MTC_Adapter/App.config
+1 -1
View File
@@ -10,7 +10,7 @@
<!--gestione TIMERS e periodi multipli x thread lenti-->
<add key="startTimerMs" value="250"/>
<add key="timerIntMs" value="5"/><!--invio da adapter ad agent: 5ms-->
<add key="fastCount" value="60"/><!--100ms-->
<add key="fastCount" value="20"/><!--100ms-->
<add key="normCount" value="100"/><!--500ms-->
<add key="slowCount" value="1000"/><!--5 sec-->
<add key="alarmSyncCount" value="6000"/><!--30 sec-->