Mettler-Toledo improvements, SerialPort.Encoding = ASCII, etc., ver. 2.14.589

This commit is contained in:
Milan Hanajik
2017-06-26 15:34:31 +02:00
parent 2fb1c44ff2
commit 7449456d55
6 changed files with 33 additions and 16 deletions
@@ -112,7 +112,8 @@ namespace TBF.BenchControl.MettlerToledo.Standard
string comPortName = "COM" + balanceCfg.ComPortNr.ToString();
serialPort = new SerialPort(comPortName, balanceCfg.BaudRate, balanceCfg.Parity, balanceCfg.DataBits, balanceCfg.StopBits);
serialPort.Handshake = balanceCfg.Handshake;
serialPort.Open();
serialPort.Encoding = System.Text.Encoding.ASCII;
serialPort.Open();
log.FatalFormat("Successfully initialized device {0}", ToString());
}
@@ -55,7 +55,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
msrmntState = MsrmntState.Busy;
stringBuilder.Clear();
serialPort.Write("I4\r\n");
serialPort.Write(new byte[] { (byte)'I', (byte)'4', (byte)0x0D, (byte)0x0A }, 0, 4);
}
/// <summary>
@@ -125,18 +125,22 @@ namespace TBF.BenchControl.Sequences
while (e.Contains(Event.ValvesBusy));
//--------------------------------------------------------------------------------------------
State getSNs = State.Create("MainSeq : Reading serial numbers of all scales").AddOperation(checkUiOp);
string serNum1 = string.Empty;
string serNum2 = string.Empty;
string serNum3 = string.Empty;
if (StateMachine.Scale1 != null) getSNs.AddOperation(StateMachine.Scale1.GetSerNumOp(ref serNum1));
if (StateMachine.Scale2 != null) getSNs.AddOperation(StateMachine.Scale2.GetSerNumOp(ref serNum2));
if (StateMachine.Scale3 != null) getSNs.AddOperation(StateMachine.Scale3.GetSerNumOp(ref serNum3));
getSNs.EnterState();
State.Create("MainSeq : Read serial numbers of all scales").AddOperation(checkUiOp)
.AddOperation((StateMachine.Scale1 != null) ? StateMachine.Scale1.GetSerNumOp(ref serNum1) : null)
.AddOperation((StateMachine.Scale2 != null) ? StateMachine.Scale2.GetSerNumOp(ref serNum2) : null)
.AddOperation((StateMachine.Scale3 != null) ? StateMachine.Scale3.GetSerNumOp(ref serNum3) : null)
.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.Error))
{
Bridge.OnError(this, Strings.Scale_connection_error);
goto error;
}
if (e.Contains(Event.UiCmdStop)) goto stop;
}
while (e.Contains(Event.Busy));
@@ -147,7 +151,7 @@ namespace TBF.BenchControl.Sequences
//--------------------------------------------------------------------------------------------
IntBox remainingTime = new IntBox();
State startNew = State.Create("MainSeq : Draining tanks")
State startNew = State.Create("MainSeq : Drain tanks")
.AddOperation(checkUiOp);
IList<IValve> allDrainValves = new List<IValve>();
if (StateMachine.DrainValve1 != null) allDrainValves.Add(StateMachine.DrainValve1);
@@ -213,14 +217,14 @@ namespace TBF.BenchControl.Sequences
//--------------------------------------------------------------------------------------------
Bridge.OnActivity(this, Strings.Resetting_scales);
//--------------------------------------------------------------------------------------------
State taraAll = State.Create("MainSeq : Resetting scales").AddOperation(checkUiOp);
DoubleBox tara1 = new DoubleBox(0);
DoubleBox tara2 = new DoubleBox(0);
DoubleBox tara3 = new DoubleBox(0);
if (StateMachine.Scale1 != null) taraAll.AddOperation(StateMachine.Scale1.TaringOp(ref tara1));
if (StateMachine.Scale2 != null) taraAll.AddOperation(StateMachine.Scale2.TaringOp(ref tara2));
if (StateMachine.Scale3 != null) taraAll.AddOperation(StateMachine.Scale3.TaringOp(ref tara3));
taraAll.EnterState();
State.Create("MainSeq : Reset scales").AddOperation(checkUiOp)
.AddOperation((StateMachine.Scale1 != null) ? StateMachine.Scale1.TaringOp(ref tara1) : null)
.AddOperation((StateMachine.Scale2 != null) ? StateMachine.Scale2.TaringOp(ref tara2) : null)
.AddOperation((StateMachine.Scale3 != null) ? StateMachine.Scale3.TaringOp(ref tara3) : null)
.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.14.588.1")]
[assembly: AssemblyFileVersion("2.14.588.1")]
[assembly: AssemblyVersion("2.14.589.1")]
[assembly: AssemblyFileVersion("2.14.589.1")]
+9
View File
@@ -3606,6 +3606,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Scale connection error.
/// </summary>
internal static string Scale_connection_error {
get {
return ResourceManager.GetString("Scale_connection_error", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Screen.
/// </summary>
@@ -1786,4 +1786,7 @@
<data name="Resetting_scales" xml:space="preserve">
<value>Resetting scales</value>
</data>
<data name="Scale_connection_error" xml:space="preserve">
<value>Scale connection error</value>
</data>
</root>