From 44b8a47d3c8ae8c599de892240d69b6738e0570e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 17 May 2016 15:44:39 +0200 Subject: [PATCH] aggiunta gestione strobe non riconosciuti (bit 7..29) --- AgentBin/simulator/CMS_DEMO.xml | 5 ++++- MTC_Sim/.vs/MTC_Sim/v14/.suo | Bin 288768 -> 288768 bytes MTC_Sim/MTC_Sim/AdapterFanuc.cs | 26 ++++++++++++++++++++++++++ MTC_Sim/MTC_Sim/AdapterGeneric.cs | 17 ++++++++++++++--- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/AgentBin/simulator/CMS_DEMO.xml b/AgentBin/simulator/CMS_DEMO.xml index c42dde0..1a42b2c 100644 --- a/AgentBin/simulator/CMS_DEMO.xml +++ b/AgentBin/simulator/CMS_DEMO.xml @@ -12,7 +12,10 @@ - + + + + diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo index 36e819365e03a8a156d5f0bc324c193a5175b846..ca56bedcc3b9f7eafdceca53c81e82021aa1dd3e 100644 GIT binary patch delta 4485 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 delta 8185 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 k@l0);2TGfS{J*Ot^g7Cc_ + /// Gestione strobe UserAction: salva dati e gestione ACK + /// + /// + /// + /// + /// + private void gestStrobeUnknown(int bitNum, ref byte[] retACK_DW1, ref string UserAction, string azione) + { + if (STRB_DW1.HasFlag((StFlag32)Math.Pow(2, bitNum))) + { + // salvo evento UserAction in variabile... + UserAction += azione; + // memorizzo allarme nel vettore ack.... + retACK_DW1 = utils.setBitOnStFlag(retACK_DW1, true, bitNum); + } + } /// /// Gestione strobe UserAction: salva dati e gestione ACK diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index 65e69ca..0ccfa94 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -690,12 +690,19 @@ namespace MTC_Sim /// /// Azioni operatore (Start/Stop/reset) /// - public Event mUserAction = new Event("UserAction"); + public Event mUserAction = new Event("USER_ACTION"); /// /// Testing macchina /// - public Event mTestingData = new Event("TestingData"); - + public Event mTestingData = new Event("TESTING_DATA"); + /// + /// Strobe rilevati ma non qualificati + /// + public Event mUnkStrobe = new Event("UNK_STROBE"); + /// + /// Status rilevati ma non qualificati + /// + public Event mUnkStatus = new Event("UNK_STATUS"); #endregion @@ -770,6 +777,10 @@ namespace MTC_Sim // testing e autodiagnostica mAdapter.AddDataItem(mTestingData); + // strobe/status non riconosciuti + mAdapter.AddDataItem(mUnkStatus); + mAdapter.AddDataItem(mUnkStrobe); + // Pompe vuoto vettVacPump = new VacuumPomp[adpConf.nVacuumPump]; for (int i = 0; i < adpConf.nVacuumPump; i++)