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

- PidCoef from OutputPath used in flow control, PidCoef regulValve parameter abandoned

Browse Source 
- Part field (int) added to Test and TestResult, shown and processed in UI in ProcedureDlg
This commit is contained in:
Milan Hanajik
2015-01-04 23:21:12 +01:00
parent 035416b785
commit 580d4330e3
17 changed files with 402 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs
-15
View File
@@ -72,7 +72,6 @@ namespace TBF.BenchControl.Elde.RegulValve
positionTextBox.Text = config.Idx1.ToString();
dacClosedTextBox.Text = config.DacValueClosed.ToString();
dacOpenTextBox.Text = config.DacValueOpen.ToString();
pidCoefTextBox.Text = config.PidCoef.ToString(); // TODO PID: Remove
stableTimeTextBox.Text = config.StableTimeMs.ToString();
storedPosReuseCheckBox.Checked = config.StoredPositionReuse;
flowStableSecTextBox.Text = config.FlowStableSec.ToString();
@@ -90,7 +89,6 @@ namespace TBF.BenchControl.Elde.RegulValve
positionTextBox.Enabled = true;
dacClosedTextBox.Enabled = true;
dacOpenTextBox.Enabled = true;
pidCoefTextBox.Enabled = true;
stableTimeTextBox.Enabled = true;
storedPosReuseCheckBox.Enabled = true;
flowStableSecTextBox.Enabled = true;
@@ -121,11 +119,6 @@ namespace TBF.BenchControl.Elde.RegulValve
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "'DAC when Open' should be between 0 and 1023";
}
if (!int.TryParse(pidCoefTextBox.Text, out dummy) || dummy < 0 || dummy > 100)
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "'PID Coefficient' should be between 0 and 100";
}
if (!int.TryParse(stableTimeTextBox.Text, out dummy) || dummy < 200 || dummy > 1500 || (dummy % 50) != 0)
{
flags |= CfgUpdateFlags.Error;
@@ -180,14 +173,6 @@ namespace TBF.BenchControl.Elde.RegulValve
flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
}
// TODO PID: Remove
tmp = int.Parse(pidCoefTextBox.Text);
if (config.PidCoef != tmp)
{
config.PidCoef = tmp;
flags |= CfgUpdateFlags.AnyChange;
}
tmp = int.Parse(stableTimeTextBox.Text);
if (config.StableTimeMs != tmp)
{