Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completata prima review x arrivare al probe...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-04-28 18:37:22 +02:00
parent d0c5d5cee7
commit 508d7337f0
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Sim/.vs/MTC_Sim/v14/.suo
BIN
View File
Binary file not shown.
MTC_Sim/MTC_Sim/AdapterGeneric.cs
+11 -11
View File
@@ -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);