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

S640Communication : Skip bad meters feature added, file exchg timeouts up to 2000s, etc, ver. 2.27.1781

Browse Source
This commit is contained in:
Milan Hanajik 2021-10-20 17:20:28 +02:00
parent 4f2fb85372
commit 54cb6e4303
9 changed files with 260 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TBF/BenchControl/TestMethods/S640Communication/I640Cfg.cs
View File

@ -11,5 +11,6 @@ namespace TBF.BenchControl.TestMethods.S640Communication
string FileExchangePath { get; }
int FileExchangeTimeout { get; }
bool EnterSerialNumbers { get; }
bool SkipBadMeters { get; }
}
}

128
TBF/BenchControl/TestMethods/S640Communication/S640CommForm.cs
View File

@ -95,6 +95,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
string fileExchangePath;
int fileExchangeTimeout;
bool enterSerialNumbers;
bool skipBadMeters;
ProcParams pPars;
///
IList<S640Activity> activities;
@ -179,8 +180,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
/// Constructor for one S640Communication test
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public S640CommForm(S640Activity activity, I640Cfg config, Generic.IProcedureParams procParams, Test test)
: this(new List<S640Activity> { activity }, config, procParams, new List<Test> { test })
public S640CommForm(S640Activity activity, I640Cfg cfg, Generic.IProcedureParams procParams, Test test)
: this(new List<S640Activity> { activity }, cfg, procParams, new List<Test> { test })
{
}
@ -188,15 +189,16 @@ namespace TBF.BenchControl.TestMethods.S640Communication
/// Constructor for multiple S640Communication tests
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public S640CommForm(IList<S640Activity> activities, I640Cfg config, Generic.IProcedureParams procParams, IList<Test> tests)
public S640CommForm(IList<S640Activity> activities, I640Cfg cfg, Generic.IProcedureParams procParams, IList<Test> tests)
: this()
{
this.activities = activities;
debugLevel = config.DebugLevel;
optoDataTimeout = config.OptoDataTimeout;
fileExchangePath = string.IsNullOrEmpty(config.FileExchangePath) ? string.Empty : config.FileExchangePath;
fileExchangeTimeout = config.FileExchangeTimeout;
enterSerialNumbers = config.EnterSerialNumbers;
debugLevel = cfg.DebugLevel;
optoDataTimeout = cfg.OptoDataTimeout;
fileExchangePath = string.IsNullOrEmpty(cfg.FileExchangePath) ? string.Empty : cfg.FileExchangePath;
fileExchangeTimeout = cfg.FileExchangeTimeout;
enterSerialNumbers = cfg.EnterSerialNumbers;
skipBadMeters = cfg.SkipBadMeters;
this.tests = tests;
this.pPars = procParams as ProcParams;
@ -447,7 +449,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
else
{
/// Communication is OK right now
messages[i].Text = string.Format("pcb={0} radio={1}", optoHeads[i].PcbNumber, optoHeads[i].RadioAddress);
messages[i].Text = string.Format("pcb = {0} radio = {1}", optoHeads[i].PcbNumber, optoHeads[i].RadioAddress);
pictures[i].BackColor = OptoOKColor;
/// increment commOkLoopsCount[i] and check its value, considered OK just after 5 repeats
@ -529,10 +531,22 @@ namespace TBF.BenchControl.TestMethods.S640Communication
for (int i = 0; i < textBoxesCount; i++) { messages[i].Enabled = false; }
bool focused = false;
if (enterSerialNumbers)
{
for (int i = 0; i < textBoxesCount; i++) { serialNumbers[i].Enabled = true; }
serialNumbers[0].Focus();
for (int i = 0; i < textBoxesCount; i++)
{
if (serialNumbers[i].Visible)
{
serialNumbers[i].Enabled = true;
if (!focused)
{
serialNumbers[i].Focus();
focused = true;
}
}
}
closeButton.Visible = true;
closeButton.Enabled = true;
closeButton.Text = Strings.Continue;
@ -731,7 +745,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
wm.Suffix = ord.Suffix;
wm.CompleteSerialNr = string.Format("{0}{1}{2}", wm.Prefix, assingedSNStr, wm.Suffix);
messages[i].Text = string.Format("pcb={0} radio={1}->{2} s/n={3}", wm.SerialNrAux, wm.OriRadioAddress, wm.RadioAddress, assingedSNStr);
messages[i].Text = string.Format("s/n = {0} radio = {1}", assingedSNStr, wm.RadioAddress);
#endif
ord.CurrentSerialNr = currentSerialNr;
ord.CurrentRadioAddress = currentRadioAddress;
@ -1095,45 +1109,55 @@ namespace TBF.BenchControl.TestMethods.S640Communication
}
}
private void checkBoxImage1_Click(object sender, EventArgs e) { fromOptoTextBox1.Text = (textBox1.Visible = checkBoxImage1.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage2_Click(object sender, EventArgs e) { fromOptoTextBox2.Text = (textBox2.Visible = checkBoxImage2.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage3_Click(object sender, EventArgs e) { fromOptoTextBox3.Text = (textBox3.Visible = checkBoxImage3.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage4_Click(object sender, EventArgs e) { fromOptoTextBox4.Text = (textBox4.Visible = checkBoxImage4.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage5_Click(object sender, EventArgs e) { fromOptoTextBox5.Text = (textBox5.Visible = checkBoxImage5.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage6_Click(object sender, EventArgs e) { fromOptoTextBox6.Text = (textBox6.Visible = checkBoxImage6.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage7_Click(object sender, EventArgs e) { fromOptoTextBox7.Text = (textBox7.Visible = checkBoxImage7.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage8_Click(object sender, EventArgs e) { fromOptoTextBox8.Text = (textBox8.Visible = checkBoxImage8.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage9_Click(object sender, EventArgs e) { fromOptoTextBox9.Text = (textBox9.Visible = checkBoxImage9.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage10_Click(object sender, EventArgs e) { fromOptoTextBox10.Text = (textBox10.Visible = checkBoxImage10.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage11_Click(object sender, EventArgs e) { fromOptoTextBox11.Text = (textBox11.Visible = checkBoxImage11.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage12_Click(object sender, EventArgs e) { fromOptoTextBox12.Text = (textBox12.Visible = checkBoxImage12.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage13_Click(object sender, EventArgs e) { fromOptoTextBox13.Text = (textBox13.Visible = checkBoxImage13.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage14_Click(object sender, EventArgs e) { fromOptoTextBox14.Text = (textBox14.Visible = checkBoxImage14.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage15_Click(object sender, EventArgs e) { fromOptoTextBox15.Text = (textBox15.Visible = checkBoxImage15.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage16_Click(object sender, EventArgs e) { fromOptoTextBox16.Text = (textBox16.Visible = checkBoxImage16.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage17_Click(object sender, EventArgs e) { fromOptoTextBox17.Text = (textBox17.Visible = checkBoxImage17.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage18_Click(object sender, EventArgs e) { fromOptoTextBox18.Text = (textBox18.Visible = checkBoxImage18.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage19_Click(object sender, EventArgs e) { fromOptoTextBox19.Text = (textBox19.Visible = checkBoxImage19.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage20_Click(object sender, EventArgs e) { fromOptoTextBox20.Text = (textBox20.Visible = checkBoxImage20.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage21_Click(object sender, EventArgs e) { fromOptoTextBox21.Text = (textBox21.Visible = checkBoxImage21.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage22_Click(object sender, EventArgs e) { fromOptoTextBox22.Text = (textBox22.Visible = checkBoxImage22.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage23_Click(object sender, EventArgs e) { fromOptoTextBox23.Text = (textBox23.Visible = checkBoxImage23.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage24_Click(object sender, EventArgs e) { fromOptoTextBox24.Text = (textBox24.Visible = checkBoxImage24.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage25_Click(object sender, EventArgs e) { fromOptoTextBox25.Text = (textBox25.Visible = checkBoxImage25.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage26_Click(object sender, EventArgs e) { fromOptoTextBox26.Text = (textBox26.Visible = checkBoxImage26.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage27_Click(object sender, EventArgs e) { fromOptoTextBox27.Text = (textBox27.Visible = checkBoxImage27.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage28_Click(object sender, EventArgs e) { fromOptoTextBox28.Text = (textBox28.Visible = checkBoxImage28.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage29_Click(object sender, EventArgs e) { fromOptoTextBox29.Text = (textBox29.Visible = checkBoxImage29.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage30_Click(object sender, EventArgs e) { fromOptoTextBox30.Text = (textBox30.Visible = checkBoxImage30.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage31_Click(object sender, EventArgs e) { fromOptoTextBox31.Text = (textBox31.Visible = checkBoxImage31.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage32_Click(object sender, EventArgs e) { fromOptoTextBox32.Text = (textBox32.Visible = checkBoxImage32.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage33_Click(object sender, EventArgs e) { fromOptoTextBox33.Text = (textBox33.Visible = checkBoxImage33.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage34_Click(object sender, EventArgs e) { fromOptoTextBox34.Text = (textBox34.Visible = checkBoxImage34.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage35_Click(object sender, EventArgs e) { fromOptoTextBox35.Text = (textBox35.Visible = checkBoxImage35.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage36_Click(object sender, EventArgs e) { fromOptoTextBox36.Text = (textBox36.Visible = checkBoxImage36.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage37_Click(object sender, EventArgs e) { fromOptoTextBox37.Text = (textBox37.Visible = checkBoxImage37.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage38_Click(object sender, EventArgs e) { fromOptoTextBox38.Text = (textBox38.Visible = checkBoxImage38.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage39_Click(object sender, EventArgs e) { fromOptoTextBox39.Text = (textBox39.Visible = checkBoxImage39.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage40_Click(object sender, EventArgs e) { fromOptoTextBox40.Text = (textBox40.Visible = checkBoxImage40.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage1_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage1, fromOptoTextBox1, textBox1); }
private void checkBoxImage2_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage2, fromOptoTextBox2, textBox2); }
private void checkBoxImage3_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage3, fromOptoTextBox3, textBox3); }
private void checkBoxImage4_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage4, fromOptoTextBox4, textBox4); }
private void checkBoxImage5_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage5, fromOptoTextBox5, textBox5); }
private void checkBoxImage6_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage6, fromOptoTextBox6, textBox6); }
private void checkBoxImage7_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage7, fromOptoTextBox7, textBox7); }
private void checkBoxImage8_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage8, fromOptoTextBox8, textBox8); }
private void checkBoxImage9_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage9, fromOptoTextBox9, textBox9); }
private void checkBoxImage10_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage10, fromOptoTextBox10, textBox10); }
private void checkBoxImage11_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage11, fromOptoTextBox11, textBox11); }
private void checkBoxImage12_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage12, fromOptoTextBox12, textBox12); }
private void checkBoxImage13_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage13, fromOptoTextBox13, textBox13); }
private void checkBoxImage14_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage14, fromOptoTextBox14, textBox14); }
private void checkBoxImage15_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage15, fromOptoTextBox15, textBox15); }
private void checkBoxImage16_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage16, fromOptoTextBox16, textBox16); }
private void checkBoxImage17_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage17, fromOptoTextBox17, textBox17); }
private void checkBoxImage18_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage18, fromOptoTextBox18, textBox18); }
private void checkBoxImage19_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage19, fromOptoTextBox19, textBox19); }
private void checkBoxImage20_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage20, fromOptoTextBox20, textBox20); }
private void checkBoxImage21_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage21, fromOptoTextBox21, textBox21); }
private void checkBoxImage22_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage22, fromOptoTextBox22, textBox22); }
private void checkBoxImage23_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage23, fromOptoTextBox23, textBox23); }
private void checkBoxImage24_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage24, fromOptoTextBox24, textBox24); }
private void checkBoxImage25_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage25, fromOptoTextBox25, textBox25); }
private void checkBoxImage26_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage26, fromOptoTextBox26, textBox26); }
private void checkBoxImage27_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage27, fromOptoTextBox27, textBox27); }
private void checkBoxImage28_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage28, fromOptoTextBox28, textBox28); }
private void checkBoxImage29_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage29, fromOptoTextBox29, textBox29); }
private void checkBoxImage30_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage30, fromOptoTextBox30, textBox30); }
private void checkBoxImage31_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage31, fromOptoTextBox31, textBox31); }
private void checkBoxImage32_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage32, fromOptoTextBox32, textBox32); }
private void checkBoxImage33_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage33, fromOptoTextBox33, textBox33); }
private void checkBoxImage34_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage34, fromOptoTextBox34, textBox34); }
private void checkBoxImage35_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage35, fromOptoTextBox35, textBox35); }
private void checkBoxImage36_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage36, fromOptoTextBox36, textBox36); }
private void checkBoxImage37_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage37, fromOptoTextBox37, textBox37); }
private void checkBoxImage38_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage38, fromOptoTextBox38, textBox38); }
private void checkBoxImage39_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage39, fromOptoTextBox39, textBox39); }
private void checkBoxImage40_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage40, fromOptoTextBox40, textBox40); }
void ProcessClick(CheckBoxImage checkBox, TextBox messageBox, TextBox snTextBox)
{
messageBox.Text = checkBox.Checked ? string.Empty : Strings.Head_was_disabled_by_the_user;
if (skipBadMeters)
{
snTextBox.Visible = checkBox.Checked;
}
}
}
}

