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

Fixed a problem with pumps P3 and P4 on iPerST bench, version 1.5.87.

Browse Source
This commit is contained in:
Milan Hanajik 2015-08-20 16:21:50 +02:00
parent 2e04076b30
commit 4faf6b5d69
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -151,7 +151,7 @@ namespace TBF.BenchControl.Elde
/// <param name="power">Power (0.0f .. 100.0f)</param>
public void SetFMFreq(int index, float power)
{
#if FUZHOU300 || PT200IL
#if FUZHOU300 || PT200IL || IPERLST
if ((FMFreq == null) || (FMFreq.Length != 6)) FMFreq = new float[6];
#else
if ((FMFreq == null) || (FMFreq.Length != 2)) FMFreq = new float[2];
@ -192,7 +192,7 @@ namespace TBF.BenchControl.Elde
{
controlBoardCfg = cfg;
#if FUZHOU300 || PT200IL
#if FUZHOU300 || PT200IL || IPERLST
FMFreq = new float[6] { 0, 0, 0, 0, 0, 0 }; /// Nr. of pumps: Fuzhou150=2, Fuzhou300,PT200IL=6
#else
FMFreq = new float[2] { 0, 0 }; /// Nr. of pumps: Fuzhou150=2, Fuzhou300=6

4
TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs
View File

@ -69,14 +69,14 @@ namespace TBF.BenchControl.Elde.PumpWithFM
public void TurnOn(float powerArg)
{
log.DebugFormat("{0}.TurnOn({1})", Name, powerArg);
log.InfoFormat("{0}.TurnOn({1})", Name, powerArg);
this.power = powerArg;
controlBoard.SetFMFreq(FMIndex, powerArg);
}
public void TurnOff()
{
log.DebugFormat("{0}.TurnOff()", Name);
log.InfoFormat("{0}.TurnOff()", Name);
this.power = 0.0f;
controlBoard.SetFMFreq(FMIndex, 0.0f);
}

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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