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

Changes in 'master' for Malta-WSD25, ver. 2.10.353

Browse Source
This commit is contained in:
Milan Hanajik 2016-10-06 11:52:43 +02:00
parent c497c02ef9
commit dff3a1aff7
10 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Config/Data.cs
View File

@ -53,8 +53,13 @@ namespace Config
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
#elif MALTA_WSD25
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 0;
public const int HeatMetersCount = 0;
#endif
public static int MaxPartNr()
public static int MaxPartNr()
{
return Math.Max(WMsCount / LineSize, CompoundWMsCount);
}

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.352.0")]
[assembly: AssemblyFileVersion("2.10.352.0")]
[assembly: AssemblyVersion("2.10.353.0")]
[assembly: AssemblyFileVersion("2.10.353.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.352.0")]
[assembly: AssemblyFileVersion("2.10.352.0")]
[assembly: AssemblyVersion("2.10.353.0")]
[assembly: AssemblyFileVersion("2.10.353.0")]

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

@ -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 || GENESIS
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25
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,

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

@ -124,6 +124,8 @@ namespace TBF.BenchControl.Elde
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 };
#elif MALTA_WSD25
public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
#elif BADGER_VELKA_TRAT
public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
#endif

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

@ -57,7 +57,7 @@ namespace TBF.BenchControl.Elde
public ulong DigitalInputs { get { return (ulong)ctrlBrdComponent.Vstupy; } }
public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; }
public uint AnalogInputRaw(int adcNr0, int bank) { return ctrlBrdComponent.AnalogyRaw[adcNr0, bank]; } /// bank0=RV, bank1=Temp
#if IPERLST || IPERLST_SPECIAL || SLM_50
#if IPERLST || IPERLST_SPECIAL || SLM_50 || MALTA_WSD25
public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume[0]; } }
public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume[1]; } }
#else
@ -290,7 +290,7 @@ namespace TBF.BenchControl.Elde
#if DN100 || MUNICH
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods,
filterConstant, fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs);
#elif IPERLST || IPERLST_SPECIAL || SLM_50
#elif IPERLST || IPERLST_SPECIAL || SLM_50 || MALTA_WSD25
uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods,
filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);

8
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 || FUZHOU_40 || SLM_50
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25
const ulong VL11 = (1L << 0);
const ulong VL13 = (1L << 1);
const ulong VL18 = (1L << 2);
@ -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;
@ -540,7 +540,7 @@ namespace TBF.BenchControl
if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div2sim && (SimRoute & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time);
if (Div2sim && (SimRoute & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time);
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 /// Path1,2,3 do WT1
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25 /// Path1,2,3 do WT1
if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time);
@ -682,7 +682,7 @@ namespace TBF.BenchControl
if (toTank) { throw (new Exception()); }
break;
}
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25
switch (regulValveNo)
{
case 1:

4
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -655,7 +655,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 || FUZHOU_40 || SLM_50
#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl;
#elif IPERLST
@ -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.352.1")]
[assembly: AssemblyFileVersion("2.10.352.1")]
[assembly: AssemblyVersion("2.10.353.1")]
[assembly: AssemblyFileVersion("2.10.353.1")]

BIN
packages/ControlBoard/Malta-WSD25/ControlComponent3U.dll Normal file
View File

Binary file not shown.