296
TBF/BenchControl/TestMethods/S640Communication/S640CommForm.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

18
TBF/BenchControl/TestMethods/S640Communication/S640EndCfg.cs
View File

@ -28,6 +28,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
public string FileExchangePath { get; set; }
public int FileExchangeTimeout { get; set; }
public bool EnterSerialNumbers { get; set; }
public bool SkipBadMeters { get; set; }
public bool SimultWithEvacuation { get; set; }
/// <summary> Procedure parameters </summary>
@ -55,10 +56,11 @@ namespace TBF.BenchControl.TestMethods.S640Communication
public void InitializeAll()
{
OptoDataTimeout = 180;
OptoDataTimeout = 120;
FileExchangePath = "1";
FileExchangeTimeout = 60;
FileExchangeTimeout = 420;
EnterSerialNumbers = false;
SkipBadMeters = false;
SimultWithEvacuation = true;
}
@ -68,6 +70,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
"File exchange path",
"File exchange timeout [s] (0 = off)",
"Enter serial numbers",
"Skip bad meters when entering s/n",
"Simultaneous with evacuation",
};
public string ParamName(int i) { return paramNames[i]; }
@ -79,6 +82,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
{
case 3:
case 4:
case 5:
return new List<string> { Strings.yes, Strings.no };
default:
return null;
@ -93,7 +97,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
case 1: return FileExchangePath;
case 2: return FileExchangeTimeout.ToString();
case 3: return EnterSerialNumbers ? Strings.yes : Strings.no;
case 4: return SimultWithEvacuation ? Strings.yes : Strings.no;
case 4: return SkipBadMeters ? Strings.yes : Strings.no;
case 5: return SimultWithEvacuation ? Strings.yes : Strings.no;
default:
return string.Format("{0}: FileExchangePath = '{1}' FileExchangeTimeout = {2}s", Name, FileExchangePath, FileExchangeTimeout);
}
@ -107,7 +112,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
case 1: FileExchangePath = strValue; return CfgUpdateFlags.RestartRqrd;
case 2: FileExchangeTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
case 3: EnterSerialNumbers = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
case 4: SimultWithEvacuation = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
case 4: SkipBadMeters = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
case 5: SimultWithEvacuation = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
default:
return CfgUpdateFlags.None;
}
@ -122,12 +128,13 @@ namespace TBF.BenchControl.TestMethods.S640Communication
{
case 0:
case 2:
if (int.TryParse(strValue, out idummy) && idummy >= 0 && idummy <= 300) return true;
if (int.TryParse(strValue, out idummy) && idummy >= 0 && idummy <= 2000) return true;
break;
case 1:
return true;
case 3:
case 4:
case 5:
if (ParamValues(i).Contains(strValue)) return true;
break;
default:
@ -145,6 +152,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
prms.FileExchangePath = this.FileExchangePath;
prms.FileExchangeTimeout = this.FileExchangeTimeout;
prms.EnterSerialNumbers = this.EnterSerialNumbers;
prms.SkipBadMeters = this.SkipBadMeters;
prms.SimultWithEvacuation = this.SimultWithEvacuation;
}

