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

(1) MetrologyDlg displays corrections for all pressure meters, (2) Elde.PressureMeter and Modbus.PressureMeter.Meret use corrections.

Browse Source
This commit is contained in:
Milan Hanajik
2019-03-04 09:20:16 +01:00
parent 13eb7138a3
commit b10ab44fa9
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs
+3 -1
View File
@@ -58,7 +58,9 @@ namespace TBF.BenchControl.Elde.PressureMeter
/// <returns>Pressure in mBar</returns>
public float ReadPressure()
{
return (float)Config.Units.ConvertFrom(Config.Unit.kPa, ControlBoard.Pressure(Idx0));
double rawPressure = Config.Units.ConvertFrom(Config.Unit.kPa, ControlBoard.Pressure(Idx0));
double correctedPressure = Config.Formulas.CorrectedValue(rawPressure, Corrections);
return (float)correctedPressure;
}
TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs
+3 -4
View File
@@ -33,9 +33,6 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
modbus = (GenericDevices.IModbus)TbfComponents.FindComponent(cfg.ParentName, components);
if (modbus == null) throw new Exception("Cannot find " + Name + " parent");
/// Connect to handler
//ModbusAddress.MeretRS485Address[Idx0] = ModbusAddress;
log.Debug(this.ToString());
}
@@ -51,7 +48,9 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
/// <returns>Pressure in mBar</returns>
public float ReadPressure()
{
return (float)Config.Units.ConvertFrom(Config.Unit.kPa, receivedPressure);
double rawPressure = Config.Units.ConvertFrom(Config.Unit.kPa, receivedPressure);
double correctedPressure = Config.Formulas.CorrectedValue(rawPressure, Corrections);
return (float)correctedPressure;
}
/// <summary>
TBF/MetrologyDlg.cs
+3 -1
View File
@@ -121,7 +121,9 @@ namespace TBF
}
/// Pressure meter tab-pages
if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory)
if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory ||
factory is BenchControl.Elde.PressureMeterInternal.PressureMeterFactory ||
factory is BenchControl.Modbus.PressureMeter.Meret.Factory)
{
pressMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");