From fdafaf63ac2f1484ff9220d2b66a1c65116341ce Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 19 Jul 2016 14:52:52 +0200 Subject: [PATCH] Fix vari con Fabio Fix lettura area D--> area R x vari mtz Fix valori lettura da aree UT --- MTC_Sim/MTC_Sim/AdapterFanuc.cs | 23 +++++++++++------------ MTC_Sim/MTC_Sim/AdapterGeneric.cs | 2 ++ MTC_Sim/MTC_Sim/App.config | 3 ++- MTC_Sim/VersGen/AdapterVers.cs | 4 ++-- MTC_Sim/VersGen/AdapterVers.tt | 4 ++-- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/MTC_Sim/MTC_Sim/AdapterFanuc.cs b/MTC_Sim/MTC_Sim/AdapterFanuc.cs index 4242caa..4273e06 100644 --- a/MTC_Sim/MTC_Sim/AdapterFanuc.cs +++ b/MTC_Sim/MTC_Sim/AdapterFanuc.cs @@ -701,8 +701,6 @@ namespace MTC_Adapter public override void getSlowChangingData() { base.getSlowChangingData(); - // dati da PC - mClock.Value = DateTime.Now.Date.ToFileTimeUtc(); // reload dati da file... reloadDataFromFile(); @@ -723,7 +721,7 @@ namespace MTC_Adapter int memIndex = 14000; byte[] tabDatiMtz = new byte[4 * maintData.Length]; inizio = DateTime.Now; - FANUC_ref.F_RW_Byte(R, FANUC.MemType.D, memIndex, ref tabDatiMtz); + FANUC_ref.F_RW_Byte(R, FANUC.MemType.R, memIndex, ref tabDatiMtz); if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiMtz", tabDatiMtz.Length), DateTime.Now.Subtract(inizio).Ticks); // uno ad uno vado a inserirli nella mappa dei dati dell'adapter... int shift = 4; // 32bit @@ -905,7 +903,7 @@ namespace MTC_Adapter int memIndex = 12000; byte[] PathData = new byte[8]; inizio = DateTime.Now; - FANUC_ref.F_RW_Byte(R, FANUC.MemType.D, memIndex, ref PathData); + FANUC_ref.F_RW_Byte(R, FANUC.MemType.R, memIndex, ref PathData); if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-PathData", PathData.Length), DateTime.Now.Subtract(inizio).Ticks); @@ -1077,6 +1075,7 @@ namespace MTC_Adapter int[] tabUt = new int[maxMemAddr]; int[] tabFamUt = new int[maxMemAddr]; int memIndex = 0; + byte[] int32Mem = new byte[4]; byte[] int16Mem = new byte[2]; byte int8Mem = new byte(); @@ -1111,7 +1110,7 @@ namespace MTC_Adapter for (int j = 0; j < maxMemAddr; j++) { // controllo, se l'id utensile è quello dell'attuale UnOp... - if (tabUt_UT[j] == idUtMontato[i]) + if (tabUt[j] == idUtMontato[i]) { // leggo FamUt puntuale.. memIndex = 11700 + 2 * j; @@ -1148,7 +1147,7 @@ namespace MTC_Adapter if (tabFamUt[j] == idFamUt[i] && !found) { // leggo FamUt puntuale.. - memIndex = 10700 + 2 * j; + memIndex = 10700 + 1 * j; inizio = DateTime.Now; FANUC_ref.F_RW_Byte(R, FANUC.MemType.D, memIndex, ref int8Mem); if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-FamUT", 8), DateTime.Now.Subtract(inizio).Ticks); @@ -1166,15 +1165,15 @@ namespace MTC_Adapter for (int j = 0; j < maxMemAddr; j++) { // controllo, se l'id utensile è quello dell'attuale UnOp... - if (tabUt_UT[j] == idUtMontato[i]) + if (tabUt[j] == idUtMontato[i]) { // leggo FamUt puntuale.. - memIndex = 13100 + 2 * j; + memIndex = 13100 + 4 * j; inizio = DateTime.Now; - FANUC_ref.F_RW_Byte(R, FANUC.MemType.D, memIndex, ref int16Mem); - if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-VitaRes", int16Mem.Length), DateTime.Now.Subtract(inizio).Ticks); + FANUC_ref.F_RW_Byte(R, FANUC.MemType.D, memIndex, ref int32Mem); + if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-VitaRes", int32Mem.Length), DateTime.Now.Subtract(inizio).Ticks); // leggo puntualmente valore della vita ut residua da indice utensile... - valVitaUtRes[i] = BitConverter.ToUInt16(int16Mem, 0); + valVitaUtRes[i] = BitConverter.ToInt32(int32Mem, 0); } } } @@ -1359,7 +1358,7 @@ namespace MTC_Adapter // calcolo distanza e salvo valore... distPerc = newPos - prevPosAxis[i]; - vettAxis[i].mAxDistDone.Value = Math.Abs(distPerc); + //vettAxis[i].mAxDistDone.Value = Math.Abs(distPerc); // sistemo direzione +/- (POS/NEG se lineari, CCW/CW se rotativi) if (distPerc != 0) diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index 68e30e8..e0b838d 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -1685,6 +1685,8 @@ namespace MTC_Adapter /// public virtual void getSlowChangingData() { + // dati da PC + mClock.Value = string.Format("{0:yyyy-MM-dd} {0:HH:mm:ss}", DateTime.Now); // da gestire su ogni adapter... } /// diff --git a/MTC_Sim/MTC_Sim/App.config b/MTC_Sim/MTC_Sim/App.config index 13b2f24..ed4bed2 100644 --- a/MTC_Sim/MTC_Sim/App.config +++ b/MTC_Sim/MTC_Sim/App.config @@ -30,7 +30,8 @@ - + +