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

Genesis : (1) component upgraded (dated 22.08.18), (2) bug fixes, ver. 2.18.980

Browse Source 
more
This commit is contained in:
Milan Hanajik 2018-08-22 17:51:31 +02:00
parent 5995204d8d
commit bef4928162
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,10 +375,14 @@ namespace TBF.BenchControl.Elde
#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods,
Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
#elif GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200
#elif BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200
uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
#elif GENESIS
uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
#elif JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100
uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods,

6
TBF/BenchControl/Sequences/MainSeq.cs
View File

@ -904,9 +904,9 @@ namespace TBF.BenchControl.Sequences
}
/// Update format for the water mass
Mass.Format = outPath.Scale.Format;
StartMass.Format = outPath.Scale.Format;
EndMass.Format = outPath.Scale.Format;
Mass.Format = (outPath != null && outPath.Scale != null) ? outPath.Scale.Format : "F3";
StartMass.Format = (outPath != null && outPath.Scale != null) ? outPath.Scale.Format : "F3";
EndMass.Format = (outPath != null && outPath.Scale != null) ? outPath.Scale.Format : "F3";
ITestMethod testMethod = TbfComponents.FindComponent(test.Method) as ITestMethod;
if (testMethod != null && testMethod.CanTest(StateMachine.Procedure.MetersKind))

2
TBF/MainWnd.cs
View File

@ -322,7 +322,7 @@ namespace TBF
/// </summary>
private void MainWnd_KeyPress(object sender, KeyPressEventArgs e)
{
#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT
#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT && !GENESIS
if (BenchControlPanel != null && BenchControlPanel.ProcessKey(e.KeyChar))
{
e.Handled = true;

4
TBF/Properties/AssemblyInfo.cs
View File

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

BIN
packages/ControlBoard/Genesis/ControlComponent3U.dll
View File

Binary file not shown.