diff --git a/AgentBin/CMS.xml b/AgentBin/CMS.xml index d6a34cf..cfa45eb 100644 --- a/AgentBin/CMS.xml +++ b/AgentBin/CMS.xml @@ -10,11 +10,12 @@ - + + @@ -212,7 +213,7 @@ - + diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index f9f5ee5..ee58d59 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -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]; diff --git a/MTC_Sim/VersGen/AdapterVers.cs b/MTC_Sim/VersGen/AdapterVers.cs index a4d4cce..14c0b3a 100644 --- a/MTC_Sim/VersGen/AdapterVers.cs +++ b/MTC_Sim/VersGen/AdapterVers.cs @@ -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")] diff --git a/MTC_Sim/VersGen/AdapterVers.tt b/MTC_Sim/VersGen/AdapterVers.tt index 579935d..3afbc78 100644 --- a/MTC_Sim/VersGen/AdapterVers.tt +++ b/MTC_Sim/VersGen/AdapterVers.tt @@ -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")] <#+