diff --git a/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs index 8bbd304eb..7ad745978 100644 --- a/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs +++ b/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs @@ -58,7 +58,9 @@ namespace TBF.BenchControl.Elde.PressureMeter /// Pressure in mBar 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; } diff --git a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs index 74f60d1ca..9a7f47d3c 100644 --- a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs +++ b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs @@ -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 /// Pressure in mBar 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; } /// diff --git a/TBF/MetrologyDlg.cs b/TBF/MetrologyDlg.cs index 3e3d40a7b..f2ccc2837 100644 --- a/TBF/MetrologyDlg.cs +++ b/TBF/MetrologyDlg.cs @@ -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 + " ");