Modbus.PressureMeter.Meter component added, ver. 2.10.357

TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/Factory.cs

@@ -0,0 +1,26 @@
+///
+/// Copyright (c) 2016 Sensus Metering Systems
+///
+using System.Collections.Generic;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.Modbus.PressureMeter.Meret
+{
+	public class Factory : IComponentFactory
+	{
+		public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+
+		public void ResetStaticProperties() { PressureMeter.ResetStaticProperties(); }
+
+		public IComponent DummyComponent() { return new PressureMeter(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new PressureMeter(cfg, components); }
+
+		public IComponentCfg DefaultConfig() { return new PressureMeterCfg(this); }
+
+		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+        {
+            return ComponentCfgBase.CreateFromDbEntity(typeof(PressureMeterCfg), component, this);
+        }
+	}
+}

TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs

@@ -0,0 +1,96 @@
+///
+/// Copyright (c) 2016 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using log4net;
+using TBF.BenchControl.Generic;
+using TBF.Boxes;
+
+namespace TBF.BenchControl.Modbus.PressureMeter.Meret
+{
+	public class PressureMeter : ComponentBase, GenericDevices.IPressureMeter, IDevice
+	{
+		private static readonly ILog log = LogManager.GetLogger(typeof(PressureMeter));
+        public override string ToString() { return string.Format("PressureMeter({0})", Cfg.ToString(1)); }
+
+		readonly PressureMeterCfg pressureMeterCfg;
+	    readonly GenericDevices.IModbus modbus;
+
+        private ushort currentOutputs;
+
+        const ushort WatchdogBitMask = 0x0010;
+
+		public PressureMeter()
+		{
+		}
+
+		public PressureMeter(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
+            : base(cfg)
+		{
+			pressureMeterCfg = cfg as PressureMeterCfg;
+
+			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());
+		}
+
+        /// <summary>Initialize this device</summary>
+        public void Initialize()
+        {
+        }
+
+
+		/// <summary>
+		/// Returns the water pressure
+		/// </summary>
+		/// <returns>Pressure in mBar</returns>
+		public float ReadPressure()
+		{
+			return (float)Config.Units.ConvertFrom(Config.Unit.kPa, 1.0F);
+		}
+
+		/// <summary>
+		/// Events:  PressureDone, Error
+		/// </summary>
+		/// <param name="pressure">Reference to a variable for the pressure in Bar</param>
+		/// <returns>ReadPressureOp instance reference casted to IOperaton</returns>
+		public IOperation ReadPressureOp(ref FloatBox pressure)
+		{
+			return new ReadPressureOp(this, ref pressure);
+		}
+
+		/// <summary>
+		/// Events:  pressureDone, Error
+		/// </summary>
+		/// <param name="pressure">Reference to a variable for the pressure in Bar</param>
+		/// <param name="pressureDone">Event returned when measurement done</param>
+		/// <returns>ReadPressureOp instance reference casted to IOperaton</returns>
+		public IOperation ReadPressureOp(ref FloatBox pressure, Event pressureDone)
+		{
+			return new ReadPressureOp(this, ref pressure, pressureDone);
+		}
+
+
+        /// <summary>Run this device</summary>
+        public void RunDeviceBefore()
+        {
+        }
+
+        /// <summary>Run this device</summary>
+        public void RunDeviceAfter()
+        {
+            currentOutputs = (UInt16)((Int32)currentOutputs ^ (Int32)WatchdogBitMask);
+            //SendOutputs(currentOutputs);
+        }
+
+        /// <summary>Stop this device</summary>
+        public void StopDevice()
+        {
+        }
+	}
+}

TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs

@@ -0,0 +1,43 @@
+///
+/// Copyright (c) 2016 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.Modbus.PressureMeter.Meret
+{
+    public class PressureMeterCfg : ComponentCfgBase, Generic.IChildComponentCfg
+	{
+		public IComponentCfgCtrl GetControl() { return new PressureMeterCfgCtrl(); }
+
+		///
+		/// Serialized parameters 
+		///
+		public byte ModbusAddress;		/// 1..255
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		PressureMeterCfg()
+		{
+            Name = "Pr";
+            ParentName = "Modbus";
+            ModbusAddress = 49;
+        }
+
+        public PressureMeterCfg(IComponentFactory factory)
+            : this()
+        {
+            this.Factory = factory;
+        }
+
+		public string ToString(int i)
+		{
+			return string.Format("Name={0}, ModbusAddr={1}, Parent={2}",
+                                 Name,
+								 ModbusAddress,
+								 (string.IsNullOrEmpty(ParentName) ? "-" : ParentName));
+		}
+	}
+}

TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs

@@ -0,0 +1,106 @@
+///
+/// Copyright (c) 2016 Sensus Metering Systems
+///
+using System;
+using System.Windows.Forms;
+using log4net;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.Modbus.PressureMeter.Meret
+{
+	public partial class PressureMeterCfgCtrl : UserControl, IComponentCfgCtrl
+	{
+		static readonly ILog log = LogManager.GetLogger(typeof(PressureMeterCfgCtrl));
+
+		ComponentParametersDlg parent;
+
+		public bool ShowMore { get { return false; } }
+
+		PressureMeterCfg config;
+		public IComponentCfg Config
+		{
+			get { return config as IComponentCfg; }
+			set
+			{
+				config = value as PressureMeterCfg;
+				Redraw();
+			}
+		}
+
+		public PressureMeterCfgCtrl()
+		{
+			InitializeComponent();
+		}
+
+		private void PressureMeterCfgCtrl_Load(object sender, EventArgs e)
+		{
+			parent = ParentForm as ComponentParametersDlg;
+			if (parent == null) return;
+
+			if (parent.TbfComponents != null)
+			{
+				foreach (var cmpnt in parent.TbfComponents)
+				{
+					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.Common.Factory)
+					{
+						parentNameComboBox.Items.Add(cmpnt.Name);
+					}
+				}
+			}
+
+			Redraw();
+		}
+
+		public void Closing()
+		{
+		}
+
+		void Redraw()
+		{
+			if (config == null) return;			/// Control was not loaded, settings were not changed
+												
+			componentNameLabel.Text = config.Factory.ClassName;
+			nameTextBox.Text = config.Name;
+			parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
+			modbusAddressTextBox.Text = config.ModbusAddress.ToString();
+		}
+
+		public void Unlock()
+		{
+			nameTextBox.Enabled = true;
+			parentNameComboBox.Enabled = true;
+			modbusAddressTextBox.Enabled = true;
+		}
+
+		public CfgUpdateFlags VerifyCfg(ref string message)
+		{
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+			int dummy;
+			if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "Invalid 'Parent Name'";
+			}
+			if (!int.TryParse(modbusAddressTextBox.Text, out dummy) || dummy < 0 || dummy > 255)
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "'Modbus Address' should be between 0 and 255";
+			}
+			return flags;
+		}
+
+		public CfgUpdateFlags UpdateCfg()
+		{
+			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
+
+			config.Name = nameTextBox.Text;
+			config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
+			config.ModbusAddress = (byte)int.Parse(modbusAddressTextBox.Text);
+
+			return flags;
+		}
+	}
+}

TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.designer.cs

@@ -0,0 +1,133 @@
+///
+/// Copyright (c) 2016 Sensus Metering Systems
+///
+namespace TBF.BenchControl.Modbus.PressureMeter.Meret
+{
+	partial class PressureMeterCfgCtrl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.parentNameLabel = new System.Windows.Forms.Label();
+			this.nameTextBox = new System.Windows.Forms.TextBox();
+			this.nameLabel = new System.Windows.Forms.Label();
+			this.componentNameLabel = new System.Windows.Forms.Label();
+			this.modbusAddressLabel = new System.Windows.Forms.Label();
+			this.modbusAddressTextBox = new System.Windows.Forms.TextBox();
+			this.parentNameComboBox = new System.Windows.Forms.ComboBox();
+			this.SuspendLayout();
+			// 
+			// parentNameLabel
+			// 
+			this.parentNameLabel.AutoSize = true;
+			this.parentNameLabel.Location = new System.Drawing.Point(28, 81);
+			this.parentNameLabel.Name = "parentNameLabel";
+			this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
+			this.parentNameLabel.TabIndex = 3;
+			this.parentNameLabel.Text = "Parent Name";
+			// 
+			// nameTextBox
+			// 
+			this.nameTextBox.Enabled = false;
+			this.nameTextBox.Location = new System.Drawing.Point(138, 52);
+			this.nameTextBox.Name = "nameTextBox";
+			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+			this.nameTextBox.TabIndex = 2;
+			// 
+			// nameLabel
+			// 
+			this.nameLabel.AutoSize = true;
+			this.nameLabel.Location = new System.Drawing.Point(28, 55);
+			this.nameLabel.Name = "nameLabel";
+			this.nameLabel.Size = new System.Drawing.Size(35, 13);
+			this.nameLabel.TabIndex = 1;
+			this.nameLabel.Text = "Name";
+			// 
+			// componentNameLabel
+			// 
+			this.componentNameLabel.AutoSize = true;
+			this.componentNameLabel.Location = new System.Drawing.Point(135, 28);
+			this.componentNameLabel.Name = "componentNameLabel";
+			this.componentNameLabel.Size = new System.Drawing.Size(83, 13);
+			this.componentNameLabel.TabIndex = 0;
+			this.componentNameLabel.Text = "ComonentName";
+			// 
+			// modbusAddressLabel
+			// 
+			this.modbusAddressLabel.AutoSize = true;
+			this.modbusAddressLabel.Location = new System.Drawing.Point(28, 133);
+			this.modbusAddressLabel.Name = "modbusAddressLabel";
+			this.modbusAddressLabel.Size = new System.Drawing.Size(86, 13);
+			this.modbusAddressLabel.TabIndex = 7;
+			this.modbusAddressLabel.Text = "Modbus Address";
+			// 
+			// modbusAddressTextBox
+			// 
+			this.modbusAddressTextBox.Enabled = false;
+			this.modbusAddressTextBox.Location = new System.Drawing.Point(138, 130);
+			this.modbusAddressTextBox.Name = "modbusAddressTextBox";
+			this.modbusAddressTextBox.Size = new System.Drawing.Size(46, 20);
+			this.modbusAddressTextBox.TabIndex = 8;
+			// 
+			// parentNameComboBox
+			// 
+			this.parentNameComboBox.Enabled = false;
+			this.parentNameComboBox.FormattingEnabled = true;
+			this.parentNameComboBox.Location = new System.Drawing.Point(138, 78);
+			this.parentNameComboBox.Name = "parentNameComboBox";
+			this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
+			this.parentNameComboBox.TabIndex = 4;
+			// 
+			// ComponentCfgCtrl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.parentNameComboBox);
+			this.Controls.Add(this.modbusAddressTextBox);
+			this.Controls.Add(this.modbusAddressLabel);
+			this.Controls.Add(this.parentNameLabel);
+			this.Controls.Add(this.nameTextBox);
+			this.Controls.Add(this.nameLabel);
+			this.Controls.Add(this.componentNameLabel);
+			this.Name = "ComponentCfgCtrl";
+			this.Size = new System.Drawing.Size(300, 200);
+			this.Load += new System.EventHandler(this.PressureMeterCfgCtrl_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label parentNameLabel;
+		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Label nameLabel;
+		private System.Windows.Forms.Label componentNameLabel;
+		private System.Windows.Forms.Label modbusAddressLabel;
+		private System.Windows.Forms.TextBox modbusAddressTextBox;
+		private System.Windows.Forms.ComboBox parentNameComboBox;
+	}
+}

TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/ReadPressureOp.cs

@@ -0,0 +1,64 @@
+///
+/// Copyright (c) 2016 Sensus Metering Systems
+///
+using System;
+using log4net;
+using TBF.Boxes;
+
+namespace TBF.BenchControl.Modbus.PressureMeter.Meret
+{
+	public class ReadPressureOp : IOperation
+	{
+		private static readonly ILog log = LogManager.GetLogger(typeof(ReadPressureOp));
+		public override string ToString() { return string.Format("ReadPressureOp(.,{0},.)", eventDone); }
+
+		/// Set by the constructor
+        readonly PressureMeter pressureMeter;
+		readonly Event eventDone;
+
+        /// Measured value
+        FloatBox pressure;
+
+		/// <summary>
+		/// Events:  PressureInDone, PressureOutDone or Error
+		/// </summary>
+		/// <param name="pressureMeter">Pressure meter reference</param>
+		/// <param name="pressure">Reference to the measured pressure variable, value is in bar</param>
+		/// <param name="eventDone">Event to be returned by Run() when completed OK</param>
+		public ReadPressureOp(PressureMeter pressureMeter, ref FloatBox pressure, Event eventDone)
+        {
+			if (pressureMeter == null) throw new ArgumentNullException("pressureMeter");
+            this.pressureMeter = pressureMeter;
+            this.pressure = pressure;
+            this.eventDone = eventDone;
+
+			log.Debug(this.ToString());
+        }
+        public ReadPressureOp(PressureMeter pressureMeter, ref FloatBox pressure)
+			: this(pressureMeter, ref pressure, Event.PressureDone)
+		{
+		}
+
+
+		/// <summary>Start this operation</summary>
+		public void Start()
+        {
+            pressure.Val = pressureMeter.ReadPressure();
+        }
+
+		/// <summary>Run this operation</summary>
+		/// <returns>
+		///		Event.PressureInDone or Event.PressureOutDone
+		/// </returns>
+		public Event Run()
+		{
+            pressure.Val = pressureMeter.ReadPressure();
+			return eventDone;
+		}
+
+		/// <summary>Stop this operation</summary>
+		public void Stop()
+		{
+		}
+	}
+}

