From 2bce044cba8a523f8cb6a9a76ef84b39e369af12 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 21 Dec 2018 08:38:08 +0100 Subject: [PATCH] (1) iPerlHead bug fix : Support for very long tests exceeding optodata buffer size, (2) Berlin fixes (IScaleOrTank), ver. 2.18.1107 --- ResultsBrowser/Properties/AssemblyInfo.cs | 4 ++-- .../FlyingStartFirstRepetWithMassCollSeq.cs | 2 +- .../FlyingStartMassCollComparativeSeq.cs | 2 +- .../FlyingStartMassCollProlongedSeq.cs | 2 +- .../FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs | 2 +- .../TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs | 4 ++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 490d4c679..fb412ecd0 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -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.18.1098.0")] -[assembly: AssemblyFileVersion("2.18.1098.0")] +[assembly: AssemblyVersion("2.18.1107.0")] +[assembly: AssemblyFileVersion("2.18.1107.0")] diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index bd85fe563..34a8803ac 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -137,7 +137,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl if (drainTheTank) { #if BERLIN - switch (DrainTheTank(scale.DrainValve, scale)) + switch (DrainTheTank(outPath.Scale)) { case Event.Error: { retVal = Event.Error; goto stopTest; } case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index 8ed98fbaf..26bf5ceb6 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -144,7 +144,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative if (drainTheTank) { #if BERLIN || SENTEC - switch (DrainTheTank(scale.DrainValve, scale)) + switch (DrainTheTank(outPath.Scale)) { case Event.Error: { retVal = Event.Error; goto stopTest; } case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index 7c6ae93e6..3cb70ab6d 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -141,7 +141,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged if (drainTheTank) { #if BERLIN - switch (DrainTheTank(scale.DrainValve, scale)) + switch (DrainTheTank(outPath.Scale)) { case Event.Error: { retVal = Event.Error; goto stopTest; } case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index aed7cad78..ec0681899 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -133,7 +133,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (drainTheTank) { #if BERLIN || SENTEC - switch (DrainTheTank(scale.DrainValve, scale)) + switch (DrainTheTank(outPath.Scale)) { case Event.Error: { retVal = Event.Error; goto stopTest; } case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs index 80b5a908b..bd3007e59 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs @@ -25,7 +25,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead public override string ToString() { return string.Format("iPerl({0})", Cfg.ToString(1)); } - const int MaxOptoDataCount = 40000; + const int MaxOptoDataCount = 4000; const int StartOptoDataCount = MaxOptoDataCount / 2; const int EndOptoDataCount = MaxOptoDataCount - StartOptoDataCount; @@ -641,7 +641,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead } StopParsingOptoSerialPort(); - OptoTelegramRaw.FIRFilterFlow(optoData, optoDataCount); + OptoTelegramRaw.FIRFilterFlow(optoData, Math.Min(optoDataCount, MaxOptoDataCount)); SaveOptoData(); if (TestStartTelegramIx == 0 || optoDataCount < 100) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 137173597..4767e3299 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.1106.0")] -[assembly: AssemblyFileVersion("2.18.1106.0")] +[assembly: AssemblyVersion("2.18.1107.0")] +[assembly: AssemblyFileVersion("2.18.1107.0")]