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

(1) Munich component upgraded - coax valve bug, (2) DivSamples array size fixed for MUNICH, ver. 2.18.952

Browse Source
This commit is contained in:
Milan Hanajik 2018-06-26 16:58:59 +02:00
parent 1034c8e752
commit 79fea707f3
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TBF/BenchControl/Elde/ControlComWrap.cs
View File

@ -84,7 +84,14 @@ namespace TBF.BenchControl.Elde
//return ctrlBrdComponent.RValvePosition[rvNr1 - 1]; //return ctrlBrdComponent.RValvePosition[rvNr1 - 1];
return ctrlBrdComponent.Analogy[rvNr1 - 1]; /// Fixes bug: RValvePosition returns 0 all the time return ctrlBrdComponent.Analogy[rvNr1 - 1]; /// Fixes bug: RValvePosition returns 0 all the time
} }
public float DivSamples(int time, int divIx0) { return ctrlBrdComponent.DIVSamples[time, divIx0]; } /// Time unit is 2 ms public float DivSamples(int time, int divIx0)
{
#if MUNICH
return ctrlBrdComponent.DIVSamples[time, 0];
#else
return ctrlBrdComponent.DIVSamples[time, divIx0];
#endif
} /// Time unit is 2 ms
public int ScopeSamples(int i, int j, int k) { return ctrlBrdComponent.ScopeSamples[i, j, k]; } public int ScopeSamples(int i, int j, int k) { return ctrlBrdComponent.ScopeSamples[i, j, k]; }
public ulong DigitalInputs { get { return (ulong)ctrlBrdComponent.Vstupy; } } public ulong DigitalInputs { get { return (ulong)ctrlBrdComponent.Vstupy; } }
public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; } public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; }

4
TBF/Properties/AssemblyInfo.cs
View File

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

BIN
packages/ControlBoard/Munich/ControlComponent3Munich.dll
View File

Binary file not shown.