diff --git a/MTC_Adapter/SCMA/AdapterGeneric.cs b/MTC_Adapter/SCMA/AdapterGeneric.cs index d6a4ad7..c935272 100644 --- a/MTC_Adapter/SCMA/AdapterGeneric.cs +++ b/MTC_Adapter/SCMA/AdapterGeneric.cs @@ -576,7 +576,7 @@ namespace SCMA currGateway.addItemNodeAndSet("Emergency", itemType.Event, availStatus.NULL.ToString().ToLower()); } // solo se sono in modalità MTC aggiungo item cablati... - else if (currGateway.protocollo == gwProtocol.MTC) + else { // item disponibilità currGateway.addItemNodeAndSet("AVAIL", itemType.Event, availStatus.AVAILABLE.ToString()); @@ -589,6 +589,7 @@ namespace SCMA // dati utente currGateway.addItemNodeAndSet("OperatorId", itemType.Event, availStatus.NULL.ToString().ToLower()); currGateway.addItemNodeAndSet("CLOCK", itemType.Sample, DateTime.Now.Date.ToFileTimeUtc()); + currGateway.addItemNodeAndSet("SlittaTastatore_Count", itemType.Sample, availStatus.NULL.ToString().ToLower()); } // status, clock, emergency stop currGateway.addItemNodeAndSet("E_STOP", itemType.Event, availStatus.NULL.ToString().ToLower()); @@ -597,7 +598,6 @@ namespace SCMA // tempi, potenza, processo, counters vari ACC_TIME_WORK currGateway.addItemNodeAndSet("ACC_TIME", itemType.Event, availStatus.NULL.ToString().ToLower()); currGateway.addItemNodeAndSet("ACC_TIME_WORK", itemType.Event, availStatus.NULL.ToString().ToLower()); - currGateway.addItemNodeAndSet("SlittaTastatore_Count", itemType.Sample, availStatus.NULL.ToString().ToLower()); currGateway.addItemNodeAndSet("POWER", itemType.Event, availStatus.NULL.ToString().ToLower()); currGateway.addItemNodeAndSet("PROC_SEL", itemType.Event, availStatus.NULL.ToString().ToLower()); @@ -641,7 +641,10 @@ namespace SCMA { vettLubro[i] = new Lubro(adpConf.Lubro[i]); currGateway.addItemNodeAndSet(vettLubro[i].countKey, itemType.Event, availStatus.NULL.ToString().ToLower()); - currGateway.addItemNodeAndSet(vettLubro[i].statusKey, itemType.Event, availStatus.NULL.ToString().ToLower()); + if (currGateway.protocollo != gwProtocol.SOURS) + { + currGateway.addItemNodeAndSet(vettLubro[i].statusKey, itemType.Event, availStatus.NULL.ToString().ToLower()); + } } // Slitta Mag vettSlittaMag = new SlittaMag[adpConf.nSlittaMag]; @@ -4481,24 +4484,11 @@ namespace SCMA } else if (origName.StartsWith("Lubro_")) { - if (origName.EndsWith("_Num")) + if (origName.EndsWith("_Num") || origName.EndsWith("_Count")) { try { - numero = Convert.ToInt32(origName.Replace("Lubro_", "").Replace("_Num", "")); - } - catch - { } - if (numero > 0 && istLubroCount.Length >= numero) - { - istLubroCount[numero - 1].addValue(DateTime.Now, Convert.ToInt32(tabDatiMtz[idxTab])); - } - } - else if (origName.EndsWith("_Count")) - { - try - { - numero = Convert.ToInt32(origName.Replace("Lubro_", "").Replace("_Count", "")); + numero = Convert.ToInt32(origName.Replace("Lubro_", "").Replace("_Num", "").Replace("_Count", "")); } catch { } @@ -5537,7 +5527,7 @@ namespace SCMA } // salvo su maschera... parentForm.dataMonitor_2 += string.Format("{0}{1}", outString.Substring(0, outString.Length - 3), Environment.NewLine); - + // Contatore ORE ATTIVE mandrino outString = string.Format("UnOp_[1-{0}]_AccTime: ", currAdpConf.nUnOp); for (int i = 0; i < currAdpConf.nUnOp; i++) diff --git a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml index 3c34274..51a25f9 100644 --- a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml +++ b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml @@ -9,7 +9,7 @@ - + diff --git a/MTC_Adapter/SCMA/MainForm.cs b/MTC_Adapter/SCMA/MainForm.cs index f680670..2cbca47 100644 --- a/MTC_Adapter/SCMA/MainForm.cs +++ b/MTC_Adapter/SCMA/MainForm.cs @@ -1459,8 +1459,7 @@ namespace SCMA // aggiungo su file... replString = item.BrowseName.Replace("Machine:", "").Replace(":Type", ""); fileOut.WriteLine($"A|I|{newElement.ident}_Count|{replString}:Repetitions"); - fileOut.WriteLine($"A|I|{newElement.ident}_Status|{replString}:Status"); - numRules +=2; + numRules ++; } if (item.Value == "VACUUM_PUMP") {