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

vers 1.1.29

Browse Source 
update xml dell'agent + fix (si spera...) della gestione degli allarmi (conditions) su singoli assi, inserita inizializzazione allo start..
This commit is contained in:
Samuele E. Locatelli
2016-08-25 19:07:35 +02:00
parent 9ac3b3c88c
commit 663db46b3c
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AgentBin/CMS.xml
+3 -2
View File
@@ -10,11 +10,12 @@
<DataItem category="SAMPLE" id="ACC_TIME" name="Tempo macchina ON" type="ACCUMULATED_TIME"/>
<DataItem category="SAMPLE" id="ACC_TIME_WORK" name="Tempo macchina in RUN" type="ACCUMULATED_TIME"/>
<DataItem category="SAMPLE" id="CLOCK" type="CLOCK_TIME"/>
<DataItem category="SAMPLE" id="POWER" type="WATTAGE"/>
<DataItem category="SAMPLE" id="POWER" type="MESSAGE"/>
<DataItem category="EVENT" id="OperatorId" type="MESSAGE"/>
<DataItem category="EVENT" id="FUNCT_MODE" type="MESSAGE"/>
<DataItem category="EVENT" id="USER_ACTION" type="MESSAGE"/>
<DataItem category="EVENT" id="TESTING_DATA" type="MESSAGE"/>
<DataItem category="EVENT" id="PROTECTION_STATUS" type="MESSAGE"/>
<DataItem category="EVENT" id="UNK_STATUS" type="MESSAGE"/>
<DataItem category="EVENT" id="UNK_STROBE" type="MESSAGE"/>
<DataItem category="CONDITION" id="CNC" type="SYSTEM"/>
@@ -212,7 +213,7 @@
<Components>
<Electric id="el" name="electric">
<DataItems>
<DataItem category="EVENT" id="p2" name="power" type="POWER_STATE"/>
<!--<DataItem category="EVENT" id="p2" name="power" type="POWER_STATE"/>-->
</DataItems>
</Electric>
<Hydraulic id="hsys" name="hydraulic">
MTC_Sim/MTC_Sim/AdapterGeneric.cs
+5
View File
@@ -1333,6 +1333,9 @@ namespace MTC_Adapter
contDistMovAssi[i] = Convert.ToUInt32(riContDist.Value);
contNumInvAssi[i] = Convert.ToUInt32(riNumInv.Value);
contAxisAccumTime[i] = Convert.ToDouble(riAccTime.Value);
vettAxis[i].mAxAlarmCNC.Normal();
vettAxis[i].mAxAlarmPLC.Normal();
}
currPathPartId = new string[currAdpConf.nPath];
istPathPartId = new string[currAdpConf.nPath];
@@ -1348,6 +1351,8 @@ namespace MTC_Adapter
// recupero valori...
currPathPartId[i] = riPathProgr.Value;
currPathPartCount[i] = Convert.ToUInt32(riPathPzTot.Value);
vettPath[i].mPathAlarmCNC.Normal();
vettPath[i].mPathAlarmPLC.Normal();
}
currVacPumpWrkTime = new uint[currAdpConf.nVacuumPump];
istVacPumpWrkTime = new uint[currAdpConf.nVacuumPump];
MTC_Sim/VersGen/AdapterVers.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.1.28.99")]
[assembly: AssemblyFileVersion("1.1.28.99")]
[assembly: AssemblyVersion("1.1.29.99")]
[assembly: AssemblyFileVersion("1.1.29.99")]
[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.28.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.1.28.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.1.29.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.1.29.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware-SCM-CMS")]
<#+