From 508d7337f0bfcb8b98da0da21841ddd2f22bd335 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 28 Apr 2016 18:37:22 +0200 Subject: [PATCH] Completata prima review x arrivare al probe... --- MTC_Sim/.vs/MTC_Sim/v14/.suo | Bin 136192 -> 136192 bytes MTC_Sim/MTC_Sim/AdapterGeneric.cs | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo index 5e16a13346033f57812e0aa67737dce2bd50440a..f2bd76c2fc8f9df413957fcd43244e1fc5b44d5b 100644 GIT binary patch delta 697 zcmZ9JO-Phc6o$X|dS@KRNyo%tQZZ2+O#(;Ti1ee;kBj`lMa0xXXFzB&XY2Q}j$B3=V z>(Tx_r>5mooItF_VzIakB3=N2n4){+!ny1E=3oI#~|mc0TVi~T$wlj1lp z#2(SjOVV~zlb0wZ%7|U!n=M}~afhXfvLVxAS**r_SgDb=`y|BYiJn?-l1T~0v29|8 zZ*@JPER%>5Pl+jlL9jZ%WtPIV?xsS~RhNrZaxdY(NHQ1doDS?YSB_pvv^*mr&paQv z=GHHi>pff_XJWb6Bf_Ir;rzW_^o3sw=h^|Y^>&1bhL1r}d5W8@k0Q|f-1_@sJ<1FY zuFo;C`NvKfcEBp5iEye0JI1o~56mb6AD{Q-C|@;J5|w( z=>&!T^+noHAfqR!?R1zf@Uz({lf@wg-#kbF@^%G%$-7y^iCp2)@Q<{zD&TCZrmcf cj+gK#&opLJ<@3*ISM77SoMF6x)mTOLAA7IlfdBvi delta 621 zcmY+AUr19?9LM*)yK{3*oCC+wRf}dC4YCzNVx>?KL0k9`u^xg2qlRpkK|wFegi-hq z(-S+eYOtFfN7DLpAFfcTg+&iStp|x1X6aMC6ilLrT)#^_)PWD@d(QcOzvpmbnuCf4iqy0L5MX2PXy-9CkJX{gaxI5!b5R&Y?eAiV)Jc39qqr|i7k zi34m*-qo_7?A^p}B1rVHioB&|GpPV!6!+6S!O*@_3s_zs#Rs-_oXf@m%i2Ax6!JFi zAP24MPmHX)jaJWy8Df@@U@|>7F)19i7^zkE-PXynVIO{y+M}(8oem6WYo{+;Epue= z&@P?5>QU1@>Y}9PWH$IQ&iYfbmUw>ytd{pP<$eQm{tB>L%3J1KKcXdWj!SofKP0u_ zRu= z2`3~zpdiRYNp$ga6nFLdDZngT6f7nY;wQ#n(@#cm54_Tfm>%;W4}K+sUcEPlR}gJf zf!lC%3R?9|ajY~6FYLxe;u<6oAx6pbU)vNWaUFI(lEJ<|JzUBB+hG<3%2e{`;b#Or zBRPZyeKdiK5GoZaux*%|r{8-(9D2te36%7QWu&aUxDhY)FFCj&a^#$biw8f!ulpBJ XZ5H#?`eFrXJzd2}tN2Ea8hpP2T#(kB diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index 57c5d77..e96d8eb 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -535,7 +535,7 @@ namespace MTC_Sim 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 mAlarmHMI = new Condition("HMI"); public Condition mAlarmGeneral = new Condition("General"); #endregion @@ -607,7 +607,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nVacuumPump; i++) { vettVacPump[i] = new VacuumPomp(adpConf.VacuumPump[i]); - mAdapter.AddDataItem(vettVacPump[i].mVacPumpAlias); + //mAdapter.AddDataItem(vettVacPump[i].mVacPumpAlias); mAdapter.AddDataItem(vettVacPump[i].mVacPumpStatus); } // Attuatori vuoto @@ -615,7 +615,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nVacuumAct; i++) { vettVacAct[i] = new VacuumAct(adpConf.VacuumAct[i]); - mAdapter.AddDataItem(vettVacAct[i].mVacActAlias); + //mAdapter.AddDataItem(vettVacAct[i].mVacActAlias); mAdapter.AddDataItem(vettVacAct[i].mVacActCount); } // Lubrorefrigeranti @@ -623,7 +623,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nLubro; i++) { vettLubro[i] = new Lubro(adpConf.Lubro[i]); - mAdapter.AddDataItem(vettLubro[i].mLubroAlias); + //mAdapter.AddDataItem(vettLubro[i].mLubroAlias); mAdapter.AddDataItem(vettLubro[i].mLubroNum); } // Cooler @@ -631,7 +631,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nCooler; i++) { vettCooler[i] = new Cooler(adpConf.Cooler[i]); - mAdapter.AddDataItem(vettCooler[i].mCoolAlias); + //mAdapter.AddDataItem(vettCooler[i].mCoolAlias); mAdapter.AddDataItem(vettCooler[i].mCoolStatus); } // Press @@ -639,7 +639,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nPress; i++) { vettPress[i] = new Press(adpConf.Press[i]); - mAdapter.AddDataItem(vettPress[i].mPressAlias); + //mAdapter.AddDataItem(vettPress[i].mPressAlias); mAdapter.AddDataItem(vettPress[i].mPressValIst); } // Temp @@ -647,7 +647,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nTemp; i++) { vettTempe[i] = new Tempe(adpConf.Temp[i]); - mAdapter.AddDataItem(vettTempe[i].mTempAlias); + //mAdapter.AddDataItem(vettTempe[i].mTempAlias); mAdapter.AddDataItem(vettTempe[i].mTempValIst); } // Path @@ -655,7 +655,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nPath; i++) { vettPath[i] = new Path(adpConf.Path[i]); - mAdapter.AddDataItem(vettPath[i].mPathAlias); + //mAdapter.AddDataItem(vettPath[i].mPathAlias); mAdapter.AddDataItem(vettPath[i].mPathFeed); mAdapter.AddDataItem(vettPath[i].mPathFeedOver); mAdapter.AddDataItem(vettPath[i].mPathSpeedOver); @@ -671,7 +671,7 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nUnOp; i++) { vettUnOp[i] = new UnOp(adpConf.UnOp[i]); - mAdapter.AddDataItem(vettUnOp[i].mUnOpAlias); + //mAdapter.AddDataItem(vettUnOp[i].mUnOpAlias); mAdapter.AddDataItem(vettUnOp[i].mUnOpToolId); mAdapter.AddDataItem(vettUnOp[i].mUnOpNumCU); mAdapter.AddDataItem(vettUnOp[i].mUnOpStatus); @@ -685,11 +685,11 @@ namespace MTC_Sim for (int i = 0; i < adpConf.nAxis; i++) { vettAxis[i] = new Axis(adpConf.Axis[i]); - mAdapter.AddDataItem(vettAxis[i].mAxAlias); + //mAdapter.AddDataItem(vettAxis[i].mAxAlias); mAdapter.AddDataItem(vettAxis[i].mAxMainProc); mAdapter.AddDataItem(vettAxis[i].mAxIsMaster); mAdapter.AddDataItem(vettAxis[i].mAxMastId); - mAdapter.AddDataItem(vettAxis[i].mAxType); + //mAdapter.AddDataItem(vettAxis[i].mAxType); mAdapter.AddDataItem(vettAxis[i].mAxDir); mAdapter.AddDataItem(vettAxis[i].mAxLoad); mAdapter.AddDataItem(vettAxis[i].mAxPosAct);