diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index b2d0e3534..0ee2ddae7 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -84,7 +84,14 @@ namespace TBF.BenchControl.Elde //return ctrlBrdComponent.RValvePosition[rvNr1 - 1]; 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 ulong DigitalInputs { get { return (ulong)ctrlBrdComponent.Vstupy; } } public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index ca6871242..686295470 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.941.0")] -[assembly: AssemblyFileVersion("2.18.941.0")] +[assembly: AssemblyVersion("2.18.952.0")] +[assembly: AssemblyFileVersion("2.18.952.0")] diff --git a/packages/ControlBoard/Munich/ControlComponent3Munich.dll b/packages/ControlBoard/Munich/ControlComponent3Munich.dll index 75eb8675d..e82cc48f5 100644 Binary files a/packages/ControlBoard/Munich/ControlComponent3Munich.dll and b/packages/ControlBoard/Munich/ControlComponent3Munich.dll differ