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

DeviceTest shutdown bug fix, OptoTelegramRaw comment, ver. 3.1.1593

Browse Source
This commit is contained in:
Milan Hanajik 2021-02-16 11:40:57 +01:00
parent fea9b01922
commit 57793ed382
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DeviceTest/DeviceTestDlg.cs
View File

@ -646,6 +646,7 @@ namespace DeviceTest
MessageBoxIcon.Exclamation);
foreach (var dev in tbfDevices) dev.StopDevice();
foreach (var dev in tbfDevices) dev.StopDevice2();
tbfDevices.Clear();
startButton.Enabled = true;
@ -857,6 +858,7 @@ namespace DeviceTest
}
foreach (var d in tbfDevices) d.StopDevice();
foreach (var d in tbfDevices) d.StopDevice2();
}
private void stopButton_Click(object sender, EventArgs e)

46
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoTelegramRaw.cs
View File

@ -216,29 +216,29 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
else /// if (flags == OptoTelegramFlags.OK / OptoTelegramFlags.OK_TestStart / OptoTelegramFlags.OK_TestEnd)
{
return string.Format("{0}:{1}:{2}.{3}\t{4} :\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}\t{13}\t{14}\t{15}\t{16}\t{17}\t{18}\t{19}\t{20}\t{21}\t{22}",
DateTime.Hour.ToString("D2"),
DateTime.Minute.ToString("D2"),
DateTime.Second.ToString("D2"),
DateTime.Millisecond.ToString("D4"),
Counter,
EmfRaw.ToString("X6"),
MagneticFieldRaw.ToString("X4"),
FlowRaw.ToString("X4"),
VolumeRaw.ToString("X6"),
Impedance.ToString("X4"),
Timestamp.ToString("X8"),
CheckSum.ToString("X2"),
EMF().ToString("F4", culture),
MagneticField().ToString("F0", culture),
Flow(scalingFactor).ToString("F2", culture),
Volume(scalingFactor).ToString("F4", culture),
FlipTime().ToString("F0", culture),
TimestampDec().ToString("F4", culture),
(RefFlow * 1000).ToString("F2", culture),
VolumeDelta(scalingFactor, previous).ToString("F4", culture),
TimeDelta().ToString("F3", culture),
scalingFactor.ToString("F1", culture),
Label());
/* 0 */ DateTime.Hour.ToString("D2"),
/* 1 */ DateTime.Minute.ToString("D2"),
/* 2 */ DateTime.Second.ToString("D2"),
/* 3 */ DateTime.Millisecond.ToString("D4"),
/* 4 */ Counter,
/* 5 */ EmfRaw.ToString("X6"),
/* 6 */ MagneticFieldRaw.ToString("X4"),
/* 7 */ FlowRaw.ToString("X4"),
/* 8 */ VolumeRaw.ToString("X6"),
/* 9 */ Impedance.ToString("X4"),
/* 10 */ Timestamp.ToString("X8"),
/* 11 */ CheckSum.ToString("X2"),
/* 12 */ EMF().ToString("F4", culture),
/* 13 */ MagneticField().ToString("F0", culture),
/* 14 */ Flow(scalingFactor).ToString("F2", culture),
/* 15 */ Volume(scalingFactor).ToString("F4", culture),
/* 16 */ FlipTime().ToString("F0", culture),
/* 17 */ TimestampDec().ToString("F4", culture),
/* 18 */ (RefFlow * 1000).ToString("F2", culture),
/* 19 */ VolumeDelta(scalingFactor, previous).ToString("F4", culture),
/* 20 */ TimeDelta().ToString("F3", culture),
/* 21 */ scalingFactor.ToString("F1", culture),
/* 22 */ Label());
}
}

4
TBF/Properties/AssemblyInfo.cs
View File

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