From c3a2a47a67657cb19924120d49e14460d12b93f8 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 9 May 2016 17:21:04 +0200 Subject: [PATCH] pulizia varia... --- MTC_Sim/.vs/MTC_Sim/v14/.suo | Bin 165376 -> 165376 bytes MTC_Sim/MTC_Sim/AdapterDemo.cs | 5 ++++ MTC_Sim/MTC_Sim/AdapterFanuc.cs | 38 +++++++++++++++++++++++------- MTC_Sim/MTC_Sim/AdapterGeneric.cs | 37 ++++------------------------- 4 files changed, 38 insertions(+), 42 deletions(-) diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo index 7ade063389bab0864fdecc9844999e4dafa2f5b3..4f0e86b4262d9129d1856c202a51a35b6e1b72fe 100644 GIT binary patch delta 447 zcmZqZ;cDpNnqZ*H00ROH3_3tI3lRVN|NlQom=TEOfmmR2p`-K0f(*t zqwOF6G8QpTztGRfK7D-&b3zS)di>;?ydfhKcIUq69y5!^6??R?#g%8Y^;AV-6N#DR1mTWR|F*-&NM zfo_Oq6zpY&sn9#H706cI9^S_|QE>Xkenzon3m7A~p2OWf9q8aI)7O?VUY`zh(LA_i mV3+4IL!1d#w4HkH+Y5Ie$AMcwHV4Fg%zPU+Lfk0Dlmh@|caRDI delta 437 zcmZqZ;cDpNnqZ*H!~g{X3=CdCCJPY%`~UwxNR%0f4T0EXa-pO1#)1sSNlZCx0a7lT z{;k|x#Po}q%^=63=s%Fn#%99!VsoX{e^(II(EgeGg(3rkFimK znBG;!cy9W=AB@+xNBm~YW#+%c=wf96gw>|zE(S)%%c>Z;raN{p9^HPlg>fmf3I?SE%Ybab?T&0rEKGuR zAkTn--hp)>_V&m=#)*Q{H}*41EL*@BL7a=XKP+J^Vw@hp&1AlPRx9H^MzY-44|NHU PIv@)q%!qNL6jKfWDFc0> diff --git a/MTC_Sim/MTC_Sim/AdapterDemo.cs b/MTC_Sim/MTC_Sim/AdapterDemo.cs index 141350c..b15bf02 100644 --- a/MTC_Sim/MTC_Sim/AdapterDemo.cs +++ b/MTC_Sim/MTC_Sim/AdapterDemo.cs @@ -77,6 +77,11 @@ namespace MTC_Sim } } + public override void getConfigParam() + { + base.getConfigParam(); + } + protected void addSystemAlarm(int numAllarme) { diff --git a/MTC_Sim/MTC_Sim/AdapterFanuc.cs b/MTC_Sim/MTC_Sim/AdapterFanuc.cs index fce99d3..8d96de5 100644 --- a/MTC_Sim/MTC_Sim/AdapterFanuc.cs +++ b/MTC_Sim/MTC_Sim/AdapterFanuc.cs @@ -11,9 +11,11 @@ namespace MTC_Sim { protected FANUC FANUC_ref; +#if false protected StatusBitMap CurrStatus; protected StFlag8 Status8; - protected StFlag32 Status32; + protected StFlag32 Status32; +#endif /// /// estende l'init della classe base... @@ -42,7 +44,9 @@ namespace MTC_Sim // hard coded: leggo le 16 word standard dello strobe... R10516--> R10532 FANUC_ref.F_RW_Byte(R, FANUC.MemType.R, 10516, ref Strobes); } - + /// + /// leggo i byte di ACK... + /// public override void getAckStatus() { base.getAckStatus(); @@ -351,18 +355,28 @@ namespace MTC_Sim #endif } + public override void getConfigParam() + { + base.getConfigParam(); + } + public override void getCurrProgramData() { // serve?!? base.getCurrProgramData(); } + public override void getUnOp() + { + base.getUnOp(); + } + public override void getPath() { base.getPath(); + - // ciclo sui PATH!!! FARE!!!! - +#if false // byte x lettura memoria... 8byte --> 64 bit! byte[] status = new byte[8]; // variabili che utilizzerò... @@ -374,7 +388,8 @@ namespace MTC_Sim if (!FANUC_ref.Connected) return; // hard coded: leggo 8 word (byte) dalla memoria 3450--> 3457 - FANUC_ref.F_RW_Byte(R, FANUC.MemType.D, 3450, ref status); + FANUC_ref.F_RW_Byte(R, FANUC.MemType.D, 3450, ref status); +#endif #if false // imposto RUN mode @@ -394,11 +409,10 @@ namespace MTC_Sim vettPath[PtData.PathSel].mPathPosActK.Value = PtData.PathPosAct.k; #endif +#if false // HARD CODE: forzo path 1 (indice 0...) int idxPath = 0; - - - + // IPOTESI DA VERIFICARE!!! // leggo primo byte, i cui bit indicano run mode (3450.0 --> 3450.7) RunStatus = (StFlag8)status[0]; @@ -462,7 +476,8 @@ namespace MTC_Sim break; default: break; - } + } +#endif #if false // check bit 0... SE è presente @@ -476,5 +491,10 @@ namespace MTC_Sim #endif } + public override void getAxis() + { + base.getAxis(); + } + } } diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index af9f649..50bdfb7 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -923,6 +923,7 @@ namespace MTC_Sim // parte che eseguo SEMPRE: RECUPERO stato di tutti gli strobe/status e degli ack attualmente noti getStrobeStatus(); + // !!!FARE!!! verifica, forse inutile rileggere ACK... getAckStatus(); // acquisizione degli status @@ -947,8 +948,6 @@ namespace MTC_Sim { // leggo parametri da config file getConfigParam(); - // bassa freq leggo altri valori... - getProduzione(); ///acquisisco dati su programma in esecuzione e dati generali (stato, orologio, power...) getCurrProgramData(); } @@ -983,12 +982,7 @@ namespace MTC_Sim { } - - private void getProduzione() - { - // SE presente recupero dati produzione - checkProd(); - } + /// /// verifica gli status attivi @@ -1015,7 +1009,7 @@ namespace MTC_Sim /// /// metodo di recupero dei dati di identificativo macchina - DA CONF!!! /// - public void getConfigParam() + public virtual void getConfigParam() { } @@ -1133,30 +1127,7 @@ namespace MTC_Sim return answ; } } - - public void checkProd() - { - // non usiamo strobe x produzione...b -#if false - if (utils.IsSetAny(STROBE_PLC, Strobe.PZ_OK | Strobe.PZ_KO)) - { - // leggo i valori pezzi OK / KO e li salvo (insieme a tot...) - mPz_Ok.Value = getNumPzOk; - mPz_Ko.Value = getNumPzKo; - mPz_Tot.Value = getNumPzOk + getNumPzKo; - // alzo flag lettura... - if (utils.IsSetAll(STROBE_PLC, Strobe.PZ_OK)) STROBE_ADP = STROBE_ADP | Strobe.PZ_OK; - if (utils.IsSetAll(STROBE_PLC, Strobe.PZ_KO)) STROBE_ADP = STROBE_ADP | Strobe.PZ_KO; - - } - else - { - // resetto eventuali flag di lettura... - if (utils.IsSetAll(STROBE_ADP, Strobe.PZ_OK)) STROBE_ADP -= Strobe.PZ_OK; - if (utils.IsSetAll(STROBE_ADP, Strobe.PZ_KO)) STROBE_ADP -= Strobe.PZ_KO; - } -#endif - } + /// /// recupera pezzi OK (fare override!) ///