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

Support for GENESIS added, ver. 2.10.349

Browse Source
This commit is contained in:
Milan Hanajik 2016-09-22 08:37:05 +02:00
parent 5f7c0c82e7
commit 6bb45ccc25
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/Data.cs
View File

@ -16,7 +16,7 @@ namespace Config
public const int WMsCount = 3;
public const int LineSize = 3;
public const int CompoundWMsCount = 1;
#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200
#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 3;

4
Config/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.10.340.0")]
[assembly: AssemblyFileVersion("2.10.340.0")]
[assembly: AssemblyVersion("2.10.349.0")]
[assembly: AssemblyFileVersion("2.10.349.0")]

4
Results/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.10.340.0")]
[assembly: AssemblyFileVersion("2.10.340.0")]
[assembly: AssemblyVersion("2.10.349.0")]
[assembly: AssemblyFileVersion("2.10.349.0")]

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

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
@ -16,7 +16,7 @@ namespace TBF.BenchControl.Elde
ResetShapesOfPulses = 8,
}
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,
@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde
ErrorPressMeter4 = 0x8000000000000,
}
#else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40
public enum StatusP : ulong
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,
TestInProgress = 0x8,

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

@ -120,10 +120,10 @@ namespace TBF.BenchControl.Elde
public float[,] TempCalibData = new float[8, 5];
// Array length is the reference flowmeters count plus one
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS
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 || IPERLST_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
#elif BADGER_VELKA_TRAT
public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
#endif
@ -244,7 +244,7 @@ namespace TBF.BenchControl.Elde
ControlComponent3Munich.UserControl1 ctrlBrdComponent,
#elif FUZHOU300
ControlComponent3F300.UserControl1 ctrlBrdComponent,
#elif PT200IL || PUCHONG_PT200
#elif PT200IL || PUCHONG_PT200 || GENESIS
ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
#else /// all newer benches
ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,

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

@ -83,7 +83,7 @@ namespace TBF.BenchControl.Elde
private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
#elif FUZHOU300
private ControlComponent3F300.UserControl1 ctrlBrdComponent;
#elif PT200IL || PUCHONG_PT200
#elif PT200IL || PUCHONG_PT200 || GENESIS
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
#else /// newer benches
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
@ -101,7 +101,7 @@ namespace TBF.BenchControl.Elde
public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
#elif FUZHOU300
public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent)
#elif PT200IL || PUCHONG_PT200
#elif PT200IL || PUCHONG_PT200 || GENESIS
public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#else /// all newer benches
public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)

2
TestBenchFramework/BenchControl/StateMachine.cs
View File

@ -196,7 +196,7 @@ namespace TBF.BenchControl
public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
#elif FUZHOU300
public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent)
#elif PT200IL || PUCHONG_PT200
#elif PT200IL || PUCHONG_PT200 || GENESIS
public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#else /// all newer benches
public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)

8
TestBenchFramework/BenchControl/TestBenchSim.cs
View File

@ -218,7 +218,7 @@ namespace TBF.BenchControl
const ulong Path3 = VL12 | VI31 | VI32;
const ulong Path4 = VL12 | VI41 | VI42;
const ulong Path5 = VL12 | VI41 | VI43;
#elif PT200IL || PUCHONG_PT200
#elif PT200IL || PUCHONG_PT200 || GENESIS
const ulong VM11 = (1L << 4);
const ulong VM12 = (1L << 5);
const ulong VM21 = (1L << 6);
@ -491,7 +491,7 @@ namespace TBF.BenchControl
const ulong Path4 = 0;
const ulong Path5 = 0;
#endif
/// <summary>Run this device</summary>
/// <summary>Run this device</summary>
public static void RunDevice(int regulValveNo, int refFlowmtrNo, Elde.StatusP statusP)
{
TestBenchSim.regulValveNo = regulValveNo;
@ -504,7 +504,7 @@ namespace TBF.BenchControl
if (Div2sim && (SimRoute & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time);
if (Div2sim && (SimRoute & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time);
if (Div1sim && (SimRoute & Path5) == Path5) Mass1sim += DiffKg(Flow5sim, time);
#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200
#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS
if (Div1sim && (SimRoute & Path1) == Path1)
{
float diff = DiffKg(Flow1sim, time);
@ -635,7 +635,7 @@ namespace TBF.BenchControl
if (toTank) { throw (new Exception()); }
break;
}
#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200
#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS
switch (regulValveNo)
{
case 1:

4
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -649,7 +649,7 @@ namespace TBF
#elif FUZHOU300
private ControlComponent3F300.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#elif PT200IL || PUCHONG_PT200
#elif PT200IL || PUCHONG_PT200 || GENESIS
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT
@ -666,7 +666,7 @@ namespace TBF
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#endif
private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem homeTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem resultsTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem logsTSMenuItem;

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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

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

Binary file not shown.