michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for MURES_PT40, defines, component, version 1.5.125.

Browse Source
This commit is contained in:
Milan Hanajik 2015-09-26 20:59:04 +02:00
parent f2676993b1
commit 518d87afe1
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ResultsBrowser/Program.cs
View File

@ -44,7 +44,7 @@ namespace ResultsBrowser
public const int WMsCount = 6; public const int WMsCount = 6;
public const int LineSize = 6; public const int LineSize = 6;
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;
#elif TORUN_PT50_2015 || CEVAK_PT40_272 #elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
public const int WMsCount = 20; public const int WMsCount = 20;
public const int LineSize = 10; public const int LineSize = 10;
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;

2
TestBenchFramework/BenchControl/Elde/Common.cs
View File

@ -41,7 +41,7 @@ namespace TBF.BenchControl.Elde
ErrorPressMeter3 = 0x4000000000000, ErrorPressMeter3 = 0x4000000000000,
ErrorPressMeter4 = 0x8000000000000, ErrorPressMeter4 = 0x8000000000000,
} }
#else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 #else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
public enum StatusP : ulong public enum StatusP : ulong
{ {
RefFlowMeterMask = 0x7, RefFlowMeterMask = 0x7,

4
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -120,8 +120,8 @@ namespace TBF.BenchControl.Elde
// Array length is the reference flowmeters count plus one // Array length is the reference flowmeters count plus one
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL #if DN100 || FUZHOU150 || FUZHOU300 || PT200IL
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST #elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || MURES_PT40
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
#endif #endif
public uint[] DiverterEdge = new uint[2] { 50, 50 }; public uint[] DiverterEdge = new uint[2] { 50, 50 };

14
TestBenchFramework/BenchControl/TestBenchSim.cs
View File

@ -312,7 +312,7 @@ namespace TBF.BenchControl
const ulong Path2 = VI32; const ulong Path2 = VI32;
const ulong Path3 = VI33; const ulong Path3 = VI33;
const ulong Path4 = VI34; const ulong Path4 = VI34;
#elif CEVAK_PT40_272 #elif CEVAK_PT40_272 || MURES_PT40
const ulong VL11 = (1L << 0); const ulong VL11 = (1L << 0);
const ulong VL13 = (1L << 1); const ulong VL13 = (1L << 1);
const ulong VL18 = (1L << 2); const ulong VL18 = (1L << 2);
@ -447,7 +447,7 @@ namespace TBF.BenchControl
const ulong Path4 = 0; const ulong Path4 = 0;
const ulong Path5 = 0; const ulong Path5 = 0;
#endif #endif
/// <summary>Run this device</summary> /// <summary>Run this device</summary>
public static void RunDevice(int regulValveNo, int refFlowmtrNo, Elde.StatusP statusP) public static void RunDevice(int regulValveNo, int refFlowmtrNo, Elde.StatusP statusP)
{ {
TestBenchSim.regulValveNo = regulValveNo; TestBenchSim.regulValveNo = regulValveNo;
@ -496,11 +496,11 @@ namespace TBF.BenchControl
if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div2sim && (RouteSim & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); if (Div2sim && (RouteSim & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time);
if (Div2sim && (RouteSim & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); if (Div2sim && (RouteSim & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time);
#elif CEVAK_PT40_272 /// Path1,2,3 do WT1 #elif CEVAK_PT40_272 || MURES_PT40 /// Path1,2,3 do WT1
if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div1sim && (RouteSim & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); if (Div1sim && (RouteSim & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time);
#elif TORUN_PT50_2015 || IPERLST /// Path1,2,3,4,5 do WT1, Path6 do WT2 #elif TORUN_PT50_2015 || IPERLST /// Path1,2,3,4,5 do WT1, Path6 do WT2
if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div1sim && (RouteSim & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); if (Div1sim && (RouteSim & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time);
@ -512,7 +512,7 @@ namespace TBF.BenchControl
if (Div2sim && (RouteSim & Path2) == Path2) Mass2sim += DiffKg(Flow2sim, time); if (Div2sim && (RouteSim & Path2) == Path2) Mass2sim += DiffKg(Flow2sim, time);
#endif #endif
if ((RouteSim & EmptyValve1) == EmptyValve1) Mass1sim -= DiffKg(100.0f, time); if ((RouteSim & EmptyValve1) == EmptyValve1) Mass1sim -= DiffKg(100.0f, time);
if (Mass1sim < 0) Mass1sim = 0; if (Mass1sim < 0) Mass1sim = 0;
if ((RouteSim & EmptyValve2) == EmptyValve2) Mass2sim -= DiffKg(10.0f, time); if ((RouteSim & EmptyValve2) == EmptyValve2) Mass2sim -= DiffKg(10.0f, time);
@ -617,7 +617,7 @@ namespace TBF.BenchControl
if (toTank) { throw (new Exception()); } if (toTank) { throw (new Exception()); }
break; break;
} }
#elif CEVAK_PT40_272 #elif CEVAK_PT40_272 || MURES_PT40
switch (regulValveNo) switch (regulValveNo)
{ {
case 1: case 1:
@ -658,7 +658,7 @@ namespace TBF.BenchControl
break; break;
} }
#endif #endif
return; return;
} }

4
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -591,7 +591,7 @@ namespace TBF
#elif TORINO50 || BADGER_MALA_TRAT #elif TORINO50 || BADGER_MALA_TRAT
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#elif TORUN_PT50_2015 || CEVAK_PT40_272 #elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl;
#elif IPERLST #elif IPERLST
@ -599,7 +599,7 @@ namespace TBF
private TBF.Screens.ProcessTabPageCtrl48 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl48 processTabPageCtrl;
#endif #endif
private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem; private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem homeTSMenuItem; private System.Windows.Forms.ToolStripMenuItem homeTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem measurementTSMenuItem; private System.Windows.Forms.ToolStripMenuItem measurementTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem resultsTSMenuItem; private System.Windows.Forms.ToolStripMenuItem resultsTSMenuItem;

4
TestBenchFramework/Program.cs
View File

@ -48,7 +48,7 @@ namespace TBF
public const int WMsCount = 6; public const int WMsCount = 6;
public const int LineSize = 6; public const int LineSize = 6;
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;
#elif TORUN_PT50_2015 || CEVAK_PT40_272 #elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
public const int WMsCount = 20; public const int WMsCount = 20;
public const int LineSize = 10; public const int LineSize = 10;
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;
@ -58,7 +58,7 @@ namespace TBF
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;
#endif #endif
/// <summary> /// <summary>
/// Selected procedure data /// Selected procedure data
/// - before the main program window is open, objects referenced by this variable /// - before the main program window is open, objects referenced by this variable
/// are loaded from the database. /// are loaded from the database.

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("1.5.124.1")] [assembly: AssemblyVersion("1.5.125.1")]
[assembly: AssemblyFileVersion("1.5.124.1")] [assembly: AssemblyFileVersion("1.5.125.1")]

BIN
packages/ControlBoard/MURES-PT40/ControlComponent3U.dll Normal file
View File

Binary file not shown.