diff --git a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs index 3cfb769..315b880 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs @@ -10,19 +10,6 @@ namespace MTC_Adapter { public class AdapterFanuc : AdapterGeneric { - /// - /// vettore valori in file interscambio - /// - public Dictionary generalStatus; - /// - /// Contenuto valori maintenance data da PLC - /// - public otherData[] maintData; - /// - /// Contenuto valori status data da PLC - /// - public otherData[] statusData; - /// /// Oggetto MAIN x connessione FANUC /// @@ -659,7 +646,7 @@ namespace MTC_Adapter } else { - Buffer.BlockCopy(MemBlock, 0, AlarmFlags, 0, AlarmFlags.Length); + Buffer.BlockCopy(MemBlock, 0, AlarmFlags, i, MemBlock.Length); } // segnalo allarme letto! memorizzo allarme nel vettore ack.... @@ -890,6 +877,23 @@ namespace MTC_Adapter // verifica se debba salvare e mostrare dati checkSavePersDataLayer(); } + /// + /// Gestione lettura dati analogici + /// + private void getAnalogDataFromPlc() + { + // recupero i dati di manutenzione dall'area di memoria IN BLOCCO + int memIndex = 15000; + byte[] tabDatiAnalogByte = new byte[4 * analogData.Length]; + uint[] tabDatiAnalog = new uint[analogData.Length]; + inizio = DateTime.Now; + FanucMemRW(R, FANUC.MemType.R, memIndex, ref tabDatiAnalogByte); + if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiAnalog", tabDatiAnalogByte.Length*4), DateTime.Now.Subtract(inizio).Ticks); + // copio byte --> word! + Buffer.BlockCopy(tabDatiAnalogByte, 0, tabDatiAnalog, 0, tabDatiAnalogByte.Length); + // decodifico aree memoria secondo tab configurazione + processAnalogData(tabDatiAnalog, analogData); + } /// /// Gestione lettura dati status da PLC @@ -975,7 +979,8 @@ namespace MTC_Adapter // gestisco lettura dati manutenzione da PLC... getMtzDataFromPlc(); - + // gestisco lettura dati analogici da PLC... + getAnalogDataFromPlc(); // gestisco lettura dati status da PLC... getStatusDataFromPlc(); } @@ -985,75 +990,8 @@ namespace MTC_Adapter protected override void loadOtherFile() { base.loadOtherFile(); - loadMaintData(); - loadStatusData(); - } - /// - /// Lettura file gestione dati manutenzione da PLC - /// - private void loadMaintData() - { - // carico dati x Maintenance - if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili manutenzione gestite"); - int totRighe = 0; - string fileName = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("CounterListFilePath")); - string linea; - totRighe = File.ReadLines(fileName).Count(); - // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... - maintData = new otherData[File.ReadLines(fileName).Count()]; - // carica da file... - System.IO.StreamReader file = new System.IO.StreamReader(fileName); - // leggo 1 linea alla volta... - int numRiga = 0; - while ((linea = file.ReadLine()) != null) - { - // SE non è un commento... - if (linea.Substring(0, 1) != "#") - { - //elencoAllarmi[rumRiga] = decodeAlarmLine(linea, ':'); - maintData[numRiga] = decodeOtherData(linea, utils.CRC("testCharSep"), "R", 14000, 4); - numRiga++; - } - } - // chiudo file - file.Close(); - // ora trimmo vettore al solo numero VERO dei valori caricati... - Array.Resize(ref maintData, numRiga); - - if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili manutenzione gestite", numRiga)); - } - /// - /// Lettura file gestione dati status da PLC - /// - private void loadStatusData() - { - // carico dati x Maintenance - if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili status gestite"); - int totRighe = 0; - string fileName = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("StatusListFilePath")); - string linea; - totRighe = File.ReadLines(fileName).Count(); - // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... - statusData = new otherData[File.ReadLines(fileName).Count()]; - // carica da file... - StreamReader file = new StreamReader(fileName); - // leggo 1 linea alla volta... - int numRiga = 0; - while ((linea = file.ReadLine()) != null) - { - // SE non è un commento... - if (linea.Substring(0, 1) != "#") - { - statusData[numRiga] = decodeBitData(linea, utils.CRC("testCharSep"), "R", 14512, 1, numRiga); - numRiga++; - } - } - // chiudo file - file.Close(); - // ora trimmo vettore al solo numero VERO dei valori caricati... - Array.Resize(ref statusData, numRiga); - - if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili status gestite", numRiga)); + loadMaintData("R", 14000, 4); + loadStatusData("R", 14512, 1); } /// /// Processing allarmi CNC @@ -1124,8 +1062,6 @@ namespace MTC_Adapter /// public override void getUnOp() { - base.getUnOp(); - // leggo in blocco tutte le speed da memoria... int memIndex = 3140; // buffer memoria 60 byte... speed (16bit 2 * 20) + load (8bit 1 * 20) visto che sono 20 teste max @@ -1134,36 +1070,8 @@ namespace MTC_Adapter inizio = DateTime.Now; FanucMemRW(R, FANUC.MemType.D, memIndex, ref unOpSpeedMem); if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-SPEED_UNOP", unOpSpeedMem.Length), DateTime.Now.Subtract(inizio).Ticks); - - // NON VA: RICHIEDE OPZIONE... The extended driver/library function is necessary. -#if false - // recupero vettore load spindle... - inizio = DateTime.Now; - CMSCncLib.Focas1.ODBSPN spindleVect = FANUC_ref.getSpindleLoad(); - if (utils.CRB("recTime")) TimingData.addResult("R-SpindleLoad", DateTime.Now.Subtract(inizio).Ticks); -#endif - StringBuilder sb = new StringBuilder(); - - int numUnOp = currAdpConf.nUnOp; - // cicl su path x leggere le velocità dell'UnOp - for (int i = 0; i < numUnOp; i++) - { - // leggo valore Codice - SpeedRate = BitConverter.ToUInt16(unOpSpeedMem, 2 * i); - - // leggo 41° byte = indice 40 + 2*i x le var del carico UnOp - UnOpLoad = unOpSpeedMem[40 + i]; - - //vettUnOp[i].mUnOpNumCU.Value = uoData.UnOpNumCU; - //vettUnOp[i].mUnOpStatus.Value = uoData.UnOpStatus; - //vettUnOp[i].mUnOpAccTime.Value = uoData.UnOpAccTime; - - sb.AppendLine(string.Format("SpeedRate UnOp_{0}: {1} rpm", i + 1, SpeedRate)); - sb.AppendLine(string.Format("Load UnOp_{0}: {1}", i + 1, UnOpLoad)); - } - - - parentForm.dataMonitor_1 += sb.ToString(); + + procUnOp(unOpSpeedMem); } /// /// Procedura di processing lettura memoria x DatiUt - Step 4 diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs index 51603f5..ebff4c7 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs @@ -742,6 +742,10 @@ namespace MTC_Adapter /// public double[] istDistMovAssi; /// + /// Vettore ISTANTANEO dei contatori del LOAD degli assi + /// + public double[] istLoadAssi; + /// /// Vettore ISTANTANEO dei contatori del tempo cumulato degli assi /// public double[] istAccTimeAssi; @@ -786,6 +790,23 @@ namespace MTC_Adapter /// public uint[] istProtMag; + /// + /// vettore valori in file interscambio + /// + public Dictionary generalStatus; + /// + /// Contenuto valori contatori manutenzione da PLC + /// + public otherData[] maintData; + /// + /// Contenuto valori variabili analogiche da PLC + /// + public otherData[] analogData; + /// + /// Contenuto valori status data da PLC + /// + public otherData[] statusData; + /// /// data-ora ultimo controllo movimento assi /// @@ -1336,6 +1357,114 @@ namespace MTC_Adapter protected virtual void loadOtherFile() { + } + /// + /// Lettura file gestione dati manutenzione da PLC + /// + /// + /// + /// + public void loadMaintData(string memPre, int baseAddr, int memSize) + { + // carico dati x Maintenance + if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili manutenzione gestite"); + int totRighe = 0; + string fileName = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("CounterListFilePath")); + string linea; + totRighe = File.ReadLines(fileName).Count(); + // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... + maintData = new otherData[File.ReadLines(fileName).Count()]; + // carica da file... + StreamReader file = new StreamReader(fileName); + // leggo 1 linea alla volta... + int numRiga = 0; + while ((linea = file.ReadLine()) != null) + { + // SE non è un commento... + if (linea.Substring(0, 1) != "#") + { + maintData[numRiga] = decodeOtherData(linea, utils.CRC("testCharSep"), memPre, baseAddr, memSize); + numRiga++; + } + } + // chiudo file + file.Close(); + // ora trimmo vettore al solo numero VERO dei valori caricati... + Array.Resize(ref maintData, numRiga); + + if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili manutenzione gestite", numRiga)); + } + /// + /// Lettura file gestione dati analogici da PLC + /// + /// + /// + /// + public void loadAnalogData(string memPre, int baseAddr, int memSize) + { + // carico dati x Maintenance + if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili analogiche gestite"); + int totRighe = 0; + string fileName = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("AnalogDataFilePath")); + string linea; + totRighe = File.ReadLines(fileName).Count(); + // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... + analogData = new otherData[File.ReadLines(fileName).Count()]; + // carica da file... + StreamReader file = new StreamReader(fileName); + // leggo 1 linea alla volta... + int numRiga = 0; + while ((linea = file.ReadLine()) != null) + { + // SE non è un commento... + if (linea.Substring(0, 1) != "#") + { + analogData[numRiga] = decodeOtherData(linea, utils.CRC("testCharSep"), memPre, baseAddr, memSize); + numRiga++; + } + } + // chiudo file + file.Close(); + // ora trimmo vettore al solo numero VERO dei valori caricati... + Array.Resize(ref analogData, numRiga); + + if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili analogiche gestite", numRiga)); + } + /// + /// Lettura file gestione dati status da PLC + /// + /// + /// + /// + public void loadStatusData(string memPre, int baseAddr, int memSize) + { + // carico dati x Maintenance + if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili status gestite"); + int totRighe = 0; + string fileName = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("StatusListFilePath")); + string linea; + totRighe = File.ReadLines(fileName).Count(); + // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... + statusData = new otherData[File.ReadLines(fileName).Count()]; + // carica da file... + StreamReader file = new StreamReader(fileName); + // leggo 1 linea alla volta... + int numRiga = 0; + while ((linea = file.ReadLine()) != null) + { + // SE non è un commento... + if (linea.Substring(0, 1) != "#") + { + statusData[numRiga] = decodeBitData(linea, utils.CRC("testCharSep"), memPre, baseAddr, memSize, numRiga); + numRiga++; + } + } + // chiudo file + file.Close(); + // ora trimmo vettore al solo numero VERO dei valori caricati... + Array.Resize(ref statusData, numRiga); + + if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili status gestite", numRiga)); } /// /// caricamento allarmi da file @@ -1486,47 +1615,54 @@ namespace MTC_Adapter public void loadPersData() { - // nuova lettura valori da file persistenza... - contOreMaccOn = getStoredValDouble("ACC_TIME"); - contOreMaccLav = getStoredValDouble("ACC_TIME_WORK"); - contSlittaTast = getStoredValDouble("SlittaTastatore_Count"); - - for (int i = 0; i < currAdpConf.nUnOp; i++) + try { - contGiriElettrom[i] = getStoredValUInt(string.Format("UnOp_{0:00}_AccTime", i + 1)); - currNumCambiUt[i] = getStoredValUInt(string.Format("UnOp_{0:00}_NumCU", i + 1)); + // nuova lettura valori da file persistenza... + contOreMaccOn = getStoredValDouble("ACC_TIME"); + contOreMaccLav = getStoredValDouble("ACC_TIME_WORK"); + contSlittaTast = getStoredValDouble("SlittaTastatore_Count"); + + for (int i = 0; i < currAdpConf.nUnOp; i++) + { + contGiriElettrom[i] = getStoredValUInt(string.Format("UnOp_{0:00}_AccTime", i + 1)); + currNumCambiUt[i] = getStoredValUInt(string.Format("UnOp_{0:00}_NumCU", i + 1)); + } + + for (int i = 0; i < currAdpConf.nAxis; i++) + { + contDistMovAssi[i] = getStoredValUInt(string.Format("Axis_{0:00}_DistDone", i + 1)); + contNumInvAssi[i] = getStoredValUInt(string.Format("Axis_{0:00}_InvDDone", i + 1)); + contAccTimeAssi[i] = getStoredValDouble(string.Format("Axis_{0:00}_AccTime", i + 1)); + } + + for (int i = 0; i < currAdpConf.nVacuumPump; i++) + { + currVacPumpWrkTime[i] = getStoredValUInt(string.Format("VacPump_{0:00}_WrkTime", i + 1)); + } + + for (int i = 0; i < currAdpConf.nVacuumAct; i++) + { + currVacActCount[i] = getStoredValUInt(string.Format("VacAct_{0:00}_Count", i + 1)); + } + + for (int i = 0; i < currAdpConf.nLubro; i++) + { + currLubroCount[i] = getStoredValUInt(string.Format("Lubro_{0:00}_Count", i + 1)); + } + + for (int i = 0; i < currAdpConf.nSlittaMag; i++) + { + currSlittaMag[i] = getStoredValUInt(string.Format("SlittaMagazzino_{0:00}_Count", i + 1)); + } + + for (int i = 0; i < currAdpConf.nProtMag; i++) + { + currProtMag[i] = getStoredValUInt(string.Format("ProtMagazzino_{0:00}_Count", i + 1)); + } } - - for (int i = 0; i < currAdpConf.nAxis; i++) + catch (Exception exc) { - contDistMovAssi[i] = getStoredValUInt(string.Format("Axis_{0:00}_DistDone", i + 1)); - contNumInvAssi[i] = getStoredValUInt(string.Format("Axis_{0:00}_InvDDone", i + 1)); - contAccTimeAssi[i] = getStoredValDouble(string.Format("Axis_{0:00}_AccTime", i + 1)); - } - - for (int i = 0; i < currAdpConf.nVacuumPump; i++) - { - currVacPumpWrkTime[i] = getStoredValUInt(string.Format("VacPump_{0:00}_WrkTime", i + 1)); - } - - for (int i = 0; i < currAdpConf.nVacuumAct; i++) - { - currVacActCount[i] = getStoredValUInt(string.Format("VacAct_{0:00}_Count", i + 1)); - } - - for (int i = 0; i < currAdpConf.nLubro; i++) - { - currLubroCount[i] = getStoredValUInt(string.Format("Lubro_{0:00}_Count", i + 1)); - } - - for (int i = 0; i < currAdpConf.nSlittaMag; i++) - { - currSlittaMag[i] = getStoredValUInt(string.Format("SlittaMagazzino_{0:00}_Count", i + 1)); - } - - for (int i = 0; i < currAdpConf.nProtMag; i++) - { - currProtMag[i] = getStoredValUInt(string.Format("ProtMagazzino_{0:00}_Count", i + 1)); + lg.Error(string.Format("Eccezione in decodifica valori PersLayer: {0}{1}", Environment.NewLine, exc)); } } @@ -1583,6 +1719,7 @@ namespace MTC_Adapter // imposto num assi e leggo valori salvati... contDistMovAssi = new double[currAdpConf.nAxis]; istDistMovAssi = new double[currAdpConf.nAxis]; + istLoadAssi = new double[currAdpConf.nAxis]; contNumInvAssi = new uint[currAdpConf.nAxis]; istAccTimeAssi = new double[currAdpConf.nAxis]; contAccTimeAssi = new double[currAdpConf.nAxis]; @@ -2005,13 +2142,34 @@ namespace MTC_Adapter /// public virtual void getUnOp() { - // cicl su UnOp - for (int i = 0; i < currAdpConf.nUnOp; i++) + } + /// + /// Processing dati UnOp + /// + /// + public void procUnOp(byte[] unOpSpeedMem) + { + StringBuilder sb = new StringBuilder(); + + int numUnOp = currAdpConf.nUnOp; + // cicl su path x leggere le velocità dell'UnOp + for (int i = 0; i < numUnOp; i++) { + // leggo valore Codice + SpeedRate = BitConverter.ToUInt16(unOpSpeedMem, 2 * i); + + // leggo 41° byte = indice 40 + 2*i x le var del carico UnOp + UnOpLoad = unOpSpeedMem[40 + i]; + vettUnOp[i].mUnOpSpeed.Value = SpeedRate; - vettUnOp[i].mUnOpSpeedOverr.Value = SpeedRateOver; vettUnOp[i].mUnOpLoad.Value = UnOpLoad; + vettUnOp[i].mUnOpSpeedOverr.Value = SpeedRateOver; + + sb.AppendLine(string.Format("UnOp_{0}: SpeedRate {1} rpm | Load {2}", i + 1, SpeedRate, UnOpLoad)); } + + + parentForm.dataMonitor_2 += sb.ToString(); } /// /// recupero dati ASSI @@ -2333,6 +2491,39 @@ namespace MTC_Adapter } } /// + /// Processa la tabella di memoria dei dati analogici + /// + /// + /// + public void processAnalogData(uint[] tabDatiAnag, otherData[] analogData) + { + // uno ad uno vado a inserirli nella mappa dei dati dell'adapter... + int numero = 0; + uint valRead = 0; + for (int i = 0; i < analogData.Length; i++) + { + numero = 0; + valRead = 0; + // decodifico... + if (analogData[i].varName.StartsWith("Axis_")) + { + if (analogData[i].varName.EndsWith("_Load")) + { + try + { + numero = Convert.ToInt32(analogData[i].varName.Replace("Axis_", "").Replace("_Load", "")); + } + catch + { } + if (numero > 0) + { + istLoadAssi[numero - 1] = tabDatiAnag[i]; + } + } + } + } + } + /// /// processa dataLayer e se necessario salva/mostra /// public void checkSavePersDataLayer() @@ -3329,8 +3520,10 @@ namespace MTC_Adapter } } } - catch - { } + catch (Exception exc) + { + lg.Error(string.Format("Eccezione in getStoredVal: {0}{1}", Environment.NewLine, exc)); + } return value; } /// @@ -3345,8 +3538,10 @@ namespace MTC_Adapter { answ = Convert.ToUInt32(getStoredVal(keyVal)); } - catch - { } + catch (Exception exc) + { + lg.Error(string.Format("Eccezione in getStoredValUInt: {0}{1}", Environment.NewLine, exc)); + } return answ; } /// @@ -3377,8 +3572,10 @@ namespace MTC_Adapter { answ = Convert.ToDouble(getStoredVal(keyVal)); } - catch - { } + catch (Exception exc) + { + lg.Error(string.Format("Eccezione in getStoredValDouble: {0}{1}", Environment.NewLine, exc)); + } return answ; } diff --git a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs index 371d887..96495f5 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs @@ -10,18 +10,6 @@ namespace MTC_Adapter { public class AdapterOsai : AdapterGeneric { - /// - /// vettore valori in file interscambio - /// - public Dictionary generalStatus; - /// - /// Contenuto valori maintenance data da PLC - /// - public otherData[] maintData; - /// - /// Contenuto valori status data da PLC - /// - public otherData[] statusData; /// /// Oggetto MAIN x connessione OSAI /// @@ -167,7 +155,8 @@ namespace MTC_Adapter /// /// Vettore degli allarmi CNC attivi /// - public CMSCncLib.OPENcontrol.MSGERROR allarmiCNC; + //public CMSCncLib.OPENcontrol.MSGERROR allarmiCNC; + public Dictionary allarmiCNC =new Dictionary(); /// /// estende l'init della classe base... /// @@ -1110,6 +1099,20 @@ namespace MTC_Adapter // verifica se debba salvare e mostrare dati checkSavePersDataLayer(); } + /// + /// Gestione lettura dati analogici + /// + private void getAnalogDataFromPlc() + { + // recupero i dati di manutenzione dall'area di memoria IN BLOCCO + int memIndex = 19434; + uint[] tabDatiAnalog = new uint[analogData.Length]; + inizio = DateTime.Now; + OsaiMemRW_DWord(R, OSAI.MemTypeWord.MW_CODE, memIndex, ref tabDatiAnalog); + if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiAnalog", tabDatiAnalog.Length * 4), DateTime.Now.Subtract(inizio).Ticks); + // decodifico aree memoria secondo tab configurazione + processAnalogData(tabDatiAnalog, analogData); + } /// /// Gestione lettura dati status da PLC @@ -1181,13 +1184,32 @@ namespace MTC_Adapter // se ho allarmi li accodo... if (allNcData.lastncerror != 0) { - sb1.AppendLine(string.Format("Allarmi CNC: {0}", allNcData.lastncerror)); - inizio = DateTime.Now; - OSAI_ref.O_ReadCurrentErrorMsg(ref allarmiCNC); - if (utils.CRB("recTime")) TimingData.addResult("R-CNC-ERROR-MSG", DateTime.Now.Subtract(inizio).Ticks); - checkCNCAlarms(); + if (utils.CRI("loglevel") > 5) + { + lg.Info(string.Format("Allarmi CNC: {0} ", allNcData.lastncerror)); + } + string alarmText = string.Format("CNC Alarm - Cod: {0}", allNcData.lastncerror); + allarmiCNC.Add(allNcData.lastncerror.ToString(), alarmText); + // 2017.05.09 gestione allarmi commentata +#if false + mAlarmCNC.Add(MTConnect.Condition.Level.FAULT, alarmText, allNcData.lastncerror.ToString(), "", ""); + // mostro in form! + sb1.AppendLine(alarmText); + parentForm.dataMonitor_1 += sb1.ToString(); +#endif + + // 2017.05.09 gestione allarmi commentata +#if false + // il codice è corretto (manca prima aprte codice + traduzione), se cerco di trovare oggett completo NON c'è, verificare con Andrea... + sb1.AppendLine(string.Format("Allarmi CNC: {0}", allNcData.lastncerror)); + + inizio = DateTime.Now; + OSAI_ref.O_ReadCurrentErrorMsg(ref allarmiCNC); + if (utils.CRB("recTime")) TimingData.addResult("R-CNC-ERROR-MSG", DateTime.Now.Subtract(inizio).Ticks); + checkCNCAlarms(); +#endif #if false // provo altri metodi... CMSCncLib.OPENcontrol.MSGEMERGENCY emergCNC = new CMSCncLib.OPENcontrol.MSGEMERGENCY(); @@ -1198,11 +1220,14 @@ namespace MTC_Adapter } else { - allarmiCNC = new CMSCncLib.OPENcontrol.MSGERROR(); + allarmiCNC.Clear(); + allarmiCNC = new Dictionary(); + // 2017.05.09 gestione allarmi commentata + //allarmiCNC = new CMSCncLib.OPENcontrol.MSGERROR(); } // accodo dati base! - parentForm.dataMonitor_1 = sb1.ToString(); + parentForm.dataMonitor_1 += sb1.ToString(); // accodo dati UT... for (int i = 0; i < currAdpConf.nUnOp; i++) { @@ -1212,7 +1237,8 @@ namespace MTC_Adapter // gestisco lettura dati manutenzione da PLC... getMtzDataFromPlc(); - + // gestisco lettura dati analogici da PLC... + getAnalogDataFromPlc(); // gestisco lettura dati status da PLC... getStatusDataFromPlc(); } @@ -1246,75 +1272,11 @@ namespace MTC_Adapter protected override void loadOtherFile() { base.loadOtherFile(); - loadMaintData(); - loadStatusData(); - } - /// - /// Lettura file gestione dati manutenzione da PLC - /// - private void loadMaintData() - { - // carico dati x Maintenance - if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili manutenzione gestite"); - int totRighe = 0; - string fileName = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("CounterListFilePath")); - string linea; - totRighe = File.ReadLines(fileName).Count(); - // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... - maintData = new otherData[File.ReadLines(fileName).Count()]; - // carica da file... - System.IO.StreamReader file = new System.IO.StreamReader(fileName); - // leggo 1 linea alla volta... - int numRiga = 0; - while ((linea = file.ReadLine()) != null) - { - // SE non è un commento... - if (linea.Substring(0, 1) != "#") - { - //elencoAllarmi[rumRiga] = decodeAlarmLine(linea, ':'); - maintData[numRiga] = decodeOtherData(linea, utils.CRC("testCharSep"), "MW", 19166, 2); - numRiga++; - } - } - // chiudo file - file.Close(); - // ora trimmo vettore al solo numero VERO dei valori caricati... - Array.Resize(ref maintData, numRiga); - - if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili manutenzione gestite", numRiga)); - } - /// - /// Lettura file gestione dati status da PLC - /// - private void loadStatusData() - { - // carico dati x Maintenance - if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili status gestite"); - int totRighe = 0; - string fileName = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("StatusListFilePath")); - string linea; - totRighe = File.ReadLines(fileName).Count(); - // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... - statusData = new otherData[File.ReadLines(fileName).Count()]; - // carica da file... - StreamReader file = new StreamReader(fileName); - // leggo 1 linea alla volta... - int numRiga = 0; - while ((linea = file.ReadLine()) != null) - { - // SE non è un commento... - if (linea.Substring(0, 1) != "#") - { - statusData[numRiga] = decodeBitData(linea, utils.CRC("testCharSep"), "ML", 19426, 2, numRiga); - numRiga++; - } - } - // chiudo file - file.Close(); - // ora trimmo vettore al solo numero VERO dei valori caricati... - Array.Resize(ref statusData, numRiga); - - if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili status gestite", numRiga)); + //loadMaintData("MW", 19166, 2); + loadMaintData("GL", 500, 1); + loadStatusData("M", 19426, 1); + //loadAnalogData("ML", 19434, 2); + loadAnalogData("ML", 9717, 1); } /// /// Processing allarmi CNC @@ -1336,6 +1298,39 @@ namespace MTC_Adapter sendAlarmIfPresent(allarmiCNC); } } + /// + /// Invia singolo allarme CNC se presente (da dictionary) + /// + /// + protected void sendAlarmIfPresent(Dictionary allarmi) + { + // controllo valore... + if (allarmi != null && allarmi.Count > 0) + { + try + { + StringBuilder sb = new StringBuilder(); + + foreach (KeyValuePair item in allarmi) + { + string alarmText = string.Format("{0} - {1}", item.Key, item.Value); + if (utils.CRI("loglevel") > 5) + { + lg.Info(string.Format("Allarme CNC: {0}", alarmText)); + } + mAlarmCNC.Add(MTConnect.Condition.Level.FAULT, alarmText, item.Key, "", ""); + // mostro in form! + sb.AppendLine(alarmText); + } + parentForm.dataMonitor_1 += sb.ToString(); + } + catch (Exception exc) + { + lg.Error(string.Format("{0}", exc)); + } + } + } +#if false /// /// Invia singolo allarme CNC se presente /// @@ -1363,48 +1358,25 @@ namespace MTC_Adapter lg.Error(string.Format("{0}", exc)); } } - } + } +#endif /// /// Recupero dati x UnOp /// public override void getUnOp() { - base.getUnOp(); - // !!!FARE!!! NON HO trovato nulla, verificare con Andrea... -#if false - // leggo in blocco tutte le speed da memoria... - int memIndex = 3140; + int memIndex = 2950; // buffer memoria 60 byte... speed (16bit 2 * 20) + load (8bit 1 * 20) visto che sono 20 teste max byte[] unOpSpeedMem = new byte[60]; - + ushort[] unOpSpeedMemW = new ushort[30]; inizio = DateTime.Now; - OsaiMemRW(R, FANUC.MemType.D, memIndex, ref unOpSpeedMem); + OsaiMemRW_Word(R, OSAI.MemTypeWord.MW_CODE, memIndex, ref unOpSpeedMemW); if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-SPEED_UNOP", unOpSpeedMem.Length), DateTime.Now.Subtract(inizio).Ticks); - StringBuilder sb = new StringBuilder(); - - int numUnOp = currAdpConf.nUnOp; - // cicl su path x leggere le velocità dell'UnOp - for (int i = 0; i < numUnOp; i++) - { - // leggo valore Codice - SpeedRate = BitConverter.ToUInt16(unOpSpeedMem, 2 * i); - - // leggo 41° byte = indice 40 + 2*i x le var del carico UnOp - UnOpLoad = unOpSpeedMem[40 + i]; - - //vettUnOp[i].mUnOpNumCU.Value = uoData.UnOpNumCU; - //vettUnOp[i].mUnOpStatus.Value = uoData.UnOpStatus; - //vettUnOp[i].mUnOpAccTime.Value = uoData.UnOpAccTime; - - sb.AppendLine(string.Format("SpeedRate UnOp_{0}: {1} rpm", i + 1, SpeedRate)); - sb.AppendLine(string.Format("Load UnOp_{0}: {1}", i + 1, UnOpLoad)); - } - - - parentForm.dataMonitor += sb.ToString(); -#endif + // travaso in modalità byte... + Buffer.BlockCopy(unOpSpeedMemW, 0, unOpSpeedMem, 0, unOpSpeedMem.Length); + procUnOp(unOpSpeedMem); } /// @@ -1512,19 +1484,7 @@ namespace MTC_Adapter } } - // NON ci sono nella documentazione GCode OneShot, verificare con Andrea... -#if false - inizio = DateTime.Now; - vettGCodes = OSAI_ref.getPathGCode1Shot(); - if (utils.CRB("recTime")) TimingData.addResult("R-GCodOneShot", DateTime.Now.Subtract(inizio).Ticks); - if (vettGCodes.gcd0.flag > 0) GCodAttivi += string.Format("[{0}]", vettGCodes.gcd0.code); - if (vettGCodes.gcd1.flag > 0) GCodAttivi += string.Format("[{0}]", vettGCodes.gcd1.code); - if (vettGCodes.gcd2.flag > 0) GCodAttivi += string.Format("[{0}]", vettGCodes.gcd2.code); - if (vettGCodes.gcd3.flag > 0) GCodAttivi += string.Format("[{0}]", vettGCodes.gcd3.code); - -#endif - - // NON ci sono nella documentazione metodi x recuperare posizione PuntaUtensile, verificare con Andrea... + // NON ci sono nella documentazione metodi x recuperare posizione PuntaUtensile, in attesa news da OSAI/Andrea... #if false inizio = DateTime.Now; @@ -1585,13 +1545,6 @@ namespace MTC_Adapter OSAI_ref.getAllAxisPos(2, ref posAssi); if (utils.CRB("recTime")) TimingData.addResult("R-AXIS_POS", DateTime.Now.Subtract(inizio).Ticks); - // NON c'è LOAD assi... verificare con Andrea -#if false - inizio = DateTime.Now; - CMSCncLib.Focas1.ODBSVLOAD loadAssi = OSAI_ref.getAllAxisLoad(); - if (utils.CRB("recTime")) TimingData.addResult("R-AXIS_LOAD", DateTime.Now.Subtract(inizio).Ticks); -#endif - // nuova posizione (per calcoli) double newPos = 0; double newPosTgt = 0; @@ -1610,11 +1563,9 @@ namespace MTC_Adapter axName = Convert.ToChar(posAssiTgt[i].AxisName); newPos = posAssi[i].position; newPosTgt = posAssiTgt[i].position; - // popolo valori... tranne LOAD -#if false - vettAxis[i].mAxLoad.Value = (double)(valLoad.data) / Math.Pow(10, valLoad.dec); - newPos = (double)(valPos.abs.data) / Math.Pow(10, valPos.abs.dec); -#endif + + // popolo valori... LOAD gestito da vettore letto con area memoria AnalogData.map + vettAxis[i].mAxLoad.Value = istLoadAssi[i]; vettAxis[i].mAxPosAct.Value = newPos; vettAxis[i].mAxPosTgt.Value = newPosTgt; @@ -1651,19 +1602,14 @@ namespace MTC_Adapter if (utils.CRB("verbose")) { - sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3}, Prg:{2:N3} | {3}", axName, newPos, newPosTgt, direzione)); + sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3} | Prg:{2:N3} | Load:{3:N1} | {4}", axName, newPos, newPosTgt, istLoadAssi[i], direzione)); } // salvo valori vettore prec... prevPosAxis[i] = newPos; prevDirAxis[i] = newDir; - - //vettAxis[i].mAxMainProc.Value = AxData.AxisMainProc; - //vettAxis[i].mAxIsMaster.Value = AxData.AxisIsMaster; - //vettAxis[i].mAxMastId.Value = AxData.AxisMastId; + vettAxis[i].mAxFeedOver.Value = FeedRateOver; - //vettAxis[i].mAxAccelAct.Value = AxData.AxisAccel; - //vettAxis[i].mAxBattery.Value = AxData.AxisBattery; } catch { diff --git a/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs b/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs index 508f1f6..efaf7ce 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs @@ -1275,7 +1275,6 @@ namespace MTC_Adapter } else { - mAlarmCNC.Add(MTConnect.Condition.Level.FAULT, allarme.alm_msg, codAllarme, "", ""); vettAxis[allarme.axis - 1].mAxAlarmCNC.Add(MTConnect.Condition.Level.FAULT, allarme.alm_msg, codAllarme, "", ""); } } diff --git a/MTC_Adapter/MTC_Adapter/App.Release.config b/MTC_Adapter/MTC_Adapter/App.Release.config index c5640df..b4d85b2 100644 --- a/MTC_Adapter/MTC_Adapter/App.Release.config +++ b/MTC_Adapter/MTC_Adapter/App.Release.config @@ -2,9 +2,11 @@ - + + \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/App.config b/MTC_Adapter/MTC_Adapter/App.config index 199b52d..d0d2fe0 100644 --- a/MTC_Adapter/MTC_Adapter/App.config +++ b/MTC_Adapter/MTC_Adapter/App.config @@ -25,14 +25,14 @@ ipPLC = "192.168.139.100"--> - + - - + @@ -48,7 +48,7 @@ - + @@ -64,6 +64,7 @@ + diff --git a/MTC_Adapter/MTC_Adapter/DATA/CONF/AnalogData.map b/MTC_Adapter/MTC_Adapter/DATA/CONF/AnalogData.map new file mode 100644 index 0000000..9e81ede --- /dev/null +++ b/MTC_Adapter/MTC_Adapter/DATA/CONF/AnalogData.map @@ -0,0 +1,7 @@ +# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura) +001|Axis_01_Load |NUM +002|Axis_02_Load |NUM +003|Axis_03_Load |NUM +004|Axis_04_Load |NUM +005|Axis_05_Load |NUM +006|Axis_06_Load |NUM \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/DATA/DAT/PersistData.dat b/MTC_Adapter/MTC_Adapter/DATA/DAT/PersistData.dat index ea7fd62..d72ce69 100644 Binary files a/MTC_Adapter/MTC_Adapter/DATA/DAT/PersistData.dat and b/MTC_Adapter/MTC_Adapter/DATA/DAT/PersistData.dat differ diff --git a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj index 8180828..0f9fdc4 100644 --- a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj +++ b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj @@ -51,7 +51,7 @@ TRACE prompt 4 - false + true Resources\MTCA.ico @@ -163,6 +163,21 @@ SetupAdapter.cs + + Always + + + Always + + + Always + + + Always + + + Always + Designer @@ -273,9 +288,6 @@ App.config True - - PreserveNewest - diff --git a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs index 183f95a..f984ba2 100644 --- a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs +++ b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs @@ -141,6 +141,7 @@ this.tabCtrlMain = new System.Windows.Forms.TabControl(); this.tpStatus = new System.Windows.Forms.TabPage(); this.gbMonitor = new System.Windows.Forms.GroupBox(); + this.lblOutMessage3 = new System.Windows.Forms.Label(); this.lblOutMessage = new System.Windows.Forms.Label(); this.lblOutMessage2 = new System.Windows.Forms.Label(); this.groupBox6 = new System.Windows.Forms.GroupBox(); @@ -217,7 +218,6 @@ this.label20 = new System.Windows.Forms.Label(); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.trayMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.lblOutMessage3 = new System.Windows.Forms.Label(); this.groupBox4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PosAct)).BeginInit(); this.groupBox3.SuspendLayout(); @@ -246,10 +246,9 @@ // PlcErr_02 // this.PlcErr_02.AutoSize = true; - this.PlcErr_02.Location = new System.Drawing.Point(128, 53); - this.PlcErr_02.Margin = new System.Windows.Forms.Padding(4); + this.PlcErr_02.Location = new System.Drawing.Point(96, 43); this.PlcErr_02.Name = "PlcErr_02"; - this.PlcErr_02.Size = new System.Drawing.Size(92, 21); + this.PlcErr_02.Size = new System.Drawing.Size(72, 17); this.PlcErr_02.TabIndex = 6; this.PlcErr_02.Text = "PlcErr_05"; this.PlcErr_02.UseVisualStyleBackColor = true; @@ -265,11 +264,9 @@ this.groupBox4.Controls.Add(this.label7); this.groupBox4.Controls.Add(this.messageText); this.groupBox4.Controls.Add(this.messageCode); - this.groupBox4.Location = new System.Drawing.Point(5, 514); - this.groupBox4.Margin = new System.Windows.Forms.Padding(4); + this.groupBox4.Location = new System.Drawing.Point(4, 418); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(4); - this.groupBox4.Size = new System.Drawing.Size(505, 64); + this.groupBox4.Size = new System.Drawing.Size(379, 52); this.groupBox4.TabIndex = 44; this.groupBox4.TabStop = false; this.groupBox4.Text = "Message"; @@ -277,136 +274,123 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(157, 32); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(118, 26); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(35, 17); + this.label8.Size = new System.Drawing.Size(28, 13); this.label8.TabIndex = 19; this.label8.Text = "Text"; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(5, 32); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(4, 26); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(41, 17); + this.label7.Size = new System.Drawing.Size(32, 13); this.label7.TabIndex = 18; this.label7.Text = "Code"; // // messageText // - this.messageText.Location = new System.Drawing.Point(201, 28); - this.messageText.Margin = new System.Windows.Forms.Padding(4); + this.messageText.Location = new System.Drawing.Point(151, 23); this.messageText.Name = "messageText"; - this.messageText.Size = new System.Drawing.Size(285, 22); + this.messageText.Size = new System.Drawing.Size(215, 20); this.messageText.TabIndex = 14; this.messageText.Leave += new System.EventHandler(this.message_Leave); // // messageCode // - this.messageCode.Location = new System.Drawing.Point(67, 28); - this.messageCode.Margin = new System.Windows.Forms.Padding(4); + this.messageCode.Location = new System.Drawing.Point(50, 23); this.messageCode.Name = "messageCode"; - this.messageCode.Size = new System.Drawing.Size(81, 22); + this.messageCode.Size = new System.Drawing.Size(62, 20); this.messageCode.TabIndex = 13; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(16, 452); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(12, 367); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(0, 17); + this.label6.Size = new System.Drawing.Size(0, 13); this.label6.TabIndex = 43; // // AxFeedOverValue // - this.AxFeedOverValue.Location = new System.Drawing.Point(353, 201); - this.AxFeedOverValue.Margin = new System.Windows.Forms.Padding(4); + this.AxFeedOverValue.Location = new System.Drawing.Point(265, 163); this.AxFeedOverValue.Name = "AxFeedOverValue"; - this.AxFeedOverValue.Size = new System.Drawing.Size(132, 22); + this.AxFeedOverValue.Size = new System.Drawing.Size(100, 20); this.AxFeedOverValue.TabIndex = 26; // // AxFeedActValue // - this.AxFeedActValue.Location = new System.Drawing.Point(353, 175); - this.AxFeedActValue.Margin = new System.Windows.Forms.Padding(4); + this.AxFeedActValue.Location = new System.Drawing.Point(265, 142); this.AxFeedActValue.Name = "AxFeedActValue"; - this.AxFeedActValue.Size = new System.Drawing.Size(132, 22); + this.AxFeedActValue.Size = new System.Drawing.Size(100, 20); this.AxFeedActValue.TabIndex = 25; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(16, 204); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Location = new System.Drawing.Point(12, 166); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(75, 17); + this.label9.Size = new System.Drawing.Size(57, 13); this.label9.TabIndex = 24; this.label9.Text = "Feed Over"; // // AxFeedOver // - this.AxFeedOver.Location = new System.Drawing.Point(108, 201); + this.AxFeedOver.Location = new System.Drawing.Point(81, 163); this.AxFeedOver.Maximum = 150; this.AxFeedOver.Name = "AxFeedOver"; - this.AxFeedOver.Size = new System.Drawing.Size(224, 18); + this.AxFeedOver.Size = new System.Drawing.Size(168, 18); this.AxFeedOver.TabIndex = 23; this.AxFeedOver.Scroll += new System.Windows.Forms.ScrollEventHandler(this.cSpeed_Scroll); // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(16, 178); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(12, 145); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(64, 17); + this.label10.Size = new System.Drawing.Size(50, 13); this.label10.TabIndex = 22; this.label10.Text = "Feed Act"; // // AxFeedAct // - this.AxFeedAct.Location = new System.Drawing.Point(108, 175); + this.AxFeedAct.Location = new System.Drawing.Point(81, 142); this.AxFeedAct.Name = "AxFeedAct"; - this.AxFeedAct.Size = new System.Drawing.Size(224, 18); + this.AxFeedAct.Size = new System.Drawing.Size(168, 18); this.AxFeedAct.TabIndex = 20; this.AxFeedAct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.cLoad_Scroll); // // partID // - this.partID.Location = new System.Drawing.Point(107, 55); - this.partID.Margin = new System.Windows.Forms.Padding(4); + this.partID.Location = new System.Drawing.Point(80, 45); this.partID.Name = "partID"; - this.partID.Size = new System.Drawing.Size(132, 22); + this.partID.Size = new System.Drawing.Size(100, 20); this.partID.TabIndex = 49; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(41, 59); - this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label13.Location = new System.Drawing.Point(31, 48); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(51, 17); + this.label13.Size = new System.Drawing.Size(40, 13); this.label13.TabIndex = 48; this.label13.Text = "Part ID"; // // functionalMode // this.functionalMode.FormattingEnabled = true; - this.functionalMode.Location = new System.Drawing.Point(107, 87); - this.functionalMode.Margin = new System.Windows.Forms.Padding(4); + this.functionalMode.Location = new System.Drawing.Point(80, 71); this.functionalMode.Name = "functionalMode"; - this.functionalMode.Size = new System.Drawing.Size(389, 24); + this.functionalMode.Size = new System.Drawing.Size(293, 21); this.functionalMode.TabIndex = 47; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(20, 91); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Location = new System.Drawing.Point(15, 74); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(69, 17); + this.label12.Size = new System.Drawing.Size(53, 13); this.label12.TabIndex = 46; this.label12.Text = "Halt Type"; // @@ -424,11 +408,10 @@ this.I, this.J, this.K}); - this.PosAct.Location = new System.Drawing.Point(107, 142); - this.PosAct.Margin = new System.Windows.Forms.Padding(4); + this.PosAct.Location = new System.Drawing.Point(80, 115); this.PosAct.Name = "PosAct"; this.PosAct.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.PosAct.Size = new System.Drawing.Size(389, 50); + this.PosAct.Size = new System.Drawing.Size(292, 41); this.PosAct.TabIndex = 32; // // X @@ -436,50 +419,49 @@ this.X.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.X.HeaderText = "X"; this.X.Name = "X"; - this.X.Width = 46; + this.X.Width = 39; // // Y // this.Y.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.Y.HeaderText = "Y"; this.Y.Name = "Y"; - this.Y.Width = 46; + this.Y.Width = 39; // // Z // this.Z.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.Z.HeaderText = "Z"; this.Z.Name = "Z"; - this.Z.Width = 46; + this.Z.Width = 39; // // I // this.I.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.I.HeaderText = "I"; this.I.Name = "I"; - this.I.Width = 40; + this.I.Width = 35; // // J // this.J.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.J.HeaderText = "J"; this.J.Name = "J"; - this.J.Width = 44; + this.J.Width = 37; // // K // this.K.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.K.HeaderText = "K"; this.K.Name = "K"; - this.K.Width = 46; + this.K.Width = 39; // // PlcErr_03 // this.PlcErr_03.AutoSize = true; - this.PlcErr_03.Location = new System.Drawing.Point(128, 81); - this.PlcErr_03.Margin = new System.Windows.Forms.Padding(4); + this.PlcErr_03.Location = new System.Drawing.Point(96, 66); this.PlcErr_03.Name = "PlcErr_03"; - this.PlcErr_03.Size = new System.Drawing.Size(92, 21); + this.PlcErr_03.Size = new System.Drawing.Size(72, 17); this.PlcErr_03.TabIndex = 5; this.PlcErr_03.Text = "PlcErr_06"; this.PlcErr_03.UseVisualStyleBackColor = true; @@ -488,10 +470,9 @@ // PlcErr_01 // this.PlcErr_01.AutoSize = true; - this.PlcErr_01.Location = new System.Drawing.Point(128, 25); - this.PlcErr_01.Margin = new System.Windows.Forms.Padding(4); + this.PlcErr_01.Location = new System.Drawing.Point(96, 20); this.PlcErr_01.Name = "PlcErr_01"; - this.PlcErr_01.Size = new System.Drawing.Size(92, 21); + this.PlcErr_01.Size = new System.Drawing.Size(72, 17); this.PlcErr_01.TabIndex = 4; this.PlcErr_01.Text = "PlcErr_04"; this.PlcErr_01.UseVisualStyleBackColor = true; @@ -511,11 +492,9 @@ this.groupBox3.Controls.Add(this.ErrRT_01); this.groupBox3.Controls.Add(this.SysErr_02); this.groupBox3.Controls.Add(this.SysErr_01); - this.groupBox3.Location = new System.Drawing.Point(4, 620); - this.groupBox3.Margin = new System.Windows.Forms.Padding(4); + this.groupBox3.Location = new System.Drawing.Point(3, 504); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(4); - this.groupBox3.Size = new System.Drawing.Size(505, 140); + this.groupBox3.Size = new System.Drawing.Size(379, 114); this.groupBox3.TabIndex = 41; this.groupBox3.TabStop = false; this.groupBox3.Text = "Alarms"; @@ -523,10 +502,9 @@ // ErrRT_03 // this.ErrRT_03.AutoSize = true; - this.ErrRT_03.Location = new System.Drawing.Point(357, 81); - this.ErrRT_03.Margin = new System.Windows.Forms.Padding(4); + this.ErrRT_03.Location = new System.Drawing.Point(268, 66); this.ErrRT_03.Name = "ErrRT_03"; - this.ErrRT_03.Size = new System.Drawing.Size(83, 21); + this.ErrRT_03.Size = new System.Drawing.Size(67, 17); this.ErrRT_03.TabIndex = 11; this.ErrRT_03.Text = "ERR_12"; this.ErrRT_03.UseVisualStyleBackColor = true; @@ -535,10 +513,9 @@ // ErrRT_02 // this.ErrRT_02.AutoSize = true; - this.ErrRT_02.Location = new System.Drawing.Point(357, 53); - this.ErrRT_02.Margin = new System.Windows.Forms.Padding(4); + this.ErrRT_02.Location = new System.Drawing.Point(268, 43); this.ErrRT_02.Name = "ErrRT_02"; - this.ErrRT_02.Size = new System.Drawing.Size(83, 21); + this.ErrRT_02.Size = new System.Drawing.Size(67, 17); this.ErrRT_02.TabIndex = 10; this.ErrRT_02.Text = "ERR_11"; this.ErrRT_02.UseVisualStyleBackColor = true; @@ -547,10 +524,9 @@ // CncErr_02 // this.CncErr_02.AutoSize = true; - this.CncErr_02.Location = new System.Drawing.Point(241, 53); - this.CncErr_02.Margin = new System.Windows.Forms.Padding(4); + this.CncErr_02.Location = new System.Drawing.Point(181, 43); this.CncErr_02.Name = "CncErr_02"; - this.CncErr_02.Size = new System.Drawing.Size(97, 21); + this.CncErr_02.Size = new System.Drawing.Size(76, 17); this.CncErr_02.TabIndex = 9; this.CncErr_02.Text = "CncErr_08"; this.CncErr_02.UseVisualStyleBackColor = true; @@ -559,10 +535,9 @@ // CncErr_03 // this.CncErr_03.AutoSize = true; - this.CncErr_03.Location = new System.Drawing.Point(241, 81); - this.CncErr_03.Margin = new System.Windows.Forms.Padding(4); + this.CncErr_03.Location = new System.Drawing.Point(181, 66); this.CncErr_03.Name = "CncErr_03"; - this.CncErr_03.Size = new System.Drawing.Size(97, 21); + this.CncErr_03.Size = new System.Drawing.Size(76, 17); this.CncErr_03.TabIndex = 8; this.CncErr_03.Text = "CncErr_09"; this.CncErr_03.UseVisualStyleBackColor = true; @@ -571,10 +546,9 @@ // CncErr_01 // this.CncErr_01.AutoSize = true; - this.CncErr_01.Location = new System.Drawing.Point(241, 25); - this.CncErr_01.Margin = new System.Windows.Forms.Padding(4); + this.CncErr_01.Location = new System.Drawing.Point(181, 20); this.CncErr_01.Name = "CncErr_01"; - this.CncErr_01.Size = new System.Drawing.Size(97, 21); + this.CncErr_01.Size = new System.Drawing.Size(76, 17); this.CncErr_01.TabIndex = 7; this.CncErr_01.Text = "CncErr_07"; this.CncErr_01.UseVisualStyleBackColor = true; @@ -583,10 +557,9 @@ // SysErr_03 // this.SysErr_03.AutoSize = true; - this.SysErr_03.Location = new System.Drawing.Point(9, 81); - this.SysErr_03.Margin = new System.Windows.Forms.Padding(4); + this.SysErr_03.Location = new System.Drawing.Point(7, 66); this.SysErr_03.Name = "SysErr_03"; - this.SysErr_03.Size = new System.Drawing.Size(96, 21); + this.SysErr_03.Size = new System.Drawing.Size(74, 17); this.SysErr_03.TabIndex = 3; this.SysErr_03.Text = "SysErr_03"; this.SysErr_03.UseVisualStyleBackColor = true; @@ -595,10 +568,9 @@ // ErrRT_01 // this.ErrRT_01.AutoSize = true; - this.ErrRT_01.Location = new System.Drawing.Point(357, 25); - this.ErrRT_01.Margin = new System.Windows.Forms.Padding(4); + this.ErrRT_01.Location = new System.Drawing.Point(268, 20); this.ErrRT_01.Name = "ErrRT_01"; - this.ErrRT_01.Size = new System.Drawing.Size(83, 21); + this.ErrRT_01.Size = new System.Drawing.Size(67, 17); this.ErrRT_01.TabIndex = 2; this.ErrRT_01.Text = "ERR_10"; this.ErrRT_01.UseVisualStyleBackColor = true; @@ -607,10 +579,9 @@ // SysErr_02 // this.SysErr_02.AutoSize = true; - this.SysErr_02.Location = new System.Drawing.Point(9, 53); - this.SysErr_02.Margin = new System.Windows.Forms.Padding(4); + this.SysErr_02.Location = new System.Drawing.Point(7, 43); this.SysErr_02.Name = "SysErr_02"; - this.SysErr_02.Size = new System.Drawing.Size(96, 21); + this.SysErr_02.Size = new System.Drawing.Size(74, 17); this.SysErr_02.TabIndex = 1; this.SysErr_02.Text = "SysErr_02"; this.SysErr_02.UseVisualStyleBackColor = true; @@ -619,10 +590,9 @@ // SysErr_01 // this.SysErr_01.AutoSize = true; - this.SysErr_01.Location = new System.Drawing.Point(9, 25); - this.SysErr_01.Margin = new System.Windows.Forms.Padding(4); + this.SysErr_01.Location = new System.Drawing.Point(7, 20); this.SysErr_01.Name = "SysErr_01"; - this.SysErr_01.Size = new System.Drawing.Size(96, 21); + this.SysErr_01.Size = new System.Drawing.Size(74, 17); this.SysErr_01.TabIndex = 0; this.SysErr_01.Text = "SysErr_01"; this.SysErr_01.UseVisualStyleBackColor = true; @@ -660,95 +630,84 @@ this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label3); this.groupBox2.Controls.Add(this.AxLoad); - this.groupBox2.Location = new System.Drawing.Point(513, 514); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4); + this.groupBox2.Location = new System.Drawing.Point(385, 418); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4); - this.groupBox2.Size = new System.Drawing.Size(500, 277); + this.groupBox2.Size = new System.Drawing.Size(375, 225); this.groupBox2.TabIndex = 40; this.groupBox2.TabStop = false; this.groupBox2.Text = "Axis"; // // AxAccelAct // - this.AxAccelAct.Location = new System.Drawing.Point(107, 226); - this.AxAccelAct.Margin = new System.Windows.Forms.Padding(4); + this.AxAccelAct.Location = new System.Drawing.Point(80, 184); this.AxAccelAct.Name = "AxAccelAct"; - this.AxAccelAct.Size = new System.Drawing.Size(60, 22); + this.AxAccelAct.Size = new System.Drawing.Size(46, 20); this.AxAccelAct.TabIndex = 43; // // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(13, 230); - this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label37.Location = new System.Drawing.Point(10, 187); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(66, 17); + this.label37.Size = new System.Drawing.Size(53, 13); this.label37.TabIndex = 42; this.label37.Text = "Accel Act"; // // AxBatt // - this.AxBatt.Location = new System.Drawing.Point(405, 226); - this.AxBatt.Margin = new System.Windows.Forms.Padding(4); + this.AxBatt.Location = new System.Drawing.Point(304, 184); this.AxBatt.Name = "AxBatt"; - this.AxBatt.Size = new System.Drawing.Size(80, 22); + this.AxBatt.Size = new System.Drawing.Size(61, 20); this.AxBatt.TabIndex = 41; // // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(349, 230); - this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label36.Location = new System.Drawing.Point(262, 187); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(53, 17); + this.label36.Size = new System.Drawing.Size(40, 13); this.label36.TabIndex = 40; this.label36.Text = "Battery"; // // AxAccTime // - this.AxAccTime.Location = new System.Drawing.Point(263, 226); - this.AxAccTime.Margin = new System.Windows.Forms.Padding(4); + this.AxAccTime.Location = new System.Drawing.Point(197, 184); this.AxAccTime.Name = "AxAccTime"; - this.AxAccTime.Size = new System.Drawing.Size(68, 22); + this.AxAccTime.Size = new System.Drawing.Size(52, 20); this.AxAccTime.TabIndex = 39; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(169, 230); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(127, 187); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(85, 17); + this.label11.Size = new System.Drawing.Size(66, 13); this.label11.TabIndex = 38; this.label11.Text = "Accum Time"; // // AxDir // - this.AxDir.Location = new System.Drawing.Point(353, 82); - this.AxDir.Margin = new System.Windows.Forms.Padding(4); + this.AxDir.Location = new System.Drawing.Point(265, 67); this.AxDir.Name = "AxDir"; - this.AxDir.Size = new System.Drawing.Size(105, 22); + this.AxDir.Size = new System.Drawing.Size(80, 20); this.AxDir.TabIndex = 37; this.AxDir.Text = "1"; // // label35 // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(291, 87); - this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label35.Location = new System.Drawing.Point(218, 71); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(64, 17); + this.label35.Size = new System.Drawing.Size(49, 13); this.label35.TabIndex = 36; this.label35.Text = "Direction"; // // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(16, 89); - this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label34.Location = new System.Drawing.Point(12, 72); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(69, 17); + this.label34.Size = new System.Drawing.Size(53, 13); this.label34.TabIndex = 35; this.label34.Text = "Axis Type"; // @@ -758,56 +717,50 @@ this.cbAxType.Items.AddRange(new object[] { "LINEAR", "ROTARY"}); - this.cbAxType.Location = new System.Drawing.Point(108, 85); - this.cbAxType.Margin = new System.Windows.Forms.Padding(4); + this.cbAxType.Location = new System.Drawing.Point(81, 69); this.cbAxType.Name = "cbAxType"; - this.cbAxType.Size = new System.Drawing.Size(119, 24); + this.cbAxType.Size = new System.Drawing.Size(90, 21); this.cbAxType.TabIndex = 34; // // AxMastId // - this.AxMastId.Location = new System.Drawing.Point(380, 50); - this.AxMastId.Margin = new System.Windows.Forms.Padding(4); + this.AxMastId.Location = new System.Drawing.Point(285, 41); this.AxMastId.Name = "AxMastId"; - this.AxMastId.Size = new System.Drawing.Size(105, 22); + this.AxMastId.Size = new System.Drawing.Size(80, 20); this.AxMastId.TabIndex = 33; // // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(317, 55); - this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label33.Location = new System.Drawing.Point(238, 45); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(55, 17); + this.label33.Size = new System.Drawing.Size(44, 13); this.label33.TabIndex = 32; this.label33.Text = "Mast ID"; // // AxIsMaster // this.AxIsMaster.AutoSize = true; - this.AxIsMaster.Location = new System.Drawing.Point(237, 54); - this.AxIsMaster.Margin = new System.Windows.Forms.Padding(4); + this.AxIsMaster.Location = new System.Drawing.Point(178, 44); this.AxIsMaster.Name = "AxIsMaster"; - this.AxIsMaster.Size = new System.Drawing.Size(73, 21); + this.AxIsMaster.Size = new System.Drawing.Size(58, 17); this.AxIsMaster.TabIndex = 31; this.AxIsMaster.Text = "Master"; this.AxIsMaster.UseVisualStyleBackColor = true; // // AxMainProc // - this.AxMainProc.Location = new System.Drawing.Point(108, 50); - this.AxMainProc.Margin = new System.Windows.Forms.Padding(4); + this.AxMainProc.Location = new System.Drawing.Point(81, 41); this.AxMainProc.Name = "AxMainProc"; - this.AxMainProc.Size = new System.Drawing.Size(60, 22); + this.AxMainProc.Size = new System.Drawing.Size(46, 20); this.AxMainProc.TabIndex = 30; // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(15, 54); - this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label32.Location = new System.Drawing.Point(11, 44); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(71, 17); + this.label32.Size = new System.Drawing.Size(55, 13); this.label32.TabIndex = 29; this.label32.Text = "Main Proc"; // @@ -815,10 +768,9 @@ // this.cbAxNum.DisplayMember = "Name"; this.cbAxNum.FormattingEnabled = true; - this.cbAxNum.Location = new System.Drawing.Point(108, 18); - this.cbAxNum.Margin = new System.Windows.Forms.Padding(4); + this.cbAxNum.Location = new System.Drawing.Point(81, 15); this.cbAxNum.Name = "cbAxNum"; - this.cbAxNum.Size = new System.Drawing.Size(160, 24); + this.cbAxNum.Size = new System.Drawing.Size(121, 21); this.cbAxNum.TabIndex = 28; this.cbAxNum.ValueMember = "Value"; this.cbAxNum.SelectedIndexChanged += new System.EventHandler(this.cbAxNum_SelectedIndexChanged); @@ -826,89 +778,81 @@ // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(16, 23); - this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label31.Location = new System.Drawing.Point(12, 19); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(66, 17); + this.label31.Size = new System.Drawing.Size(51, 13); this.label31.TabIndex = 27; this.label31.Text = "Axis Num"; // // AxPositionValue // - this.AxPositionValue.Location = new System.Drawing.Point(353, 149); - this.AxPositionValue.Margin = new System.Windows.Forms.Padding(4); + this.AxPositionValue.Location = new System.Drawing.Point(265, 121); this.AxPositionValue.Name = "AxPositionValue"; - this.AxPositionValue.Size = new System.Drawing.Size(132, 22); + this.AxPositionValue.Size = new System.Drawing.Size(100, 20); this.AxPositionValue.TabIndex = 26; // // AxLoadValue // - this.AxLoadValue.Location = new System.Drawing.Point(353, 123); - this.AxLoadValue.Margin = new System.Windows.Forms.Padding(4); + this.AxLoadValue.Location = new System.Drawing.Point(265, 100); this.AxLoadValue.Name = "AxLoadValue"; - this.AxLoadValue.Size = new System.Drawing.Size(132, 22); + this.AxLoadValue.Size = new System.Drawing.Size(100, 20); this.AxLoadValue.TabIndex = 25; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(16, 153); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(12, 124); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(58, 17); + this.label5.Size = new System.Drawing.Size(44, 13); this.label5.TabIndex = 24; this.label5.Text = "Position"; // // AxPosition // - this.AxPosition.Location = new System.Drawing.Point(108, 149); + this.AxPosition.Location = new System.Drawing.Point(81, 121); this.AxPosition.Name = "AxPosition"; - this.AxPosition.Size = new System.Drawing.Size(224, 18); + this.AxPosition.Size = new System.Drawing.Size(168, 18); this.AxPosition.TabIndex = 23; this.AxPosition.Scroll += new System.Windows.Forms.ScrollEventHandler(this.xPosition_Scroll); // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(16, 127); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(12, 103); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(40, 17); + this.label4.Size = new System.Drawing.Size(31, 13); this.label4.TabIndex = 22; this.label4.Text = "Load"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(116, 117); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(87, 95); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(0, 17); + this.label3.Size = new System.Drawing.Size(0, 13); this.label3.TabIndex = 21; // // AxLoad // - this.AxLoad.Location = new System.Drawing.Point(108, 123); + this.AxLoad.Location = new System.Drawing.Point(81, 100); this.AxLoad.Name = "AxLoad"; - this.AxLoad.Size = new System.Drawing.Size(224, 18); + this.AxLoad.Size = new System.Drawing.Size(168, 18); this.AxLoad.TabIndex = 20; this.AxLoad.Scroll += new System.Windows.Forms.ScrollEventHandler(this.xLoad_Scroll); // // program // - this.program.Location = new System.Drawing.Point(107, 23); - this.program.Margin = new System.Windows.Forms.Padding(4); + this.program.Location = new System.Drawing.Point(80, 19); this.program.Name = "program"; - this.program.Size = new System.Drawing.Size(203, 22); + this.program.Size = new System.Drawing.Size(153, 20); this.program.TabIndex = 39; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 27); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(7, 22); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(93, 17); + this.label2.Size = new System.Drawing.Size(68, 13); this.label2.TabIndex = 38; this.label2.Text = "Curr Program"; // @@ -930,105 +874,93 @@ this.groupBox9.Controls.Add(this.label13); this.groupBox9.Controls.Add(this.functionalMode); this.groupBox9.Controls.Add(this.label12); - this.groupBox9.Location = new System.Drawing.Point(4, 182); - this.groupBox9.Margin = new System.Windows.Forms.Padding(4); + this.groupBox9.Location = new System.Drawing.Point(3, 148); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Padding = new System.Windows.Forms.Padding(4); - this.groupBox9.Size = new System.Drawing.Size(505, 194); + this.groupBox9.Size = new System.Drawing.Size(379, 158); this.groupBox9.TabIndex = 55; this.groupBox9.TabStop = false; this.groupBox9.Text = "Produzione"; // // txtPzKo // - this.txtPzKo.Location = new System.Drawing.Point(417, 121); - this.txtPzKo.Margin = new System.Windows.Forms.Padding(4); + this.txtPzKo.Location = new System.Drawing.Point(313, 98); this.txtPzKo.Name = "txtPzKo"; - this.txtPzKo.Size = new System.Drawing.Size(79, 22); + this.txtPzKo.Size = new System.Drawing.Size(60, 20); this.txtPzKo.TabIndex = 59; this.txtPzKo.TextChanged += new System.EventHandler(this.pzKo_TextChanged); // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(359, 124); - this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label25.Location = new System.Drawing.Point(269, 101); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(48, 17); + this.label25.Size = new System.Drawing.Size(37, 13); this.label25.TabIndex = 58; this.label25.Text = "Pz KO"; // // txtPzOk // this.txtPzOk.Enabled = false; - this.txtPzOk.Location = new System.Drawing.Point(268, 121); - this.txtPzOk.Margin = new System.Windows.Forms.Padding(4); + this.txtPzOk.Location = new System.Drawing.Point(201, 98); this.txtPzOk.Name = "txtPzOk"; - this.txtPzOk.Size = new System.Drawing.Size(79, 22); + this.txtPzOk.Size = new System.Drawing.Size(60, 20); this.txtPzOk.TabIndex = 57; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(209, 124); - this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label23.Location = new System.Drawing.Point(157, 101); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(48, 17); + this.label23.Size = new System.Drawing.Size(37, 13); this.label23.TabIndex = 56; this.label23.Text = "Pz OK"; // // txtPzTot // this.txtPzTot.Enabled = false; - this.txtPzTot.Location = new System.Drawing.Point(107, 121); - this.txtPzTot.Margin = new System.Windows.Forms.Padding(4); + this.txtPzTot.Location = new System.Drawing.Point(80, 98); this.txtPzTot.Name = "txtPzTot"; - this.txtPzTot.Size = new System.Drawing.Size(79, 22); + this.txtPzTot.Size = new System.Drawing.Size(60, 20); this.txtPzTot.TabIndex = 55; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(44, 124); - this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label21.Location = new System.Drawing.Point(33, 101); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(49, 17); + this.label21.Size = new System.Drawing.Size(38, 13); this.label21.TabIndex = 54; this.label21.Text = "Pz Tot"; // // OPERATOR_ID // - this.OPERATOR_ID.Location = new System.Drawing.Point(364, 55); - this.OPERATOR_ID.Margin = new System.Windows.Forms.Padding(4); + this.OPERATOR_ID.Location = new System.Drawing.Point(273, 45); this.OPERATOR_ID.Name = "OPERATOR_ID"; - this.OPERATOR_ID.Size = new System.Drawing.Size(132, 22); + this.OPERATOR_ID.Size = new System.Drawing.Size(100, 20); this.OPERATOR_ID.TabIndex = 53; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(296, 59); - this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label19.Location = new System.Drawing.Point(222, 48); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(58, 17); + this.label19.Size = new System.Drawing.Size(45, 13); this.label19.TabIndex = 52; this.label19.Text = "ID oper."; // // PROG_ROW_NUM // - this.PROG_ROW_NUM.Location = new System.Drawing.Point(417, 23); - this.PROG_ROW_NUM.Margin = new System.Windows.Forms.Padding(4); + this.PROG_ROW_NUM.Location = new System.Drawing.Point(313, 19); this.PROG_ROW_NUM.Name = "PROG_ROW_NUM"; - this.PROG_ROW_NUM.Size = new System.Drawing.Size(79, 22); + this.PROG_ROW_NUM.Size = new System.Drawing.Size(60, 20); this.PROG_ROW_NUM.TabIndex = 51; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(337, 27); - this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label17.Location = new System.Drawing.Point(253, 22); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(68, 17); + this.label17.Size = new System.Drawing.Size(54, 13); this.label17.TabIndex = 50; this.label17.Text = "Row Num"; // @@ -1042,11 +974,9 @@ this.groupBox11.Controls.Add(this.label18); this.groupBox11.Controls.Add(this.STATUS_STRB_DW0); this.groupBox11.Controls.Add(this.lblPLC_ADP); - this.groupBox11.Location = new System.Drawing.Point(10, 71); - this.groupBox11.Margin = new System.Windows.Forms.Padding(4); + this.groupBox11.Location = new System.Drawing.Point(8, 58); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Padding = new System.Windows.Forms.Padding(4); - this.groupBox11.Size = new System.Drawing.Size(509, 191); + this.groupBox11.Size = new System.Drawing.Size(382, 155); this.groupBox11.TabIndex = 57; this.groupBox11.TabStop = false; this.groupBox11.Text = "Strobes PLC --> ADP"; @@ -1054,76 +984,68 @@ // STATUS_STRB_DW3 // this.STATUS_STRB_DW3.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_STRB_DW3.Location = new System.Drawing.Point(113, 146); - this.STATUS_STRB_DW3.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_STRB_DW3.Location = new System.Drawing.Point(85, 119); this.STATUS_STRB_DW3.Name = "STATUS_STRB_DW3"; - this.STATUS_STRB_DW3.Size = new System.Drawing.Size(387, 28); + this.STATUS_STRB_DW3.Size = new System.Drawing.Size(291, 24); this.STATUS_STRB_DW3.TabIndex = 59; // // label49 // this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(20, 154); - this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label49.Location = new System.Drawing.Point(15, 125); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(84, 17); + this.label49.Size = new System.Drawing.Size(67, 13); this.label49.TabIndex = 58; this.label49.Text = "STRB_DW3"; // // STATUS_STRB_DW2 // this.STATUS_STRB_DW2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_STRB_DW2.Location = new System.Drawing.Point(113, 103); - this.STATUS_STRB_DW2.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_STRB_DW2.Location = new System.Drawing.Point(85, 84); this.STATUS_STRB_DW2.Name = "STATUS_STRB_DW2"; - this.STATUS_STRB_DW2.Size = new System.Drawing.Size(387, 28); + this.STATUS_STRB_DW2.Size = new System.Drawing.Size(291, 24); this.STATUS_STRB_DW2.TabIndex = 57; // // label47 // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(20, 111); - this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label47.Location = new System.Drawing.Point(15, 90); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(84, 17); + this.label47.Size = new System.Drawing.Size(67, 13); this.label47.TabIndex = 56; this.label47.Text = "STRB_DW2"; // // STATUS_STRB_DW1 // this.STATUS_STRB_DW1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_STRB_DW1.Location = new System.Drawing.Point(113, 60); - this.STATUS_STRB_DW1.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_STRB_DW1.Location = new System.Drawing.Point(85, 49); this.STATUS_STRB_DW1.Name = "STATUS_STRB_DW1"; - this.STATUS_STRB_DW1.Size = new System.Drawing.Size(387, 28); + this.STATUS_STRB_DW1.Size = new System.Drawing.Size(291, 24); this.STATUS_STRB_DW1.TabIndex = 55; // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(20, 68); - this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Location = new System.Drawing.Point(15, 55); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(84, 17); + this.label18.Size = new System.Drawing.Size(67, 13); this.label18.TabIndex = 54; this.label18.Text = "STRB_DW1"; // // STATUS_STRB_DW0 // this.STATUS_STRB_DW0.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_STRB_DW0.Location = new System.Drawing.Point(113, 17); - this.STATUS_STRB_DW0.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_STRB_DW0.Location = new System.Drawing.Point(85, 14); this.STATUS_STRB_DW0.Name = "STATUS_STRB_DW0"; - this.STATUS_STRB_DW0.Size = new System.Drawing.Size(387, 28); + this.STATUS_STRB_DW0.Size = new System.Drawing.Size(291, 24); this.STATUS_STRB_DW0.TabIndex = 53; // // lblPLC_ADP // this.lblPLC_ADP.AutoSize = true; - this.lblPLC_ADP.Location = new System.Drawing.Point(20, 27); - this.lblPLC_ADP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblPLC_ADP.Location = new System.Drawing.Point(15, 22); this.lblPLC_ADP.Name = "lblPLC_ADP"; - this.lblPLC_ADP.Size = new System.Drawing.Size(84, 17); + this.lblPLC_ADP.Size = new System.Drawing.Size(67, 13); this.lblPLC_ADP.TabIndex = 52; this.lblPLC_ADP.Text = "STRB_DW0"; // @@ -1135,10 +1057,9 @@ this.lblVers, this.MainProgrBar, this.lblStatus}); - this.statusStrip1.Location = new System.Drawing.Point(0, 669); + this.statusStrip1.Location = new System.Drawing.Point(0, 542); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); - this.statusStrip1.Size = new System.Drawing.Size(1047, 29); + this.statusStrip1.Size = new System.Drawing.Size(785, 25); this.statusStrip1.TabIndex = 59; this.statusStrip1.Text = "statusStrip1"; // @@ -1147,7 +1068,7 @@ this.lblApp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); this.lblApp.ForeColor = System.Drawing.SystemColors.ControlText; this.lblApp.Name = "lblApp"; - this.lblApp.Size = new System.Drawing.Size(21, 24); + this.lblApp.Size = new System.Drawing.Size(16, 20); this.lblApp.Text = "..."; // // lblVers @@ -1155,19 +1076,19 @@ this.lblVers.Font = new System.Drawing.Font("Segoe UI", 8F); this.lblVers.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.lblVers.Name = "lblVers"; - this.lblVers.Size = new System.Drawing.Size(18, 24); + this.lblVers.Size = new System.Drawing.Size(16, 20); this.lblVers.Text = "..."; // // MainProgrBar // this.MainProgrBar.Name = "MainProgrBar"; - this.MainProgrBar.Size = new System.Drawing.Size(133, 23); + this.MainProgrBar.Size = new System.Drawing.Size(100, 19); this.MainProgrBar.Step = 1; // // lblStatus // this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(27, 24); + this.lblStatus.Size = new System.Drawing.Size(22, 20); this.lblStatus.Text = "---"; // // groupBox13 @@ -1185,11 +1106,9 @@ this.groupBox13.Controls.Add(this.txtPathFeed); this.groupBox13.Controls.Add(this.label26); this.groupBox13.Controls.Add(this.hsPathFeed); - this.groupBox13.Location = new System.Drawing.Point(513, 103); - this.groupBox13.Margin = new System.Windows.Forms.Padding(4); + this.groupBox13.Location = new System.Drawing.Point(385, 84); this.groupBox13.Name = "groupBox13"; - this.groupBox13.Padding = new System.Windows.Forms.Padding(4); - this.groupBox13.Size = new System.Drawing.Size(505, 206); + this.groupBox13.Size = new System.Drawing.Size(379, 167); this.groupBox13.TabIndex = 60; this.groupBox13.TabStop = false; this.groupBox13.Text = "PATH"; @@ -1198,10 +1117,9 @@ // this.cbPathSel.DisplayMember = "Name"; this.cbPathSel.FormattingEnabled = true; - this.cbPathSel.Location = new System.Drawing.Point(107, 20); - this.cbPathSel.Margin = new System.Windows.Forms.Padding(4); + this.cbPathSel.Location = new System.Drawing.Point(80, 16); this.cbPathSel.Name = "cbPathSel"; - this.cbPathSel.Size = new System.Drawing.Size(160, 24); + this.cbPathSel.Size = new System.Drawing.Size(121, 21); this.cbPathSel.TabIndex = 63; this.cbPathSel.ValueMember = "Value"; this.cbPathSel.SelectedIndexChanged += new System.EventHandler(this.cbPathSel_SelectedIndexChanged); @@ -1209,104 +1127,96 @@ // label38 // this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(15, 25); - this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label38.Location = new System.Drawing.Point(11, 20); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(70, 17); + this.label38.Size = new System.Drawing.Size(54, 13); this.label38.TabIndex = 62; this.label38.Text = "Path Num"; // // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(16, 164); - this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label29.Location = new System.Drawing.Point(12, 133); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(66, 17); + this.label29.Size = new System.Drawing.Size(51, 13); this.label29.TabIndex = 33; this.label29.Text = "Posiz Act"; // // txtPathSpeedOver // - this.txtPathSpeedOver.Location = new System.Drawing.Point(397, 108); - this.txtPathSpeedOver.Margin = new System.Windows.Forms.Padding(4); + this.txtPathSpeedOver.Location = new System.Drawing.Point(298, 88); this.txtPathSpeedOver.Name = "txtPathSpeedOver"; - this.txtPathSpeedOver.Size = new System.Drawing.Size(97, 22); + this.txtPathSpeedOver.Size = new System.Drawing.Size(74, 20); this.txtPathSpeedOver.TabIndex = 32; this.txtPathSpeedOver.TextChanged += new System.EventHandler(this.txtPathSpeedOver_TextChanged); // // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(13, 112); - this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label28.Location = new System.Drawing.Point(10, 91); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(84, 17); + this.label28.Size = new System.Drawing.Size(64, 13); this.label28.TabIndex = 31; this.label28.Text = "Rapid Over."; // // hsPathSpeedOver // - this.hsPathSpeedOver.Location = new System.Drawing.Point(107, 112); + this.hsPathSpeedOver.Location = new System.Drawing.Point(80, 91); this.hsPathSpeedOver.Maximum = 150; this.hsPathSpeedOver.Name = "hsPathSpeedOver"; - this.hsPathSpeedOver.Size = new System.Drawing.Size(284, 18); + this.hsPathSpeedOver.Size = new System.Drawing.Size(213, 18); this.hsPathSpeedOver.TabIndex = 30; this.hsPathSpeedOver.ValueChanged += new System.EventHandler(this.hsPathSpeedOver_ValueChanged); // // txtPathFeedOver // - this.txtPathFeedOver.Location = new System.Drawing.Point(397, 78); - this.txtPathFeedOver.Margin = new System.Windows.Forms.Padding(4); + this.txtPathFeedOver.Location = new System.Drawing.Point(298, 63); this.txtPathFeedOver.Name = "txtPathFeedOver"; - this.txtPathFeedOver.Size = new System.Drawing.Size(97, 22); + this.txtPathFeedOver.Size = new System.Drawing.Size(74, 20); this.txtPathFeedOver.TabIndex = 29; this.txtPathFeedOver.TextChanged += new System.EventHandler(this.txtPathFeedOver_TextChanged); // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(13, 81); - this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label27.Location = new System.Drawing.Point(10, 66); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(79, 17); + this.label27.Size = new System.Drawing.Size(60, 13); this.label27.TabIndex = 28; this.label27.Text = "Feed Over."; // // hsPathFeedOver // - this.hsPathFeedOver.Location = new System.Drawing.Point(107, 81); + this.hsPathFeedOver.Location = new System.Drawing.Point(80, 66); this.hsPathFeedOver.Maximum = 150; this.hsPathFeedOver.Name = "hsPathFeedOver"; - this.hsPathFeedOver.Size = new System.Drawing.Size(284, 18); + this.hsPathFeedOver.Size = new System.Drawing.Size(213, 18); this.hsPathFeedOver.TabIndex = 27; this.hsPathFeedOver.ValueChanged += new System.EventHandler(this.hsPathFeedOver_ValueChanged); // // txtPathFeed // - this.txtPathFeed.Location = new System.Drawing.Point(397, 46); - this.txtPathFeed.Margin = new System.Windows.Forms.Padding(4); + this.txtPathFeed.Location = new System.Drawing.Point(298, 37); this.txtPathFeed.Name = "txtPathFeed"; - this.txtPathFeed.Size = new System.Drawing.Size(97, 22); + this.txtPathFeed.Size = new System.Drawing.Size(74, 20); this.txtPathFeed.TabIndex = 26; this.txtPathFeed.TextChanged += new System.EventHandler(this.txtPathFeed_TextChanged); // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(13, 49); - this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label26.Location = new System.Drawing.Point(10, 40); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(65, 17); + this.label26.Size = new System.Drawing.Size(49, 13); this.label26.TabIndex = 24; this.label26.Text = "Feedrate"; // // hsPathFeed // - this.hsPathFeed.Location = new System.Drawing.Point(107, 49); + this.hsPathFeed.Location = new System.Drawing.Point(80, 40); this.hsPathFeed.Maximum = 150; this.hsPathFeed.Name = "hsPathFeed"; - this.hsPathFeed.Size = new System.Drawing.Size(284, 18); + this.hsPathFeed.Size = new System.Drawing.Size(213, 18); this.hsPathFeed.TabIndex = 23; this.hsPathFeed.ValueChanged += new System.EventHandler(this.hsPathFeed_ValueChanged); // @@ -1318,8 +1228,7 @@ this.sETUPToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(1047, 28); + this.menuStrip1.Size = new System.Drawing.Size(785, 24); this.menuStrip1.TabIndex = 61; this.menuStrip1.Text = "menuStrip1"; // @@ -1328,13 +1237,13 @@ this.fILEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mLoadAdaptConf}); this.fILEToolStripMenuItem.Name = "fILEToolStripMenuItem"; - this.fILEToolStripMenuItem.Size = new System.Drawing.Size(47, 24); + this.fILEToolStripMenuItem.Size = new System.Drawing.Size(40, 20); this.fILEToolStripMenuItem.Text = "FILE"; // // mLoadAdaptConf // this.mLoadAdaptConf.Name = "mLoadAdaptConf"; - this.mLoadAdaptConf.Size = new System.Drawing.Size(233, 26); + this.mLoadAdaptConf.Size = new System.Drawing.Size(194, 22); this.mLoadAdaptConf.Text = "LOAD ADAPTER CONF"; this.mLoadAdaptConf.Click += new System.EventHandler(this.mLoadAdaptConf_Click); // @@ -1344,14 +1253,14 @@ this.mConfGen}); this.sETUPToolStripMenuItem.Name = "sETUPToolStripMenuItem"; this.sETUPToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.S))); - this.sETUPToolStripMenuItem.Size = new System.Drawing.Size(63, 24); + this.sETUPToolStripMenuItem.Size = new System.Drawing.Size(53, 20); this.sETUPToolStripMenuItem.Text = "SETUP"; // // mConfGen // this.mConfGen.Name = "mConfGen"; this.mConfGen.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.T))); - this.mConfGen.Size = new System.Drawing.Size(336, 26); + this.mConfGen.Size = new System.Drawing.Size(280, 22); this.mConfGen.Text = "TEMPLATE CONF GENERATOR"; this.mConfGen.Click += new System.EventHandler(this.mConfGen_Click); // @@ -1359,10 +1268,9 @@ // this.lblCurrAdapt.Dock = System.Windows.Forms.DockStyle.Top; this.lblCurrAdapt.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCurrAdapt.Location = new System.Drawing.Point(0, 28); - this.lblCurrAdapt.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblCurrAdapt.Location = new System.Drawing.Point(0, 24); this.lblCurrAdapt.Name = "lblCurrAdapt"; - this.lblCurrAdapt.Size = new System.Drawing.Size(1047, 32); + this.lblCurrAdapt.Size = new System.Drawing.Size(785, 26); this.lblCurrAdapt.TabIndex = 64; this.lblCurrAdapt.Text = "Adapter loaded: N.A."; this.lblCurrAdapt.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -1373,11 +1281,10 @@ this.tabCtrlMain.Controls.Add(this.tbConf); this.tabCtrlMain.Controls.Add(this.tpSIM); this.tabCtrlMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabCtrlMain.Location = new System.Drawing.Point(0, 60); - this.tabCtrlMain.Margin = new System.Windows.Forms.Padding(4); + this.tabCtrlMain.Location = new System.Drawing.Point(0, 50); this.tabCtrlMain.Name = "tabCtrlMain"; this.tabCtrlMain.SelectedIndex = 0; - this.tabCtrlMain.Size = new System.Drawing.Size(1047, 609); + this.tabCtrlMain.Size = new System.Drawing.Size(785, 492); this.tabCtrlMain.TabIndex = 65; // // tpStatus @@ -1387,11 +1294,10 @@ this.tpStatus.Controls.Add(this.groupBox6); this.tpStatus.Controls.Add(this.groupBox1); this.tpStatus.Controls.Add(this.groupBox11); - this.tpStatus.Location = new System.Drawing.Point(4, 25); - this.tpStatus.Margin = new System.Windows.Forms.Padding(4); + this.tpStatus.Location = new System.Drawing.Point(4, 22); this.tpStatus.Name = "tpStatus"; - this.tpStatus.Padding = new System.Windows.Forms.Padding(4); - this.tpStatus.Size = new System.Drawing.Size(1039, 580); + this.tpStatus.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tpStatus.Size = new System.Drawing.Size(777, 466); this.tpStatus.TabIndex = 0; this.tpStatus.Text = "STATUS"; // @@ -1405,24 +1311,34 @@ this.gbMonitor.Controls.Add(this.lblOutMessage); this.gbMonitor.Controls.Add(this.lblOutMessage2); this.gbMonitor.ForeColor = System.Drawing.SystemColors.Control; - this.gbMonitor.Location = new System.Drawing.Point(0, 266); + this.gbMonitor.Location = new System.Drawing.Point(0, 216); this.gbMonitor.Margin = new System.Windows.Forms.Padding(0); this.gbMonitor.Name = "gbMonitor"; this.gbMonitor.Padding = new System.Windows.Forms.Padding(0); - this.gbMonitor.Size = new System.Drawing.Size(1039, 311); + this.gbMonitor.Size = new System.Drawing.Size(779, 250); this.gbMonitor.TabIndex = 62; this.gbMonitor.TabStop = false; this.gbMonitor.Text = "Monitor variabili"; // + // lblOutMessage3 + // + this.lblOutMessage3.AutoSize = true; + this.lblOutMessage3.Font = new System.Drawing.Font("Arial Narrow", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblOutMessage3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.lblOutMessage3.Location = new System.Drawing.Point(420, 12); + this.lblOutMessage3.Name = "lblOutMessage3"; + this.lblOutMessage3.Size = new System.Drawing.Size(13, 14); + this.lblOutMessage3.TabIndex = 62; + this.lblOutMessage3.Text = "..."; + // // lblOutMessage // this.lblOutMessage.AutoSize = true; this.lblOutMessage.Font = new System.Drawing.Font("Arial Narrow", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblOutMessage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.lblOutMessage.Location = new System.Drawing.Point(4, 15); - this.lblOutMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblOutMessage.Location = new System.Drawing.Point(3, 12); this.lblOutMessage.Name = "lblOutMessage"; - this.lblOutMessage.Size = new System.Drawing.Size(17, 16); + this.lblOutMessage.Size = new System.Drawing.Size(13, 14); this.lblOutMessage.TabIndex = 60; this.lblOutMessage.Text = "..."; // @@ -1431,10 +1347,9 @@ this.lblOutMessage2.AutoSize = true; this.lblOutMessage2.Font = new System.Drawing.Font("Arial Narrow", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblOutMessage2.ForeColor = System.Drawing.Color.Yellow; - this.lblOutMessage2.Location = new System.Drawing.Point(296, 15); - this.lblOutMessage2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblOutMessage2.Location = new System.Drawing.Point(236, 12); this.lblOutMessage2.Name = "lblOutMessage2"; - this.lblOutMessage2.Size = new System.Drawing.Size(17, 16); + this.lblOutMessage2.Size = new System.Drawing.Size(13, 14); this.lblOutMessage2.TabIndex = 61; this.lblOutMessage2.Text = "..."; // @@ -1448,11 +1363,9 @@ this.groupBox6.Controls.Add(this.label50); this.groupBox6.Controls.Add(this.STATUS_ACK_DW0); this.groupBox6.Controls.Add(this.label48); - this.groupBox6.Location = new System.Drawing.Point(523, 71); - this.groupBox6.Margin = new System.Windows.Forms.Padding(4); + this.groupBox6.Location = new System.Drawing.Point(392, 58); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Padding = new System.Windows.Forms.Padding(4); - this.groupBox6.Size = new System.Drawing.Size(512, 191); + this.groupBox6.Size = new System.Drawing.Size(384, 155); this.groupBox6.TabIndex = 58; this.groupBox6.TabStop = false; this.groupBox6.Text = "ACK ADP --> PLC"; @@ -1460,76 +1373,68 @@ // STATUS_ACK_DW3 // this.STATUS_ACK_DW3.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_ACK_DW3.Location = new System.Drawing.Point(113, 145); - this.STATUS_ACK_DW3.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_ACK_DW3.Location = new System.Drawing.Point(85, 118); this.STATUS_ACK_DW3.Name = "STATUS_ACK_DW3"; - this.STATUS_ACK_DW3.Size = new System.Drawing.Size(389, 28); + this.STATUS_ACK_DW3.Size = new System.Drawing.Size(293, 24); this.STATUS_ACK_DW3.TabIndex = 59; // // label52 // this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(20, 155); - this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label52.Location = new System.Drawing.Point(15, 126); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(74, 17); + this.label52.Size = new System.Drawing.Size(59, 13); this.label52.TabIndex = 58; this.label52.Text = "ACK_DW3"; // // STATUS_ACK_DW2 // this.STATUS_ACK_DW2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_ACK_DW2.Location = new System.Drawing.Point(113, 102); - this.STATUS_ACK_DW2.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_ACK_DW2.Location = new System.Drawing.Point(85, 83); this.STATUS_ACK_DW2.Name = "STATUS_ACK_DW2"; - this.STATUS_ACK_DW2.Size = new System.Drawing.Size(389, 28); + this.STATUS_ACK_DW2.Size = new System.Drawing.Size(293, 24); this.STATUS_ACK_DW2.TabIndex = 57; // // label51 // this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(20, 112); - this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label51.Location = new System.Drawing.Point(15, 91); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(74, 17); + this.label51.Size = new System.Drawing.Size(59, 13); this.label51.TabIndex = 56; this.label51.Text = "ACK_DW2"; // // STATUS_ACK_DW1 // this.STATUS_ACK_DW1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_ACK_DW1.Location = new System.Drawing.Point(113, 59); - this.STATUS_ACK_DW1.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_ACK_DW1.Location = new System.Drawing.Point(85, 48); this.STATUS_ACK_DW1.Name = "STATUS_ACK_DW1"; - this.STATUS_ACK_DW1.Size = new System.Drawing.Size(389, 28); + this.STATUS_ACK_DW1.Size = new System.Drawing.Size(293, 24); this.STATUS_ACK_DW1.TabIndex = 55; // // label50 // this.label50.AutoSize = true; - this.label50.Location = new System.Drawing.Point(20, 69); - this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label50.Location = new System.Drawing.Point(15, 56); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(74, 17); + this.label50.Size = new System.Drawing.Size(59, 13); this.label50.TabIndex = 54; this.label50.Text = "ACK_DW1"; // // STATUS_ACK_DW0 // this.STATUS_ACK_DW0.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.STATUS_ACK_DW0.Location = new System.Drawing.Point(113, 18); - this.STATUS_ACK_DW0.Margin = new System.Windows.Forms.Padding(4); + this.STATUS_ACK_DW0.Location = new System.Drawing.Point(85, 15); this.STATUS_ACK_DW0.Name = "STATUS_ACK_DW0"; - this.STATUS_ACK_DW0.Size = new System.Drawing.Size(389, 28); + this.STATUS_ACK_DW0.Size = new System.Drawing.Size(293, 24); this.STATUS_ACK_DW0.TabIndex = 53; // // label48 // this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(20, 23); - this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label48.Location = new System.Drawing.Point(15, 19); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(74, 17); + this.label48.Size = new System.Drawing.Size(59, 13); this.label48.TabIndex = 52; this.label48.Text = "ACK_DW0"; // @@ -1540,21 +1445,18 @@ this.groupBox1.Controls.Add(this.start); this.groupBox1.Controls.Add(this.port); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Location = new System.Drawing.Point(8, 7); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Location = new System.Drawing.Point(6, 6); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(505, 53); + this.groupBox1.Size = new System.Drawing.Size(379, 43); this.groupBox1.TabIndex = 35; this.groupBox1.TabStop = false; this.groupBox1.Text = "Server Info"; // // dump // - this.dump.Location = new System.Drawing.Point(397, 18); - this.dump.Margin = new System.Windows.Forms.Padding(4); + this.dump.Location = new System.Drawing.Point(298, 15); this.dump.Name = "dump"; - this.dump.Size = new System.Drawing.Size(100, 28); + this.dump.Size = new System.Drawing.Size(75, 23); this.dump.TabIndex = 4; this.dump.Text = "Show Dump"; this.dump.UseVisualStyleBackColor = true; @@ -1562,10 +1464,9 @@ // // stop // - this.stop.Location = new System.Drawing.Point(269, 18); - this.stop.Margin = new System.Windows.Forms.Padding(4); + this.stop.Location = new System.Drawing.Point(202, 15); this.stop.Name = "stop"; - this.stop.Size = new System.Drawing.Size(100, 28); + this.stop.Size = new System.Drawing.Size(75, 23); this.stop.TabIndex = 3; this.stop.Text = "Stop"; this.stop.UseVisualStyleBackColor = true; @@ -1573,10 +1474,9 @@ // // start // - this.start.Location = new System.Drawing.Point(161, 18); - this.start.Margin = new System.Windows.Forms.Padding(4); + this.start.Location = new System.Drawing.Point(121, 15); this.start.Name = "start"; - this.start.Size = new System.Drawing.Size(100, 28); + this.start.Size = new System.Drawing.Size(75, 23); this.start.TabIndex = 2; this.start.Text = "Start"; this.start.UseVisualStyleBackColor = true; @@ -1584,10 +1484,9 @@ // // port // - this.port.Location = new System.Drawing.Point(67, 21); - this.port.Margin = new System.Windows.Forms.Padding(4); + this.port.Location = new System.Drawing.Point(50, 17); this.port.Name = "port"; - this.port.Size = new System.Drawing.Size(81, 22); + this.port.Size = new System.Drawing.Size(62, 20); this.port.TabIndex = 1; this.port.Text = "7878"; this.port.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -1595,10 +1494,9 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(24, 25); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(18, 20); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(34, 17); + this.label1.Size = new System.Drawing.Size(26, 13); this.label1.TabIndex = 0; this.label1.Text = "Port"; // @@ -1606,22 +1504,20 @@ // this.tbConf.BackColor = System.Drawing.Color.Maroon; this.tbConf.Controls.Add(this.wbXmlConf); - this.tbConf.Location = new System.Drawing.Point(4, 25); - this.tbConf.Margin = new System.Windows.Forms.Padding(4); + this.tbConf.Location = new System.Drawing.Point(4, 22); this.tbConf.Name = "tbConf"; - this.tbConf.Padding = new System.Windows.Forms.Padding(4); - this.tbConf.Size = new System.Drawing.Size(1039, 580); + this.tbConf.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tbConf.Size = new System.Drawing.Size(777, 469); this.tbConf.TabIndex = 1; this.tbConf.Text = "XML CONFIG"; // // wbXmlConf // this.wbXmlConf.Dock = System.Windows.Forms.DockStyle.Fill; - this.wbXmlConf.Location = new System.Drawing.Point(4, 4); - this.wbXmlConf.Margin = new System.Windows.Forms.Padding(4); - this.wbXmlConf.MinimumSize = new System.Drawing.Size(27, 25); + this.wbXmlConf.Location = new System.Drawing.Point(3, 3); + this.wbXmlConf.MinimumSize = new System.Drawing.Size(20, 20); this.wbXmlConf.Name = "wbXmlConf"; - this.wbXmlConf.Size = new System.Drawing.Size(1031, 572); + this.wbXmlConf.Size = new System.Drawing.Size(771, 463); this.wbXmlConf.TabIndex = 0; // // tpSIM @@ -1639,10 +1535,9 @@ this.tpSIM.Controls.Add(this.groupBox9); this.tpSIM.Controls.Add(this.groupBox2); this.tpSIM.Controls.Add(this.groupBox12); - this.tpSIM.Location = new System.Drawing.Point(4, 25); - this.tpSIM.Margin = new System.Windows.Forms.Padding(4); + this.tpSIM.Location = new System.Drawing.Point(4, 22); this.tpSIM.Name = "tpSIM"; - this.tpSIM.Size = new System.Drawing.Size(1039, 580); + this.tpSIM.Size = new System.Drawing.Size(777, 469); this.tpSIM.TabIndex = 2; this.tpSIM.Text = "SIMULATION"; // @@ -1666,154 +1561,138 @@ this.groupBox5.Controls.Add(this.label42); this.groupBox5.Controls.Add(this.cbUnOpSel); this.groupBox5.Controls.Add(this.label39); - this.groupBox5.Location = new System.Drawing.Point(513, 316); - this.groupBox5.Margin = new System.Windows.Forms.Padding(4); + this.groupBox5.Location = new System.Drawing.Point(385, 257); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Padding = new System.Windows.Forms.Padding(4); - this.groupBox5.Size = new System.Drawing.Size(505, 191); + this.groupBox5.Size = new System.Drawing.Size(379, 155); this.groupBox5.TabIndex = 62; this.groupBox5.TabStop = false; this.groupBox5.Text = "Unita Operatrice / Mandrino"; // // uoSpeedVal // - this.uoSpeedVal.Location = new System.Drawing.Point(343, 146); - this.uoSpeedVal.Margin = new System.Windows.Forms.Padding(4); + this.uoSpeedVal.Location = new System.Drawing.Point(257, 119); this.uoSpeedVal.Name = "uoSpeedVal"; - this.uoSpeedVal.Size = new System.Drawing.Size(132, 22); + this.uoSpeedVal.Size = new System.Drawing.Size(100, 20); this.uoSpeedVal.TabIndex = 81; // // uoLoadVal // - this.uoLoadVal.Location = new System.Drawing.Point(343, 121); - this.uoLoadVal.Margin = new System.Windows.Forms.Padding(4); + this.uoLoadVal.Location = new System.Drawing.Point(257, 98); this.uoLoadVal.Name = "uoLoadVal"; - this.uoLoadVal.Size = new System.Drawing.Size(132, 22); + this.uoLoadVal.Size = new System.Drawing.Size(100, 20); this.uoLoadVal.TabIndex = 80; // // label45 // this.label45.AutoSize = true; - this.label45.Location = new System.Drawing.Point(5, 150); - this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label45.Location = new System.Drawing.Point(4, 122); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(49, 17); + this.label45.Size = new System.Drawing.Size(38, 13); this.label45.TabIndex = 79; this.label45.Text = "Speed"; // // uoSpeed // - this.uoSpeed.Location = new System.Drawing.Point(97, 146); + this.uoSpeed.Location = new System.Drawing.Point(73, 119); this.uoSpeed.Name = "uoSpeed"; - this.uoSpeed.Size = new System.Drawing.Size(224, 18); + this.uoSpeed.Size = new System.Drawing.Size(168, 18); this.uoSpeed.TabIndex = 78; this.uoSpeed.Scroll += new System.Windows.Forms.ScrollEventHandler(this.uoSpeed_Scroll); // // label46 // this.label46.AutoSize = true; - this.label46.Location = new System.Drawing.Point(5, 124); - this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label46.Location = new System.Drawing.Point(4, 101); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(40, 17); + this.label46.Size = new System.Drawing.Size(31, 13); this.label46.TabIndex = 77; this.label46.Text = "Load"; // // uoLoad // - this.uoLoad.Location = new System.Drawing.Point(97, 121); + this.uoLoad.Location = new System.Drawing.Point(73, 98); this.uoLoad.Name = "uoLoad"; - this.uoLoad.Size = new System.Drawing.Size(224, 18); + this.uoLoad.Size = new System.Drawing.Size(168, 18); this.uoLoad.TabIndex = 76; this.uoLoad.Scroll += new System.Windows.Forms.ScrollEventHandler(this.uoLoad_Scroll); // // uoVitaRes // - this.uoVitaRes.Location = new System.Drawing.Point(97, 89); - this.uoVitaRes.Margin = new System.Windows.Forms.Padding(4); + this.uoVitaRes.Location = new System.Drawing.Point(73, 72); this.uoVitaRes.Name = "uoVitaRes"; - this.uoVitaRes.Size = new System.Drawing.Size(60, 22); + this.uoVitaRes.Size = new System.Drawing.Size(46, 20); this.uoVitaRes.TabIndex = 75; // // label43 // this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(8, 92); - this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label43.Location = new System.Drawing.Point(6, 75); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(57, 17); + this.label43.Size = new System.Drawing.Size(44, 13); this.label43.TabIndex = 74; this.label43.Text = "VitaRes"; // // uoAccTime // - this.uoAccTime.Location = new System.Drawing.Point(253, 89); - this.uoAccTime.Margin = new System.Windows.Forms.Padding(4); + this.uoAccTime.Location = new System.Drawing.Point(190, 72); this.uoAccTime.Name = "uoAccTime"; - this.uoAccTime.Size = new System.Drawing.Size(68, 22); + this.uoAccTime.Size = new System.Drawing.Size(52, 20); this.uoAccTime.TabIndex = 73; // // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(160, 92); - this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label44.Location = new System.Drawing.Point(120, 75); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(66, 17); + this.label44.Size = new System.Drawing.Size(52, 13); this.label44.TabIndex = 72; this.label44.Text = "Acc Time"; // // uoToolId // - this.uoToolId.Location = new System.Drawing.Point(97, 57); - this.uoToolId.Margin = new System.Windows.Forms.Padding(4); + this.uoToolId.Location = new System.Drawing.Point(73, 46); this.uoToolId.Name = "uoToolId"; - this.uoToolId.Size = new System.Drawing.Size(60, 22); + this.uoToolId.Size = new System.Drawing.Size(46, 20); this.uoToolId.TabIndex = 71; // // label40 // this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(8, 60); - this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label40.Location = new System.Drawing.Point(6, 49); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(53, 17); + this.label40.Size = new System.Drawing.Size(42, 13); this.label40.TabIndex = 70; this.label40.Text = "Tool ID"; // // uoStatus // - this.uoStatus.Location = new System.Drawing.Point(396, 57); - this.uoStatus.Margin = new System.Windows.Forms.Padding(4); + this.uoStatus.Location = new System.Drawing.Point(297, 46); this.uoStatus.Name = "uoStatus"; - this.uoStatus.Size = new System.Drawing.Size(80, 22); + this.uoStatus.Size = new System.Drawing.Size(61, 20); this.uoStatus.TabIndex = 69; // // label41 // this.label41.AutoSize = true; - this.label41.Location = new System.Drawing.Point(340, 60); - this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label41.Location = new System.Drawing.Point(255, 49); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(48, 17); + this.label41.Size = new System.Drawing.Size(37, 13); this.label41.TabIndex = 68; this.label41.Text = "Status"; // // uoNumCU // - this.uoNumCU.Location = new System.Drawing.Point(253, 57); - this.uoNumCU.Margin = new System.Windows.Forms.Padding(4); + this.uoNumCU.Location = new System.Drawing.Point(190, 46); this.uoNumCU.Name = "uoNumCU"; - this.uoNumCU.Size = new System.Drawing.Size(68, 22); + this.uoNumCU.Size = new System.Drawing.Size(52, 20); this.uoNumCU.TabIndex = 67; // // label42 // this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(160, 60); - this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label42.Location = new System.Drawing.Point(120, 49); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(56, 17); + this.label42.Size = new System.Drawing.Size(44, 13); this.label42.TabIndex = 66; this.label42.Text = "NumCU"; // @@ -1821,10 +1700,9 @@ // this.cbUnOpSel.DisplayMember = "Name"; this.cbUnOpSel.FormattingEnabled = true; - this.cbUnOpSel.Location = new System.Drawing.Point(97, 23); - this.cbUnOpSel.Margin = new System.Windows.Forms.Padding(4); + this.cbUnOpSel.Location = new System.Drawing.Point(73, 19); this.cbUnOpSel.Name = "cbUnOpSel"; - this.cbUnOpSel.Size = new System.Drawing.Size(160, 24); + this.cbUnOpSel.Size = new System.Drawing.Size(121, 21); this.cbUnOpSel.TabIndex = 65; this.cbUnOpSel.ValueMember = "Value"; this.cbUnOpSel.SelectedIndexChanged += new System.EventHandler(this.cbUnOpSel_SelectedIndexChanged); @@ -1832,10 +1710,9 @@ // label39 // this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(5, 28); - this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label39.Location = new System.Drawing.Point(4, 23); this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(78, 17); + this.label39.Size = new System.Drawing.Size(60, 13); this.label39.TabIndex = 64; this.label39.Text = "Num UnOp"; // @@ -1845,11 +1722,9 @@ this.Execution.Controls.Add(this.feedhold); this.Execution.Controls.Add(this.stopped); this.Execution.Controls.Add(this.running); - this.Execution.Location = new System.Drawing.Point(4, 116); - this.Execution.Margin = new System.Windows.Forms.Padding(4); + this.Execution.Location = new System.Drawing.Point(3, 94); this.Execution.Name = "Execution"; - this.Execution.Padding = new System.Windows.Forms.Padding(4); - this.Execution.Size = new System.Drawing.Size(507, 59); + this.Execution.Size = new System.Drawing.Size(380, 48); this.Execution.TabIndex = 61; this.Execution.TabStop = false; this.Execution.Text = "Execution"; @@ -1858,10 +1733,9 @@ // this.ready.AutoSize = true; this.ready.Checked = true; - this.ready.Location = new System.Drawing.Point(152, 20); - this.ready.Margin = new System.Windows.Forms.Padding(4); + this.ready.Location = new System.Drawing.Point(114, 16); this.ready.Name = "ready"; - this.ready.Size = new System.Drawing.Size(70, 21); + this.ready.Size = new System.Drawing.Size(56, 17); this.ready.TabIndex = 9; this.ready.TabStop = true; this.ready.Text = "Ready"; @@ -1870,10 +1744,9 @@ // feedhold // this.feedhold.AutoSize = true; - this.feedhold.Location = new System.Drawing.Point(337, 20); - this.feedhold.Margin = new System.Windows.Forms.Padding(4); + this.feedhold.Location = new System.Drawing.Point(253, 16); this.feedhold.Name = "feedhold"; - this.feedhold.Size = new System.Drawing.Size(94, 21); + this.feedhold.Size = new System.Drawing.Size(74, 17); this.feedhold.TabIndex = 8; this.feedhold.Text = "Feed Hold"; this.feedhold.UseVisualStyleBackColor = true; @@ -1881,10 +1754,9 @@ // stopped // this.stopped.AutoSize = true; - this.stopped.Location = new System.Drawing.Point(240, 20); - this.stopped.Margin = new System.Windows.Forms.Padding(4); + this.stopped.Location = new System.Drawing.Point(180, 16); this.stopped.Name = "stopped"; - this.stopped.Size = new System.Drawing.Size(82, 21); + this.stopped.Size = new System.Drawing.Size(65, 17); this.stopped.TabIndex = 7; this.stopped.Text = "Stopped"; this.stopped.UseVisualStyleBackColor = true; @@ -1892,10 +1764,9 @@ // running // this.running.AutoSize = true; - this.running.Location = new System.Drawing.Point(48, 20); - this.running.Margin = new System.Windows.Forms.Padding(4); + this.running.Location = new System.Drawing.Point(36, 16); this.running.Name = "running"; - this.running.Size = new System.Drawing.Size(82, 21); + this.running.Size = new System.Drawing.Size(65, 17); this.running.TabIndex = 6; this.running.Text = "Running"; this.running.UseVisualStyleBackColor = true; @@ -1906,11 +1777,9 @@ this.mode.Controls.Add(this.mdi); this.mode.Controls.Add(this.manual); this.mode.Controls.Add(this.automatic); - this.mode.Location = new System.Drawing.Point(4, 49); - this.mode.Margin = new System.Windows.Forms.Padding(4); + this.mode.Location = new System.Drawing.Point(3, 40); this.mode.Name = "mode"; - this.mode.Padding = new System.Windows.Forms.Padding(4); - this.mode.Size = new System.Drawing.Size(505, 59); + this.mode.Size = new System.Drawing.Size(379, 48); this.mode.TabIndex = 60; this.mode.TabStop = false; this.mode.Text = "Mode"; @@ -1918,10 +1787,9 @@ // edit // this.edit.AutoSize = true; - this.edit.Location = new System.Drawing.Point(399, 20); - this.edit.Margin = new System.Windows.Forms.Padding(4); + this.edit.Location = new System.Drawing.Point(299, 16); this.edit.Name = "edit"; - this.edit.Size = new System.Drawing.Size(53, 21); + this.edit.Size = new System.Drawing.Size(43, 17); this.edit.TabIndex = 9; this.edit.Text = "Edit"; this.edit.UseVisualStyleBackColor = true; @@ -1929,10 +1797,9 @@ // mdi // this.mdi.AutoSize = true; - this.mdi.Location = new System.Drawing.Point(240, 18); - this.mdi.Margin = new System.Windows.Forms.Padding(4); + this.mdi.Location = new System.Drawing.Point(180, 15); this.mdi.Name = "mdi"; - this.mdi.Size = new System.Drawing.Size(144, 21); + this.mdi.Size = new System.Drawing.Size(113, 17); this.mdi.TabIndex = 8; this.mdi.Text = "Manual Data Input"; this.mdi.UseVisualStyleBackColor = true; @@ -1941,10 +1808,9 @@ // this.manual.AutoSize = true; this.manual.Checked = true; - this.manual.Location = new System.Drawing.Point(152, 18); - this.manual.Margin = new System.Windows.Forms.Padding(4); + this.manual.Location = new System.Drawing.Point(114, 15); this.manual.Name = "manual"; - this.manual.Size = new System.Drawing.Size(75, 21); + this.manual.Size = new System.Drawing.Size(60, 17); this.manual.TabIndex = 7; this.manual.TabStop = true; this.manual.Text = "Manual"; @@ -1953,10 +1819,9 @@ // automatic // this.automatic.AutoSize = true; - this.automatic.Location = new System.Drawing.Point(48, 20); - this.automatic.Margin = new System.Windows.Forms.Padding(4); + this.automatic.Location = new System.Drawing.Point(36, 16); this.automatic.Name = "automatic"; - this.automatic.Size = new System.Drawing.Size(91, 21); + this.automatic.Size = new System.Drawing.Size(72, 17); this.automatic.TabIndex = 6; this.automatic.Text = "Automatic"; this.automatic.UseVisualStyleBackColor = true; @@ -1973,11 +1838,9 @@ this.groupBox7.Controls.Add(this.label16); this.groupBox7.Controls.Add(this.label15); this.groupBox7.Controls.Add(this.label14); - this.groupBox7.Location = new System.Drawing.Point(513, 4); - this.groupBox7.Margin = new System.Windows.Forms.Padding(4); + this.groupBox7.Location = new System.Drawing.Point(385, 3); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Padding = new System.Windows.Forms.Padding(4); - this.groupBox7.Size = new System.Drawing.Size(507, 92); + this.groupBox7.Size = new System.Drawing.Size(380, 75); this.groupBox7.TabIndex = 59; this.groupBox7.TabStop = false; this.groupBox7.Text = "Macchina"; @@ -1986,10 +1849,9 @@ // this.D1_UUID.AutoSize = true; this.D1_UUID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.D1_UUID.Location = new System.Drawing.Point(311, 66); - this.D1_UUID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.D1_UUID.Location = new System.Drawing.Point(233, 54); this.D1_UUID.Name = "D1_UUID"; - this.D1_UUID.Size = new System.Drawing.Size(23, 17); + this.D1_UUID.Size = new System.Drawing.Size(19, 13); this.D1_UUID.TabIndex = 66; this.D1_UUID.Text = "..."; // @@ -1997,10 +1859,9 @@ // this.D1_ID.AutoSize = true; this.D1_ID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.D1_ID.Location = new System.Drawing.Point(72, 65); - this.D1_ID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.D1_ID.Location = new System.Drawing.Point(54, 53); this.D1_ID.Name = "D1_ID"; - this.D1_ID.Size = new System.Drawing.Size(23, 17); + this.D1_ID.Size = new System.Drawing.Size(19, 13); this.D1_ID.TabIndex = 65; this.D1_ID.Text = "..."; // @@ -2008,87 +1869,77 @@ // this.D1_NAME.AutoSize = true; this.D1_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.D1_NAME.Location = new System.Drawing.Point(72, 25); - this.D1_NAME.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.D1_NAME.Location = new System.Drawing.Point(54, 20); this.D1_NAME.Name = "D1_NAME"; - this.D1_NAME.Size = new System.Drawing.Size(23, 17); + this.D1_NAME.Size = new System.Drawing.Size(19, 13); this.D1_NAME.TabIndex = 64; this.D1_NAME.Text = "..."; // // lblAT // this.lblAT.AutoSize = true; - this.lblAT.Location = new System.Drawing.Point(252, 25); - this.lblAT.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblAT.Location = new System.Drawing.Point(189, 20); this.lblAT.Name = "lblAT"; - this.lblAT.Size = new System.Drawing.Size(53, 17); + this.lblAT.Size = new System.Drawing.Size(43, 13); this.lblAT.TabIndex = 63; this.lblAT.Text = "AccMin"; // // txtAccTime // - this.txtAccTime.Location = new System.Drawing.Point(312, 21); - this.txtAccTime.Margin = new System.Windows.Forms.Padding(4); + this.txtAccTime.Location = new System.Drawing.Point(234, 17); this.txtAccTime.Name = "txtAccTime"; - this.txtAccTime.Size = new System.Drawing.Size(69, 22); + this.txtAccTime.Size = new System.Drawing.Size(53, 20); this.txtAccTime.TabIndex = 62; // // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(384, 25); - this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label30.Location = new System.Drawing.Point(288, 20); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(46, 17); + this.label30.Size = new System.Drawing.Size(36, 13); this.label30.TabIndex = 61; this.label30.Text = "power"; // // txtPower // - this.txtPower.Location = new System.Drawing.Point(433, 21); - this.txtPower.Margin = new System.Windows.Forms.Padding(4); + this.txtPower.Location = new System.Drawing.Point(325, 17); this.txtPower.Name = "txtPower"; - this.txtPower.Size = new System.Drawing.Size(64, 22); + this.txtPower.Size = new System.Drawing.Size(49, 20); this.txtPower.TabIndex = 60; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(257, 65); - this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label16.Location = new System.Drawing.Point(193, 53); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(41, 17); + this.label16.Size = new System.Drawing.Size(34, 13); this.label16.TabIndex = 59; this.label16.Text = "UUID"; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(13, 65); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Location = new System.Drawing.Point(10, 53); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(21, 17); + this.label15.Size = new System.Drawing.Size(18, 13); this.label15.TabIndex = 57; this.label15.Text = "ID"; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(13, 25); - this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Location = new System.Drawing.Point(10, 20); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(45, 17); + this.label14.Size = new System.Drawing.Size(35, 13); this.label14.TabIndex = 54; this.label14.Text = "Nome"; // // groupBox10 // this.groupBox10.Controls.Add(this.enableDataSim); - this.groupBox10.Location = new System.Drawing.Point(273, 4); - this.groupBox10.Margin = new System.Windows.Forms.Padding(4); + this.groupBox10.Location = new System.Drawing.Point(205, 3); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Padding = new System.Windows.Forms.Padding(4); - this.groupBox10.Size = new System.Drawing.Size(236, 38); + this.groupBox10.Size = new System.Drawing.Size(177, 31); this.groupBox10.TabIndex = 58; this.groupBox10.TabStop = false; this.groupBox10.Text = "Simulazione"; @@ -2096,11 +1947,10 @@ // enableDataSim // this.enableDataSim.AutoSize = true; - this.enableDataSim.Location = new System.Drawing.Point(149, 11); - this.enableDataSim.Margin = new System.Windows.Forms.Padding(4); + this.enableDataSim.Location = new System.Drawing.Point(112, 9); this.enableDataSim.Name = "enableDataSim"; this.enableDataSim.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.enableDataSim.Size = new System.Drawing.Size(74, 21); + this.enableDataSim.Size = new System.Drawing.Size(59, 17); this.enableDataSim.TabIndex = 55; this.enableDataSim.Text = "Enable"; this.enableDataSim.UseVisualStyleBackColor = true; @@ -2108,11 +1958,9 @@ // groupBox8 // this.groupBox8.Controls.Add(this.estop); - this.groupBox8.Location = new System.Drawing.Point(4, 4); - this.groupBox8.Margin = new System.Windows.Forms.Padding(4); + this.groupBox8.Location = new System.Drawing.Point(3, 3); this.groupBox8.Name = "groupBox8"; - this.groupBox8.Padding = new System.Windows.Forms.Padding(4); - this.groupBox8.Size = new System.Drawing.Size(261, 38); + this.groupBox8.Size = new System.Drawing.Size(196, 31); this.groupBox8.TabIndex = 57; this.groupBox8.TabStop = false; this.groupBox8.Text = "Sicurezze"; @@ -2120,11 +1968,10 @@ // estop // this.estop.AutoSize = true; - this.estop.Location = new System.Drawing.Point(79, 11); - this.estop.Margin = new System.Windows.Forms.Padding(4); + this.estop.Location = new System.Drawing.Point(59, 9); this.estop.Name = "estop"; this.estop.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.estop.Size = new System.Drawing.Size(134, 21); + this.estop.Size = new System.Drawing.Size(104, 17); this.estop.TabIndex = 55; this.estop.Text = "Emergency Stop"; this.estop.UseVisualStyleBackColor = true; @@ -2140,11 +1987,9 @@ this.groupBox12.Controls.Add(this.lblCodaM); this.groupBox12.Controls.Add(this.addCodM); this.groupBox12.Controls.Add(this.label20); - this.groupBox12.Location = new System.Drawing.Point(4, 384); - this.groupBox12.Margin = new System.Windows.Forms.Padding(4); + this.groupBox12.Location = new System.Drawing.Point(3, 312); this.groupBox12.Name = "groupBox12"; - this.groupBox12.Padding = new System.Windows.Forms.Padding(4); - this.groupBox12.Size = new System.Drawing.Size(507, 123); + this.groupBox12.Size = new System.Drawing.Size(380, 100); this.groupBox12.TabIndex = 58; this.groupBox12.TabStop = false; this.groupBox12.Text = "Codici M/S/T"; @@ -2152,19 +1997,17 @@ // lblCodaT // this.lblCodaT.AutoSize = true; - this.lblCodaT.Location = new System.Drawing.Point(156, 91); - this.lblCodaT.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblCodaT.Location = new System.Drawing.Point(117, 74); this.lblCodaT.Name = "lblCodaT"; - this.lblCodaT.Size = new System.Drawing.Size(28, 17); + this.lblCodaT.Size = new System.Drawing.Size(22, 13); this.lblCodaT.TabIndex = 60; this.lblCodaT.Text = "[...]"; // // addCodT // - this.addCodT.Location = new System.Drawing.Point(68, 87); - this.addCodT.Margin = new System.Windows.Forms.Padding(4); + this.addCodT.Location = new System.Drawing.Point(51, 71); this.addCodT.Name = "addCodT"; - this.addCodT.Size = new System.Drawing.Size(79, 22); + this.addCodT.Size = new System.Drawing.Size(60, 20); this.addCodT.TabIndex = 59; this.addCodT.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodT_KeyDown); this.addCodT.Leave += new System.EventHandler(this.addCodT_Leave); @@ -2172,29 +2015,26 @@ // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(12, 91); - this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label24.Location = new System.Drawing.Point(9, 74); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(42, 17); + this.label24.Size = new System.Drawing.Size(33, 13); this.label24.TabIndex = 58; this.label24.Text = "AddT"; // // lblCodaS // this.lblCodaS.AutoSize = true; - this.lblCodaS.Location = new System.Drawing.Point(157, 59); - this.lblCodaS.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblCodaS.Location = new System.Drawing.Point(118, 48); this.lblCodaS.Name = "lblCodaS"; - this.lblCodaS.Size = new System.Drawing.Size(28, 17); + this.lblCodaS.Size = new System.Drawing.Size(22, 13); this.lblCodaS.TabIndex = 57; this.lblCodaS.Text = "[...]"; // // addCodS // - this.addCodS.Location = new System.Drawing.Point(69, 55); - this.addCodS.Margin = new System.Windows.Forms.Padding(4); + this.addCodS.Location = new System.Drawing.Point(52, 45); this.addCodS.Name = "addCodS"; - this.addCodS.Size = new System.Drawing.Size(79, 22); + this.addCodS.Size = new System.Drawing.Size(60, 20); this.addCodS.TabIndex = 56; this.addCodS.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodS_KeyDown); this.addCodS.Leave += new System.EventHandler(this.addCodS_Leave); @@ -2202,29 +2042,26 @@ // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(13, 59); - this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label22.Location = new System.Drawing.Point(10, 48); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(42, 17); + this.label22.Size = new System.Drawing.Size(33, 13); this.label22.TabIndex = 55; this.label22.Text = "AddS"; // // lblCodaM // this.lblCodaM.AutoSize = true; - this.lblCodaM.Location = new System.Drawing.Point(157, 27); - this.lblCodaM.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblCodaM.Location = new System.Drawing.Point(118, 22); this.lblCodaM.Name = "lblCodaM"; - this.lblCodaM.Size = new System.Drawing.Size(28, 17); + this.lblCodaM.Size = new System.Drawing.Size(22, 13); this.lblCodaM.TabIndex = 54; this.lblCodaM.Text = "[...]"; // // addCodM // - this.addCodM.Location = new System.Drawing.Point(69, 23); - this.addCodM.Margin = new System.Windows.Forms.Padding(4); + this.addCodM.Location = new System.Drawing.Point(52, 19); this.addCodM.Name = "addCodM"; - this.addCodM.Size = new System.Drawing.Size(79, 22); + this.addCodM.Size = new System.Drawing.Size(60, 20); this.addCodM.TabIndex = 53; this.addCodM.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodM_KeyDown); this.addCodM.Leave += new System.EventHandler(this.addCodM_Leave); @@ -2232,10 +2069,9 @@ // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(13, 27); - this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label20.Location = new System.Drawing.Point(10, 22); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(44, 17); + this.label20.Size = new System.Drawing.Size(35, 13); this.label20.TabIndex = 52; this.label20.Text = "AddM"; // @@ -2250,26 +2086,14 @@ // this.trayMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.trayMenu.Name = "trayMenu"; - this.trayMenu.Size = new System.Drawing.Size(67, 4); + this.trayMenu.Size = new System.Drawing.Size(61, 4); this.trayMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.trayMenu_ItemClicked); // - // lblOutMessage3 - // - this.lblOutMessage3.AutoSize = true; - this.lblOutMessage3.Font = new System.Drawing.Font("Arial Narrow", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblOutMessage3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.lblOutMessage3.Location = new System.Drawing.Point(543, 15); - this.lblOutMessage3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lblOutMessage3.Name = "lblOutMessage3"; - this.lblOutMessage3.Size = new System.Drawing.Size(17, 16); - this.lblOutMessage3.TabIndex = 62; - this.lblOutMessage3.Text = "..."; - // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1047, 698); + this.ClientSize = new System.Drawing.Size(785, 567); this.Controls.Add(this.tabCtrlMain); this.Controls.Add(this.lblCurrAdapt); this.Controls.Add(this.statusStrip1); @@ -2277,7 +2101,6 @@ this.Controls.Add(this.label6); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.Name = "MainForm"; this.ShowInTaskbar = false; diff --git a/MTC_Adapter/MTC_Adapter/MainForm.cs b/MTC_Adapter/MTC_Adapter/MainForm.cs index 4dac8f7..46df911 100644 --- a/MTC_Adapter/MTC_Adapter/MainForm.cs +++ b/MTC_Adapter/MTC_Adapter/MainForm.cs @@ -124,6 +124,7 @@ namespace MTC_Adapter lastStartTry = DateTime.Now; // fix icon! + notifyIcon1.Text = string.Format("MTC Adapter | {0}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); Icon = Icon.ExtractAssociatedIcon(defIconFilePath); notifyIcon1.Icon = Icon.ExtractAssociatedIcon(defIconFilePath); diff --git a/MTC_Adapter/MTC_Adapter/MainForm.resx b/MTC_Adapter/MTC_Adapter/MainForm.resx index 018cda4..8196fcb 100644 --- a/MTC_Adapter/MTC_Adapter/MainForm.resx +++ b/MTC_Adapter/MTC_Adapter/MainForm.resx @@ -138,24 +138,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - 104, 17 diff --git a/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataFANUC.map b/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataFANUC.map new file mode 100644 index 0000000..9177953 --- /dev/null +++ b/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataFANUC.map @@ -0,0 +1 @@ +# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura) \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataOSAI.map b/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataOSAI.map new file mode 100644 index 0000000..9e81ede --- /dev/null +++ b/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataOSAI.map @@ -0,0 +1,7 @@ +# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura) +001|Axis_01_Load |NUM +002|Axis_02_Load |NUM +003|Axis_03_Load |NUM +004|Axis_04_Load |NUM +005|Axis_05_Load |NUM +006|Axis_06_Load |NUM \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataSIEMENS.map b/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataSIEMENS.map new file mode 100644 index 0000000..9177953 --- /dev/null +++ b/MTC_Adapter/MTC_Adapter/Resources/CMS/AnalogDataSIEMENS.map @@ -0,0 +1 @@ +# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura) \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/setupTgt.bat b/MTC_Adapter/MTC_Adapter/setupTgt.bat index 12351bf..82b460d 100644 --- a/MTC_Adapter/MTC_Adapter/setupTgt.bat +++ b/MTC_Adapter/MTC_Adapter/setupTgt.bat @@ -30,6 +30,7 @@ del %2"Resources\MTCA.ico" del %2"DATA\CONF\Adapter_ItemList.xml" del %2"DATA\CONF\AlarmList.map" del %2"DATA\CONF\AlarmListCNC.map" +del %2"DATA\CONF\AnalogData.map" del %2"DATA\CONF\CounterList.map" del %2"DATA\CONF\StatusList.map" REM del /F /Q %2"DATA\CONF\*.*" @@ -65,6 +66,7 @@ goto END :FANUC copy %2"Resources\CMS\FANUC.xml" %2"DATA\CONF\Adapter_ItemList.xml" copy %2"Resources\CMS\AlarmListFANUC.map" %2"DATA\CONF\AlarmList.map" +copy %2"Resources\CMS\AnalogDataFANUC.map" %2"DATA\CONF\AnalogData.map" copy %2"Resources\CMS\CounterListFANUC.map" %2"DATA\CONF\CounterList.map" copy %2"Resources\CMS\StatusListFANUC.map" %2"DATA\CONF\StatusList.map" goto END @@ -72,6 +74,7 @@ goto END :SIEMENS copy %2"Resources\CMS\SIEMENS.xml" %2"DATA\CONF\Adapter_ItemList.xml" copy %2"Resources\CMS\AlarmListSIEMENS.map" %2"DATA\CONF\AlarmList.map" +copy %2"Resources\CMS\AnalogDataSIEMENS.map" %2"DATA\CONF\AnalogData.map" copy %2"Resources\CMS\CounterListSIEMENS.map" %2"DATA\CONF\CounterList.map" copy %2"Resources\CMS\StatusListSIEMENS.map" %2"DATA\CONF\StatusList.map" goto END @@ -79,6 +82,7 @@ goto END :OSAI copy %2"Resources\CMS\OSAI.xml" %2"DATA\CONF\Adapter_ItemList.xml" copy %2"Resources\CMS\AlarmListOSAI.map" %2"DATA\CONF\AlarmList.map" +copy %2"Resources\CMS\AnalogDataOSAI.map" %2"DATA\CONF\AnalogData.map" copy %2"Resources\CMS\CounterListOSAI.map" %2"DATA\CONF\CounterList.map" copy %2"Resources\CMS\StatusListOSAI.map" %2"DATA\CONF\StatusList.map" goto END