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:54:38 +02:00
parent c497c02ef9
commit dff3a1aff7
10 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
+2 -2
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);