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

Malta : Minor changes, extended range of Id-s for flow meters and pressure meters, ver.2.10.354

Browse Source
This commit is contained in:
Milan Hanajik
2016-10-06 14:02:16 +02:00
parent dff3a1aff7
commit 295e96098c
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
+8
View File
@@ -85,11 +85,19 @@ namespace TBF.BenchControl.Elde.FlowMeter
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "Invalid 'Parent Name'";
}
#if MALTA_WSD25
if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 8)
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "'Idx1' should be between 0 and 8";
}
#else
if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 1 || dummy > 7)
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "'Idx1' should be between 1 and 7";
}
#endif
float fdummy;
if (!Utils.TryParseUFloat(nominalFlowTextBox.Text, out fdummy) || fdummy < 0.01 || fdummy > 1600)
{
TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
+2 -2
View File
@@ -84,10 +84,10 @@ namespace TBF.BenchControl.Elde.PressureMeter
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "Invalid 'Parent Name'";
}
if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 7)
if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 15)
{
flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "'Position' should be between 0 and 7";
message += Environment.NewLine + "'Position' should be between 0 and 15";
}
if (!int.TryParse(rs485AddressTextBox.Text, out dummy) || dummy < 0 || dummy > 255)
{