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

Initial version for Fuzhou PT40, component, defines, etc.

Browse Source
This commit is contained in:
Milan Hanajik 2015-12-02 13:25:40 +01:00
parent aefbcdb2a0
commit d488f62648
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ResultsBrowser/Program.cs
View File

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

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

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

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

@ -121,7 +121,7 @@ namespace TBF.BenchControl.Elde
// Array length is the reference flowmeters count plus one
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL
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 || MURES_PT40 || BADGER_VELKA_TRAT
#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || MURES_PT40 || FUZHOU_40
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
#endif

6
TestBenchFramework/BenchControl/TestBenchSim.cs
View File

@ -313,7 +313,7 @@ namespace TBF.BenchControl
const ulong Path3 = VI33;
const ulong Path4 = VI34;
const ulong Path5 = 0;
#elif CEVAK_PT40_272 || MURES_PT40
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40
const ulong VL11 = (1L << 0);
const ulong VL13 = (1L << 1);
const ulong VL18 = (1L << 2);
@ -497,7 +497,7 @@ namespace TBF.BenchControl
if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div2sim && (RouteSim & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time);
if (Div2sim && (RouteSim & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time);
#elif CEVAK_PT40_272 || MURES_PT40 /// Path1,2,3 do WT1
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 /// Path1,2,3 do WT1
if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div1sim && (RouteSim & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time);
@ -618,7 +618,7 @@ namespace TBF.BenchControl
if (toTank) { throw (new Exception()); }
break;
}
#elif CEVAK_PT40_272 || MURES_PT40
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40
switch (regulValveNo)
{
case 1:

2
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -565,7 +565,7 @@ namespace TBF
#elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl;
#elif IPERLST

2
TestBenchFramework/Program.cs
View File

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

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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

BIN
packages/ControlBoard/Fuzhou_40/ControlComponent3U.dll Normal file
View File

Binary file not shown.