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

(1) iPerlHead bug fix : Support for very long tests exceeding optodata buffer size, (2) Berlin fixes (IScaleOrTank), ver. 2.18.1107

Browse Source
This commit is contained in:
Milan Hanajik 2018-12-21 08:38:08 +01:00
parent 1937850814
commit 2bce044cba
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ResultsBrowser/Properties/AssemblyInfo.cs
View File

@ -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")]

2
TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
View File

@ -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; }

2
TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
View File

@ -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; }

2
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
View File

@ -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; }

2
TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -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; }

4
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
View File

@ -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)

4
TBF/Properties/AssemblyInfo.cs
View File

@ -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")]