diff --git a/MTC_Adapter/MTC_Adapter/AdapterESA.cs b/MTC_Adapter/MTC_Adapter/AdapterESA.cs index 85e2f32..f9f38ea 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterESA.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterESA.cs @@ -597,6 +597,7 @@ namespace MTC_Adapter lg.Error("Errore connessione mancante in getIotMem_Word"); } + StringBuilder sb = new StringBuilder(); int numAlarmCNC = 0; int numero = 0; int byteNum = 0; @@ -774,6 +775,13 @@ namespace MTC_Adapter } } } + // verifico se nei mandini ho un tool e quanti cambi... + for (int i = 0; i < vettUnOp.Length; i++) + { + if (vettUnOp[i].mUnOpToolId.Value.ToString() != "") sb.AppendLine(string.Format("UnOp_{0}: ToolId: {1} | NumCU: {2}", i+1, vettUnOp[i].mUnOpToolId.Value, vettUnOp[i].mUnOpNumCU.Value)); + } + // update form! + parentForm.dataMonitor_2 += sb.ToString(); } /// /// Carica ed acquisisce dati del buffer DWORD (32 bit) di memoria @@ -986,7 +994,7 @@ namespace MTC_Adapter sb.AppendLine(string.Format("{0}: {1}", mapIOT_String[j].varName, valString)); } // update form! - parentForm.dataMonitor_1 += sb.ToString(); + parentForm.dataMonitor_2 += sb.ToString(); } public override void getGlobalData() { @@ -1000,6 +1008,8 @@ namespace MTC_Adapter { // inizializzo data monitor su FORM parentForm.dataMonitor_1 = ""; + parentForm.dataMonitor_2 = ""; + parentForm.dataMonitor_3 = ""; // recupero le varie memorie (prima string che mi serve x area selezionata --> programma selezionato) getIotMem_String(); @@ -1107,7 +1117,7 @@ namespace MTC_Adapter prevDirAxis[i] = newDir; } - parentForm.dataMonitor_1 += sb.ToString(); + parentForm.dataMonitor_3 += sb.ToString(); } } } diff --git a/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config b/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config index 39a51f1..822e337 100644 --- a/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config +++ b/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config @@ -2,6 +2,7 @@ + @@ -13,11 +14,12 @@ + + - \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config b/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config index d637556..5e0fd1e 100644 --- a/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config +++ b/MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config @@ -2,6 +2,7 @@ + @@ -13,11 +14,12 @@ + + - \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config b/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config index 4aa908e..c6c7394 100644 --- a/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config +++ b/MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config @@ -2,6 +2,7 @@ + @@ -13,11 +14,12 @@ + + - \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config b/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config index 556f6ad..91d6b9d 100644 --- a/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config +++ b/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config @@ -2,6 +2,7 @@ + @@ -14,12 +15,11 @@ - - + \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj index d2d2f7d..6697bc8 100644 --- a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj +++ b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj @@ -168,15 +168,9 @@ Always - - Always - - - Always - - - Always - + + + Designer diff --git a/MTC_Adapter/MTC_Adapter/setupTgt.bat b/MTC_Adapter/MTC_Adapter/setupTgt.bat index dfc906a..845cb96 100644 --- a/MTC_Adapter/MTC_Adapter/setupTgt.bat +++ b/MTC_Adapter/MTC_Adapter/setupTgt.bat @@ -42,7 +42,7 @@ echo SCM: copio files SCM - Rimini del %2"Resources\MTCA.ico" del %2"DATA\CONF\Adapter_ItemList.xml" del %2"DATA\CONF\AlarmList.map" -del %2"DATA\CONF\EsaKvara.ini" +REM del %2"DATA\CONF\EsaKvara.ini" del %2"DATA\CONF\IOT_ByteList.map" del %2"DATA\CONF\IOT_WordList.map" del %2"DATA\CONF\IOT_DWordList.map" diff --git a/MTC_Adapter/VersGen/VersGen.cs b/MTC_Adapter/VersGen/VersGen.cs index 849873e..b7acf8b 100644 --- a/MTC_Adapter/VersGen/VersGen.cs +++ b/MTC_Adapter/VersGen/VersGen.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.5.9999.129")] -[assembly: AssemblyFileVersion("1.5.9999.129")] +[assembly: AssemblyVersion("1.5.9999.141")] +[assembly: AssemblyFileVersion("1.5.9999.141")] [assembly: AssemblyCopyright("Steamware-CMS-SCM © 2015-2017")] [assembly: AssemblyCompany("Steamware-CMS-SCM")]