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

Zmeny do mastera pre SLM-50

Browse Source
This commit is contained in:
Milan Hanajik 2016-06-22 16:54:16 +02:00
parent 264e5d9cd0
commit 550be3f8a3
9 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/Data.cs
View File

@ -36,7 +36,7 @@ namespace Config
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
#elif SLM_PT50
#elif SLM_50
public const int WMsCount = 12;
public const int LineSize = 12;
public const int CompoundWMsCount = 1;

10
Config/Entities/Enums.cs
View File

@ -162,15 +162,23 @@ namespace Config.Entities
public enum Publish : sbyte
{
#if MUNICH
/// nemecky
[Description("nie")] Never = 0,
[Description("immer")] Always = 1,
[Description("Bildschirm")] OnScreen = 2,
[Description("intern")] Internal = 3,
#elif CEVAK || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || IPERLST || IPERLST_SPECIAL
#elif CEVAK || BADGER_MALA_TRAT || BADGER_VELKA_TRAT
/// cesky
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interně")] Internal = 3,
#elif IPERLST || IPERLST_SPECIAL || SLM_50
/// slovensky
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interne")] Internal = 3,
#else
[Description("Never")] Never = 0,
[Description("Always")] Always = 1,

2
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
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,

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

@ -122,7 +122,7 @@ namespace TBF.BenchControl.Elde
// Array length is the reference flowmeters count plus one
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200
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
#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 BADGER_VELKA_TRAT
public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };

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
#if IPERLST || IPERLST_SPECIAL || SLM_50
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
#elif IPERLST || IPERLST_SPECIAL || SLM_50
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);

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

@ -97,7 +97,7 @@ namespace TBF.BenchControl.Elde
public void Start()
{
controlBoard.SyncRoute();
#if IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT
#if IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || SLM_50
int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr;
#else
int flowMeterIdxAndDiv = flowMeterNr;

10
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
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50
const ulong VL11 = (1L << 0);
const ulong VL13 = (1L << 1);
const ulong VL18 = (1L << 2);
@ -535,16 +535,16 @@ namespace TBF.BenchControl
Mass2sim += diff;
log.WarnFormat("Path5: Div3, Mass2 += {0}kg, flow={1}m3/h, Mass2={2}kg", diff, Flow1sim, Mass2sim);
}
#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || TORINO50 /// Path1,2 do WT1, Path3,4 do WT2
#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || TORINO50 /// Path1,2 do WT1, Path3,4 do WT2
if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
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 /// Path1,2,3 do WT1
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 /// 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);
#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 && (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
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50
switch (regulValveNo)
{
case 1:

2
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -660,7 +660,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
#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl;
#elif IPERLST

BIN
packages/ControlBoard/SLM-PT50/ControlComponent3U.dll Normal file
View File

Binary file not shown.