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

As sent to Munich

Browse Source
This commit is contained in:
Milan Hanajik
2014-08-01 08:36:17 +02:00
parent 836daaa5a1
commit fd2db3e229
20 changed files with 254 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/MettlerToledo/BalanceDev.cs
+2 -2
View File
@@ -223,7 +223,7 @@ namespace TBF.BenchControl.MettlerToledo
mass = GetSimMass(balanceNr);
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
msrmntTimeStamp = StateMachine.CurrentTime;
msrmntTimeStamp = StateMachine.Time;
return;
}
@@ -242,7 +242,7 @@ namespace TBF.BenchControl.MettlerToledo
int eolPos = currentBuffer.IndexOf("\r\n");
if (eolPos >= 0)
{
msrmntTimeStamp = StateMachine.CurrentTime;
msrmntTimeStamp = StateMachine.Time;
/// Get part of theh string before EOL
string received = currentBuffer.Substring(0, eolPos);
TestBenchFramework/BenchControl/MettlerToledo/BalanceNewDev.cs
+2 -2
View File
@@ -68,7 +68,7 @@ namespace TBF.BenchControl.MettlerToledo
Masses[balanceNr] = mass;
serialNumber = "1234567890";
msrmntState = MsrmntState.Valid;
msrmntTimeStamp = StateMachine.CurrentTime;
msrmntTimeStamp = StateMachine.Time;
return;
}
@@ -84,7 +84,7 @@ namespace TBF.BenchControl.MettlerToledo
if (stringBuilder.ToString().EndsWith("\r\n"))
{
msrmntTimeStamp = StateMachine.CurrentTime;
msrmntTimeStamp = StateMachine.Time;
string received = stringBuilder.ToString();