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

ParamValues() retval IList->ICollection, GetControl() arg. is a list of components, ver. 3.1.1598

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-02 01:10:04 +01:00
parent 8dc45484b0
commit c950cc231c
182 changed files with 606 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Modbus/Ambient/Comet/AmbientCfg.cs
+8 -6
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.Ambient.Comet
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[] { "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@@ -126,16 +128,16 @@ namespace TBF.BenchControl.Modbus.Ambient.Comet
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
case 1:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
case 5:
return new List<string>(new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" });
return new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" };
case 9:
return new List<string>(new string[] { "R%" });
return new string[] { "R%" };
default:
return null;
}
TBF/BenchControl/Modbus/Common/ModbusCfg.cs
+14 -22
View File
@@ -15,7 +15,7 @@ namespace TBF.BenchControl.Modbus.Common
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ModbusCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@@ -62,35 +62,27 @@ namespace TBF.BenchControl.Modbus.Common
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> values = new List<string>();
switch (i)
{
case 1:
return new List<string>(new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"});
return new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"};
case 2:
values.Add(Parity.None.ToString());
values.Add(Parity.Odd.ToString());
values.Add(Parity.Even.ToString());
return values;
return new string[] { Parity.None.ToString(), Parity.Odd.ToString(), Parity.Even.ToString() };
case 3:
values.Add(7.ToString());
values.Add(8.ToString());
return values;
return new string[] { "7", "8" };
case 4:
values.Add(StopBits.None.ToString());
values.Add(StopBits.One.ToString());
values.Add(StopBits.OnePointFive.ToString());
values.Add(StopBits.Two.ToString());
return values;
return new string[] { StopBits.None.ToString(),
StopBits.One.ToString(),
StopBits.OnePointFive.ToString(),
StopBits.Two.ToString() };
case 5:
values.Add(Handshake.None.ToString());
values.Add(Handshake.XOnXOff.ToString());
values.Add(Handshake.RequestToSend.ToString());
values.Add(Handshake.RequestToSendXOnXOff.ToString());
return values;
return new string[] { Handshake.None.ToString(),
Handshake.XOnXOff.ToString(),
Handshake.RequestToSend.ToString(),
Handshake.RequestToSendXOnXOff.ToString() };
default:
return null;
}
TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs
+2 -2
View File
@@ -1,7 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@@ -13,7 +13,7 @@ namespace TBF.BenchControl.Modbus.Easytherm
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EasythermCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EasythermCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EasythermCfgCtrl(); }
///
/// Serialized parameters
TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs
+6 -4
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PressureMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[] { "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@@ -97,12 +99,12 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
case 3:
return new List<string>(new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" });
return new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" };
default:
return null;
}
TBF/BenchControl/Modbus/PumpFM/DanfossVLT/PumpCfg.cs
+3 -2
View File
@@ -2,10 +2,11 @@
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
using System.Collections.Generic;
namespace TBF.BenchControl.Modbus.PumpFM.DanfossVLT
{
@@ -14,7 +15,7 @@ namespace TBF.BenchControl.Modbus.PumpFM.DanfossVLT
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PumpCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PumpCfgCtrl(); }
///
/// Serialized parameters
TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs
+2 -1
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Modbus.QuidoRS
@@ -23,7 +24,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(QuidoRSCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new QuidoRSCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new QuidoRSCfgCtrl(); }
///
/// Serialized parameters
TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs
+4 -1
View File
@@ -1,7 +1,10 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Modbus.TankSelector
@@ -11,7 +14,7 @@ namespace TBF.BenchControl.Modbus.TankSelector
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TankSelectorCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TankSelectorCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TankSelectorCfgCtrl(); }
///
/// Serialized parameters
TBF/BenchControl/Modbus/TempMeter/Groch/TempMeterCfg.cs
+6 -4
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.TempMeter.Groch
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[]{ "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@@ -112,7 +114,7 @@ namespace TBF.BenchControl.Modbus.TempMeter.Groch
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
@@ -121,7 +123,7 @@ namespace TBF.BenchControl.Modbus.TempMeter.Groch
for (int j = 0; j < 16; j++) values.Add(j.ToString());
return values;
case 8:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
default:
return null;
}
TBF/BenchControl/Modbus/TempMeter/Meret/TempMeterCfg.cs
+6 -4
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.TempMeter.Meret
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[] { "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@@ -98,12 +100,12 @@ namespace TBF.BenchControl.Modbus.TempMeter.Meret
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
case 3:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
default:
return null;
}
TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs
+4 -16
View File
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@@ -15,22 +16,9 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(LevelMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
IList<string> parents = new List<string>();
// TODO:
//if (StateMachine.Components != null)
//{
// foreach (var cmpnt in StateMachine.Components)
// {
// if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Modbus.Common.Factory)
// {
// parents.Add(cmpnt.Name);
// }
// }
//}
parents.Add("Modbus");
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
@@ -65,7 +53,7 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i) { return null; }
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{
TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs
+4 -17
View File
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@@ -15,23 +16,9 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(AnalyzerCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
IList<string> parents = new List<string>();
// TODO:
//if (StateMachine.Components != null)
//{
// foreach (var cmpnt in StateMachine.Components)
// {
// if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Modbus.Common.Factory)
// {
// parents.Add(cmpnt.Name);
// }
// }
//}
parents.Add("Modbus");
parents.Add("ModbusUSB");
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
@@ -66,7 +53,7 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i) { return null; }
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{