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

DiverterTest : Delay TimeFlow2Mass (min. 5 s) between tests, UpgradeSlectionDlg changes, ver. 2.33.2061

Browse Source
This commit is contained in:
Milan Hanajik 2023-06-16 12:08:51 +02:00
parent 1c6e3c17fa
commit 2232c31451
3 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

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

9
TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2019 Sensus Slovensko a.s. /// Copyright (c) 2019-2023 Sensus Slovensko a.s.
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -524,15 +524,14 @@ namespace TBF.Rig.TestMethods.DiverterTest
{ {
/// This is not the last diverter repetition /// This is not the last diverter repetition
/// Delay 5s /// Delay 'TimeFlow2Mass', min. 5 seconds
State.Create(string.Format("{0}({1}) : Delay {2}", test.Method, test.Name, divRepetNr)) State.Create(string.Format("{0}({1}) : Delay {2}", test.Method, test.Name, divRepetNr))
.AddOperation(checkUiOp) .AddOperation(checkUiOp)
.AddOperations(readTempPressOps) .AddOperations(readTempPressOps)
.AddOperation(processDataLoggingOp) .AddOperation(processDataLoggingOp)
.AddOperation(new Operations.TimerOp(5)) .AddOperation(new Operations.TimerOp(Math.Max(5, test.TimeFlow2Mass)))
.EnterState(); .EnterState();
do do {
{
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }

42
TBF/UI/Settings/UpgradeSelectionDlg.cs
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2016-2020 Sensus slovensko a.s. /// Copyright (c) 2016-2023 Sensus slovensko a.s.
/// ///
using System; using System;
using System.Drawing; using System.Drawing;
@ -1090,14 +1090,11 @@ namespace TBF.UI.Settings
private void upgradeDb_226_227_Button_Click(object sender, EventArgs e) private void upgradeDb_226_227_Button_Click(object sender, EventArgs e)
{ {
string[] configDbCommands = new string[] string[] configDbCommands = new string[] { };
{
/// TODO
};
string[] resultsDbCommands = new string[] string[] resultsDbCommands = new string[]
{ {
/// TODO "ALTER TABLE `watermeter` ADD `RadioAddress` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL AFTER `SerialNrAux`;",
}; };
if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked) if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked)
@ -1123,13 +1120,11 @@ namespace TBF.UI.Settings
{ {
string[] configDbCommands = new string[] string[] configDbCommands = new string[]
{ {
/// TODO "ALTER TABLE `test` ADD `TempControl` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL AFTER `TempLimHi`;",
"ALTER TABLE `test` DROP `DoControlWaterTemp`;",
}; };
string[] resultsDbCommands = new string[] string[] resultsDbCommands = new string[] { };
{
/// TODO
};
if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked) if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked)
{ {
@ -1154,13 +1149,11 @@ namespace TBF.UI.Settings
{ {
string[] configDbCommands = new string[] string[] configDbCommands = new string[]
{ {
/// TODO "ALTER TABLE `measurementcorrection` CHANGE `Measurement` `Measurement` DOUBLE NOT NULL DEFAULT '0';",
"ALTER TABLE `measurementcorrection` CHANGE `Correction` `Correction` DOUBLE NOT NULL DEFAULT '0';",
}; };
string[] resultsDbCommands = new string[] string[] resultsDbCommands = new string[] { };
{
/// TODO
};
if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked) if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked)
{ {
@ -1185,13 +1178,12 @@ namespace TBF.UI.Settings
{ {
string[] configDbCommands = new string[] string[] configDbCommands = new string[]
{ {
/// TODO "ALTER TABLE `benchpath` ADD `Selector` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL AFTER `Qto`;",
"ALTER TABLE `feedingpath` ADD `Selector` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL AFTER `Qto`;",
"ALTER TABLE `outputpath` ADD `Selector` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL AFTER `Qto`;",
}; };
string[] resultsDbCommands = new string[] string[] resultsDbCommands = new string[] { };
{
/// TODO
};
if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked) if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked)
{ {
@ -1216,13 +1208,11 @@ namespace TBF.UI.Settings
{ {
string[] configDbCommands = new string[] string[] configDbCommands = new string[]
{ {
/// TODO //"ALTER TABLE `ptest` ADD `Publish` TINYINT(4) NOT NULL DEFAULT '0' AFTER `PressLimHi`, ADD `Evaluate` TINYINT(1) NOT NULL DEFAULT '0' AFTER `Publish`;",
"ALTER TABLE `ptest` ADD `Method` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL AFTER `Evaluate`;",
}; };
string[] resultsDbCommands = new string[] string[] resultsDbCommands = new string[] { };
{
/// TODO
};
if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked) if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked)
{ {