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

Config change handler for Diverter, it should be possible to calibrate the analog input.

Browse Source
This commit is contained in:
Milan Hanajik
2015-06-12 16:39:57 +02:00
parent bfc7d5b438
commit 79d819a501
11 changed files with 562 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs
+27 -32
View File
@@ -50,9 +50,9 @@ namespace TBF.BenchControl.Elde.RegulValve
if (config != null)
{
adc1 = config.DacValueClosed;
adc1 = config.AdcValueClosed;
pct1 = 0;
adc2 = config.DacValueOpen;
adc2 = config.AdcValueOpen;
pct2 = 100;
}
@@ -73,8 +73,8 @@ namespace TBF.BenchControl.Elde.RegulValve
nameTextBox.Text = config.Name;
parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
positionTextBox.Text = config.Idx1.ToString();
dacClosedTextBox.Text = config.DacValueClosed.ToString();
dacOpenTextBox.Text = config.DacValueOpen.ToString();
adcClosedTextBox.Text = config.AdcValueClosed.ToString();
adcOpenTextBox.Text = config.AdcValueOpen.ToString();
stableTimeTextBox.Text = config.StableTimeMs.ToString();
storedPosReuseCheckBox.Checked = config.StoredPositionReuse;
flowStableSecTextBox.Text = config.FlowStableSec.ToString();
@@ -90,8 +90,8 @@ namespace TBF.BenchControl.Elde.RegulValve
nameTextBox.Enabled = true;
parentNameComboBox.Enabled = true;
positionTextBox.Enabled = true;
dacClosedTextBox.Enabled = true;
dacOpenTextBox.Enabled = true;
adcClosedTextBox.Enabled = true;
adcOpenTextBox.Enabled = true;
stableTimeTextBox.Enabled = true;
storedPosReuseCheckBox.Enabled = true;
flowStableSecTextBox.Enabled = true;
@@ -114,16 +114,16 @@ namespace TBF.BenchControl.Elde.RegulValve
message += Environment.NewLine + "'Position' should be between 1 and 8";
}
if (!int.TryParse(dacClosedTextBox.Text, out dummy) || dummy < 0 || dummy > 1023)
if (!int.TryParse(adcClosedTextBox.Text, out dummy) || dummy < 0 || dummy > 1023)
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "'DAC when Closed' should be between 0 and 1023";
message += Environment.NewLine + "'ADC when Closed' should be between 0 and 1023";
}
if (!int.TryParse(dacOpenTextBox.Text, out dummy) || dummy < 0 || dummy > 1023)
if (!int.TryParse(adcOpenTextBox.Text, out dummy) || dummy < 0 || dummy > 1023)
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "'DAC when Open' should be between 0 and 1023";
message += Environment.NewLine + "'ADC when Open' should be between 0 and 1023";
}
if (!int.TryParse(stableTimeTextBox.Text, out dummy) || dummy < 200 || dummy > 1500 || (dummy % 50) != 0)
@@ -167,17 +167,17 @@ namespace TBF.BenchControl.Elde.RegulValve
flags |= CfgUpdateFlags.RestartRqrd;
}
tmp = int.Parse(dacClosedTextBox.Text);
if (config.DacValueClosed != tmp)
tmp = int.Parse(adcClosedTextBox.Text);
if (config.AdcValueClosed != tmp)
{
config.DacValueClosed = tmp;
config.AdcValueClosed = tmp;
flags |= CfgUpdateFlags.RestartRqrd;
}
tmp = int.Parse(dacOpenTextBox.Text);
if (config.DacValueOpen != tmp)
tmp = int.Parse(adcOpenTextBox.Text);
if (config.AdcValueOpen != tmp)
{
config.DacValueOpen = tmp;
config.AdcValueOpen = tmp;
flags |= CfgUpdateFlags.RestartRqrd;
}
@@ -229,20 +229,15 @@ namespace TBF.BenchControl.Elde.RegulValve
//
private void getButton1_Click(object sender, EventArgs e)
{
RegulValve.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.GetRVAdc1, config));
RegulValve.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.GetAdc1, config));
}
private void getButton2_Click(object sender, EventArgs e)
{
RegulValve.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.GetRVAdc2, config));
RegulValve.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.GetAdc2, config));
}
private void setButton1_Click(object sender, EventArgs e)
{
setButton2_Click(sender, e); /// Both Save buttons have the same effect
}
private void setButton2_Click(object sender, EventArgs e)
private void setButton_Click(object sender, EventArgs e)
{
int tmpPct1;
int tmpPct2;
@@ -260,13 +255,13 @@ namespace TBF.BenchControl.Elde.RegulValve
if ((adc1 == adc2) || (pct1 == pct2)) return;
double factor = (float)(adc2 - adc1) / (float)(pct2 - pct1);
int dacClosed = (int)((float)(0 - pct1) * factor + (float)adc1 + 0.5f);
int dacOpen = (int)((float)(100 - pct1) * factor + (float)adc1 + 0.5f);
int adcClosed = (int)((float)(0 - pct1) * factor + (float)adc1 + 0.5f);
int adcOpen = (int)((float)(100 - pct1) * factor + (float)adc1 + 0.5f);
if ((dacClosed >= 0) && (dacOpen >= 0))
if ((adcClosed >= 0) && (adcOpen >= 0))
{
dacClosedTextBox.Text = dacClosed.ToString();
dacOpenTextBox.Text = dacOpen.ToString();
adcClosedTextBox.Text = adcClosed.ToString();
adcOpenTextBox.Text = adcOpen.ToString();
}
}
@@ -291,12 +286,12 @@ namespace TBF.BenchControl.Elde.RegulValve
CmdResponseHandler += delegate(object sender, CmdResponseArgs args)
{
if (args.Command == CfgChangeCmd.GetRVAdc1)
if (args.Command == CfgChangeCmd.GetAdc1)
{
adc1 = args.Response;
adcTextBox1.Text = adc1.ToString();
}
else if (args.Command == CfgChangeCmd.GetRVAdc2)
else if (args.Command == CfgChangeCmd.GetAdc2)
{
adc2 = args.Response;
adcTextBox2.Text = adc2.ToString();
@@ -311,7 +306,7 @@ namespace TBF.BenchControl.Elde.RegulValve
void OnAdcChanged(object sender, CmdResponseArgs data)
{
if (data.Command == CfgChangeCmd.GetRVAdc && data.Idx1 == config.Idx1)
if (data.Command == CfgChangeCmd.GetAdc && data.Id == config.Idx1)
{
adcTextBox.Text = data.Response.ToString();
}