TestBenchFramework/BenchControl/TbfComponents.cs

@@ -63,6 +63,7 @@ namespace TBF.BenchControl
             Factories.Add(new MettlerToledo.Standard.BalanceNewFactory());						/// MettlerToledoBalanceSN
 			Factories.Add(new MettlerToledo.Multi.BalanceFactory());							/// MettlerToledo-Multi
 			Factories.Add(new Modbus.Common.Factory());											/// Modbus
+			Factories.Add(new Modbus.PressureMeter.Meret.Factory());							/// Meret pressure meter connected via modbus
 			Factories.Add(new Output.FileWriters.Basic.FactorySingle());						/// Output.FileWriters.Basic.Single
 			Factories.Add(new Output.FileWriters.Basic.FactoryCompound());						/// Output.FileWriters.Basic.Compound
             Factories.Add(new Output.FileWriters.Enhanced.FactorySingle());						/// Output.FileWriters.Basic.Single

TestBenchFramework/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.10.356.1")]
+[assembly: AssemblyVersion("2.10.357.1")]
-[assembly: AssemblyFileVersion("2.10.356.1")]
+[assembly: AssemblyFileVersion("2.10.357.1")]

TestBenchFramework/TBF.csproj

@@ -437,6 +437,16 @@
       <DependentUpon>ModbusCfgCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="BenchControl\Modbus\Common\Factory.cs" />
+    <Compile Include="BenchControl\Modbus\PressureMeter\Meret\Factory.cs" />
+    <Compile Include="BenchControl\Modbus\PressureMeter\Meret\PressureMeter.cs" />
+    <Compile Include="BenchControl\Modbus\PressureMeter\Meret\PressureMeterCfg.cs" />
+    <Compile Include="BenchControl\Modbus\PressureMeter\Meret\PressureMeterCfgCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="BenchControl\Modbus\PressureMeter\Meret\PressureMeterCfgCtrl.designer.cs">
+      <DependentUpon>PressureMeterCfgCtrl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="BenchControl\Modbus\PressureMeter\Meret\ReadPressureOp.cs" />
     <Compile Include="BenchControl\Modbus\QuidoRS\QuidoRS.cs" />
     <Compile Include="BenchControl\Modbus\QuidoRS\QuidoRSCfg.cs" />
     <Compile Include="BenchControl\Modbus\QuidoRS\QuidoRSCfgCtrl.cs">
@@ -1702,6 +1712,9 @@
     <EmbeddedResource Include="BenchControl\Modbus\Common\ModbusCfgCtrl.resx">
       <DependentUpon>ModbusCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="BenchControl\Modbus\PressureMeter\Meret\PressureMeterCfgCtrl.resx">
+      <DependentUpon>PressureMeterCfgCtrl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="BenchControl\Modbus\QuidoRS\QuidoRSCfgCtrl.resx">
       <DependentUpon>QuidoRSCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>