16
TBF/BenchControl/TestMethods/S640Communication/S640StartCfg.cs
View File

@ -31,6 +31,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
public string FileExchangePath { get; set; }
public int FileExchangeTimeout { get; set; }
public bool EnterSerialNumbers { get; set; }
public bool SkipBadMeters { get; set; }
public bool SimultWithPurging { get; set; }
/// <summary> Procedure parameters </summary>
@ -60,8 +61,9 @@ namespace TBF.BenchControl.TestMethods.S640Communication
{
OptoDataTimeout = 180;
FileExchangePath = "1";
FileExchangeTimeout = 60;
FileExchangeTimeout = 420;
EnterSerialNumbers = true;
SkipBadMeters = false;
SimultWithPurging = true;
}
@ -71,6 +73,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
"File exchange path",
"File exchange timeout [s] (0 = off)",
"Enter serial numbers",
"Skip bad meters when entering s/n",
"Simultaneous with purging",
};
public string ParamName(int i) { return paramNames[i]; }
@ -82,6 +85,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
{
case 3:
case 4:
case 5:
return new List<string> { Strings.yes, Strings.no };
default:
return null;
@ -96,7 +100,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
case 1: return FileExchangePath;
case 2: return FileExchangeTimeout.ToString();
case 3: return EnterSerialNumbers ? Strings.yes : Strings.no;
case 4: return SimultWithPurging ? Strings.yes : Strings.no;
case 4: return SkipBadMeters ? Strings.yes : Strings.no;
case 5: return SimultWithPurging ? Strings.yes : Strings.no;
default:
return string.Format("{0}: FileExchangePath = '{1}' FileExchangeTimeout = {2}s", Name, FileExchangePath, FileExchangeTimeout);
}
@ -110,7 +115,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
case 1: FileExchangePath = strValue; return CfgUpdateFlags.RestartRqrd;
case 2: FileExchangeTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
case 3: EnterSerialNumbers = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
case 4: SimultWithPurging = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
case 4: SkipBadMeters = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
case 5: SimultWithPurging = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
default:
return CfgUpdateFlags.None;
}
@ -125,12 +131,13 @@ namespace TBF.BenchControl.TestMethods.S640Communication
{
case 0:
case 2:
if (int.TryParse(strValue, out idummy) && idummy >= 0 && idummy <= 300) return true;
if (int.TryParse(strValue, out idummy) && idummy >= 0 && idummy <= 2000) return true;
break;
case 1:
return true;
case 3:
case 4:
case 5:
if (ParamValues(i).Contains(strValue)) return true;
break;
default:
@ -148,6 +155,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
prms.FileExchangePath = this.FileExchangePath;
prms.FileExchangeTimeout = this.FileExchangeTimeout;
prms.EnterSerialNumbers = this.EnterSerialNumbers;
prms.SkipBadMeters = this.SkipBadMeters;
prms.SimultWithPurging = this.SimultWithPurging;
}

4
TBF/Properties/AssemblyInfo.cs
View File

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

2
TBF/Resources/Strings.Designer.cs generated
View File

@ -2275,7 +2275,7 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Head was disabled by the user.
/// Looks up a localized string similar to Disabled by the user.
/// </summary>
internal static string Head_was_disabled_by_the_user {
get {

6
TBF/Resources/Strings.cs.resx
View File

@ -1668,4 +1668,10 @@
<data name="Database" xml:space="preserve">
<value>Databáze</value>
</data>
<data name="Head_was_disabled_by_the_user" xml:space="preserve">
<value>Hlavice vypnutá uživatelem</value>
</data>
<data name="Opto_head_is_disabled_in_configuration" xml:space="preserve">
<value>Hlavice vypnutá v konfiguraci</value>
</data>
</root>

2
TBF/Resources/Strings.resx
View File

@ -1727,7 +1727,7 @@
<value>RFID communication failed</value>
</data>
<data name="Head_was_disabled_by_the_user" xml:space="preserve">
<value>Head was disabled by the user</value>
<value>Disabled by the user</value>
</data>
<data name="failed_0_1_exclamation" xml:space="preserve">
<value>'{0}' activity failed ({1}) !!!</value>