From 4b5f609407e7f86f4a8964c7ff17a5edc4f69d9d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 28 Apr 2016 09:04:11 +0200 Subject: [PATCH] Agganciati allarmi!!! --- MTC_Sim/.vs/MTC_Sim/v14/.suo | Bin 128512 -> 131072 bytes MTC_Sim/MTC_Sim/AdapterDemo.cs | 62 +++++++++++++++++++++++------- MTC_Sim/MTC_Sim/AdapterGeneric.cs | 7 +++- MTC_Sim/MTC_Sim/CMS_MachineSim.cs | 6 ++- MTC_Sim/MTC_Sim/utils.cs | 8 ---- 5 files changed, 57 insertions(+), 26 deletions(-) diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo index 6d68a4170e1100bcdd13ce614af1f0d34fb3971f..a82688d98625b80294cef35ed9df6b5c5cd9703c 100644 GIT binary patch delta 1998 zcma)6dr(wW7(c&V_Thp&1r|h+L|PPiTbib8ppN-sSy58bA;3fd+2_!+4APlJc`*ra&E zdM26E$dM_X!7FUau+62%RbHFafFAClb)!-{TW^Fxsn56=J~xNr9E4ngldzVMM_5N# zPsk_8zQ#~6sw*|iT_$|RJ-{pYEH(mvpI0O-WtF^P++!Mz8UyaFp zWFfPZ$Cn}X4PTEX#O2-vbc!9Us5KrhhE=oKffOJiN#=@X8&ZWU9`#~gB9^&l0IKU{ zEY^#(8CcZ18d|&E2DEEyXmKS1;;;>~#JyDr=c~_HMAvHE7g`S1iQ7(CTk~M_pTnM~ z>7>#PW{5=&tQQsQ5O0t#`CIDe4!}=@b|76mJcFrfPCm{}v>2io3nRaosRLVa61Xnn z_QI)Zc{l>$Xhed%T_!?~AVJ(cfCv$?1MiJQ9TQFO!z6B$QOWh&(T8g?_n0_-7(qfU zhfSO<#c5&Njui1zIc|xey`=7}q@0c0U{hOmAVC+hQP%fSjJB0{r|92}x$Y_$$2Ip@ z>J$5q8MHpk^YtPIwxC;B%E|E*O^CiWSWGjuc-e>C|KvYMQ{65kA|&e3RmW%xNKQ~G z%ug3_Nd6vuWYaE?Og~MQeRE_G)Qw&JZV!_5qIW-1)Rg_`)r+ADY`VlT5Ac}zR{}J zKSUrR3Z>6SR;`7&m5|*%a{4BksW^TVMWXO1=8U`*%MRn?|EMacYO=6bVy0+r!vyhM z8~rs?R>q3>1LzZuV)Q@Vj_wr9xx$D6HcVniZ-m`_3Zai}ZFX)COq@oGIM|6Mwe38LLpyI{SAYl(N3_~<17$cAJ;`9CiJN#@ zbfl6R{SCyyYQ)KJB~U%v2nWPq7kv*wU8r>5g08xU}?l-d?pfYqPVoyuinkPknZ0R_~JVNYt~+ PtJ)MXuphC$w+w#+fM-va delta 1038 zcmb_aZAepL6y9@pH}96|=4WD=mWhhhY#>pV{aDd=E(aw=KTINsEfoWe$e~11Np3Ir zk~)#J`zJx%4X+=6Ca!;ipAkg)5&klRge&wX*L&wQs6c`a9M1Ee_j%8G&f#^t1^04P zvn7MmM9ieoY-do*d@U3TsaX}9`|PQlVWOwb>g$|@Rl28t3NODSC7RtaS|~9R2O@Dz z%IA-A`U%6*abKrYrB4&2W@82XCPfQ}v>HF2AO%f@@aI-@q&lIP1oJFJNw`EtxqMQc zSS$tiztKUEYOSM*q;OZze^$|VDSLoPvTBzwPVAYfhPRPk!z3dkK6;RyhL{JLljX~q zx;_RL88MmUl?Y~a7}dV8tQx1t$&#A}HM`6*U&+G0-JS}IH;b3}1K+e=$`ughkXt9Q zOI5~W&VRjzlWLAMYW-!WIqCGN0r+n%&B;r9k;IAF;QP;G1oB8Jij3k_#2AGXjV4}w zt)UAIc#knU?}U#IH^M@l$FBO|{6T1rP9! z&N(p~?jd{bB8xL0V_hQ_xWT|R`l$g0GO7^L(UE#M{%_@%zloB&>X8F8hYb6uhV?3h^5^WrF5kh zW#N^|-Y0NrsmTRbOC|KbR allarme) + { + mAlarmGeneral.Add(Condition.Level.FAULT, string.Format("ERR_{0:###}: Errore {1}", allarme.Key, allarme.Value), string.Format("ERR_{0:###}_{1}", allarme.Key, allarme.Value)); + } + public override void getAlarms() { base.getAlarms(); - if (parentForm.datiProd.err_01) - mAlarmSystem.Add(Condition.Level.FAULT, "ERR_01: Yur Flaz Bat is flapping", "FLAZBAT"); - if (parentForm.datiProd.err_02) - mAlarmSystem.Add(Condition.Level.WARNING, "ERR_02: Something went wrong", "AKAK"); - if (parentForm.datiProd.err_03) - mAlarmSystem.Add(Condition.Level.FAULT, "ERR_03: No program loaded", "PROG"); - - if (parentForm.datiProd.err_04) - mTemp.Add(Condition.Level.WARNING, "ERR_04: Temperature is too high", "OT"); - if (parentForm.datiProd.err_05) - mAlarmCNC.Add(Condition.Level.FAULT, "ERR_05: Axis overload", "OL"); - if (parentForm.datiProd.err_06) - mAlarmPLC.Add(Condition.Level.FAULT, "ERR_06: Travel outside boundaries", "OP"); + if (parentForm.systemAlarm.Count > 0) + { + foreach (Int32 alarm in parentForm.systemAlarm) + { + addSystemAlarm(alarm); + } + } + if (parentForm.plcAlarm.Count > 0) + { + foreach (Int32 alarm in parentForm.plcAlarm) + { + addPlcAlarm(alarm); + } + } + if (parentForm.cncAlarm.Count > 0) + { + foreach (Int32 alarm in parentForm.cncAlarm) + { + addCncAlarm(alarm); + } + } + if (parentForm.genericAlarm.Count > 0) + { + foreach (DataRefItem alarm in parentForm.genericAlarm) + { + addGenericAlarm(alarm); + } + } } public override void getPath() diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index cf315bc..b31d25f 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -566,10 +566,11 @@ namespace MTC_Sim #region Conditions // vettori vari: allarmi sistema, PLC, CNC ed allarmi HMI - public Condition mAlarmSystem = new Condition("system"); + public Condition mAlarmSystem = new Condition("System"); public Condition mAlarmCNC = new Condition("CNC"); public Condition mAlarmPLC = new Condition("PLC"); public Condition mAlarmHMI = new Condition("HMI"); + public Condition mAlarmGeneral = new Condition("General"); #endregion @@ -756,6 +757,7 @@ namespace MTC_Sim mAdapter.AddDataItem(mAlarmCNC); mAdapter.AddDataItem(mAlarmPLC); mAdapter.AddDataItem(mAlarmHMI); + mAdapter.AddDataItem(mAlarmGeneral); } @@ -775,7 +777,8 @@ namespace MTC_Sim mAlarmSystem.Normal(); mAlarmCNC.Normal(); mAlarmPLC.Normal(); - mAlarmHMI.Normal(); + mAlarmCNC.Normal(); + mAlarmGeneral.Normal(); } /// diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.cs b/MTC_Sim/MTC_Sim/CMS_MachineSim.cs index 1f66c20..fdafd4b 100644 --- a/MTC_Sim/MTC_Sim/CMS_MachineSim.cs +++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.cs @@ -595,13 +595,15 @@ namespace MTC_Sim answ.pzTot = pzOk + pzKo; +#if false // allarmi... answ.err_01 = SysErr_01.Checked; answ.err_02 = SysErr_02.Checked; answ.err_03 = SysErr_03.Checked; answ.err_04 = PlcErr_01.Checked; answ.err_05 = PlcErr_02.Checked; - answ.err_06 = PlcErr_03.Checked; + answ.err_06 = PlcErr_03.Checked; +#endif // ritorno oggetto! @@ -943,7 +945,7 @@ namespace MTC_Sim } } - public List> otherAlarm + public List> genericAlarm { get { diff --git a/MTC_Sim/MTC_Sim/utils.cs b/MTC_Sim/MTC_Sim/utils.cs index cfc3eca..816e2c5 100644 --- a/MTC_Sim/MTC_Sim/utils.cs +++ b/MTC_Sim/MTC_Sim/utils.cs @@ -147,14 +147,6 @@ namespace MTC_Sim public int pzTot; public int pzOk; public int pzKo; - - - public bool err_01; - public bool err_02; - public bool err_03; - public bool err_04; - public bool err_05; - public bool err_06; } public struct PathData