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

v_1.1.20: Aggiunta gestione emergencyStop x SCM come eccezione da conf app.config + gestione allarmi con ricerca puntuale...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-07-20 14:10:49 +02:00
parent 1bb53142a4
commit 720fb299ce
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Sim/MTC_Sim/AdapterESA.cs
+27
View File
@@ -528,5 +528,32 @@ namespace MTC_Adapter
parentForm.dataMonitor += sb.ToString();
}
public override void processAlarm()
{
base.processAlarm();
// ora controllo "allarmi speciali" se si sono...
if (AlarmFlags != null)
{
// variabili helper
StFlag32 AlarmBlock = 0;
int eStopCode = utils.CRI("eStopCode")-1; // è base zero memoria, ma allarmi base 1...
int memStart = (int)Math.Floor((double)eStopCode / 8);
// leggo 32bit alla volta...
AlarmBlock = (StFlag32)BitConverter.ToUInt32(AlarmFlags, memStart);
int eStopIndex = eStopCode - memStart * 8;
// converto! e aggiungo allarmi sollevati al corretto controller allarmi...
if (AlarmBlock.HasFlag((StFlag32)Math.Pow(2, eStopIndex)))
{
mEStop.Value = "TRIGGERED";
}
else
{
mEStop.Value = "ARMED";
}
}
}
}
}
MTC_Sim/MTC_Sim/App.config
+1 -1
View File
@@ -72,7 +72,7 @@
<add key="SubMode" value="SubMode.txt" />
<!--gestione trigger eventi da allarmi-->
<add key="eStop_code" value="152" />
<add key="eStopCode" value="152" />
</appSettings>
</configuration>
MTC_Sim/VersGen/AdapterVers.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.1.19.94")]
[assembly: AssemblyFileVersion("1.1.19.94")]
[assembly: AssemblyVersion("1.1.20.94")]
[assembly: AssemblyFileVersion("1.1.20.94")]
[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-2016")]
[assembly: AssemblyCompany("Steamware-SCM-CMS")]
MTC_Sim/VersGen/AdapterVers.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.1.19.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.1.19.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.1.20.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.1.20.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware-SCM-CMS")]
<#+