Bug fix in Keitheley.TempMeter TempMeterCfgCtrl, minor change in Keithley.Multimeter_2010_RS232.

This commit is contained in:
Milan Hanajik
2016-08-24 15:46:37 +02:00
parent 1feb3215e5
commit 9d53d7aaa8
2 changed files with 16 additions and 11 deletions
@@ -48,7 +48,8 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232
{
Off,
Start_Reset,
Reset_SwitchChnl,
Reset_Reset2,
Reset2_SwitchChnl,
SwitchChnl_Read,
Read_Receive,
Receive_SwitchChnl,
@@ -246,12 +247,16 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232
case ScanState.Start_Reset:
SendMessage("*RST");
SendMessage("*CLS");
SendMessage(":conf:fres");
scanState = ScanState.Reset_SwitchChnl;
scanState = ScanState.Reset_Reset2;
return;
case ScanState.Reset_SwitchChnl:
case ScanState.Reset_Reset2:
SendMessage(":conf:fres");
scanState = ScanState.Reset2_SwitchChnl;
return;
case ScanState.Reset2_SwitchChnl:
case ScanState.Receive_SwitchChnl:
if (nextChannelIx >= 0 && nextChannelIx < listOfChannels.Count)
@@ -113,17 +113,17 @@ namespace TBF.BenchControl.Keithley.TempMeter
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "Invalid 'R(0.01°C)'";
}
if (!Utils.TryParseSDouble(a7TextBox.Text, out ddummy))
if (!Utils.TryParseEDouble(a7TextBox.Text, out ddummy))
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "Invalid 'a7'";
}
if (!Utils.TryParseSDouble(b7TextBox.Text, out ddummy))
if (!Utils.TryParseEDouble(b7TextBox.Text, out ddummy))
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "Invalid 'b7'";
}
if (!Utils.TryParseSDouble(c7TextBox.Text, out ddummy))
if (!Utils.TryParseEDouble(c7TextBox.Text, out ddummy))
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "Invalid 'c7'";
@@ -142,9 +142,9 @@ namespace TBF.BenchControl.Keithley.TempMeter
config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
config.Channel = int.Parse(channelTextBox.Text);
config.R001C = Utils.ParseUDouble(r0TextBox.Text);
config.a7 = Utils.ParseSDouble(a7TextBox.Text);
config.b7 = Utils.ParseSDouble(b7TextBox.Text);
config.c7 = Utils.ParseSDouble(c7TextBox.Text);
config.a7 = Utils.ParseEDouble(a7TextBox.Text);
config.b7 = Utils.ParseEDouble(b7TextBox.Text);
config.c7 = Utils.ParseEDouble(c7TextBox.Text);
return flags;
}