MeasurementRecord: - NegativeReverseVolumeCm, ForwardVolumeCm and FLowRateCmPerH added,
MagFlux: - Streaming decoder multiplies reverse volume with -1.0 to create the negative reverse volume
This commit is contained in:
@@ -14,5 +14,5 @@ using System.Reflection;
|
||||
//[assembly: AssemblyVersion("1.2.*.0")]
|
||||
|
||||
|
||||
[assembly: AssemblyVersion("2.5.0.*")]
|
||||
[assembly: AssemblyFileVersion("2.5.0.0")]
|
||||
[assembly: AssemblyVersion("2.6.0.*")]
|
||||
[assembly: AssemblyFileVersion("2.6.0.0")]
|
||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
-16
@@ -11,21 +11,6 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.DataPackages.MeasurementRecor
|
||||
public class MagFluxRecord : MeasurementRecord
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Reverse volume in cubic meters
|
||||
/// </summary>
|
||||
public Double ForwardVolumeCm;
|
||||
|
||||
/// <summary>
|
||||
/// Reverse volume in cubic meters
|
||||
/// </summary>
|
||||
public Double ReverseVolumeCm;
|
||||
|
||||
/// <summary>
|
||||
/// Flow rate in cubic meters per hour
|
||||
/// </summary>
|
||||
public Double FlowRateCmPh;
|
||||
|
||||
/// <summary>
|
||||
/// Sensor Id of MagFlux
|
||||
/// </summary>
|
||||
@@ -54,7 +39,7 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.DataPackages.MeasurementRecor
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
sb = sb.Append($"Volume [m³]: {VolumeCm}").Append(StringDelimiter)
|
||||
.Append($"Reverse Volume [m³]: {ReverseVolumeCm}").Append(StringDelimiter)
|
||||
.Append($"Negative Reverse Volume [m³]: {NegativeReverseVolumeCm}").Append(StringDelimiter)
|
||||
.Append($"CPU Time [s]: {TimeS}").Append(StringDelimiter)
|
||||
.Append($"FlowRate [m³/h]: {FlowRateCmPh}").Append(StringDelimiter)
|
||||
.Append($"Status: 0x{StatusBits:X8}").Append(StringDelimiter)
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.Protocols.StreamingProtocol
|
||||
{
|
||||
VolumeCm = 0.0,
|
||||
ForwardVolumeCm = 0.0,
|
||||
ReverseVolumeCm = 0.0,
|
||||
NegativeReverseVolumeCm = 0.0,
|
||||
TimeS = 0.0,
|
||||
FlowRateCmPh = 0.0,
|
||||
StatusBits = 0,
|
||||
@@ -178,6 +178,9 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.Protocols.StreamingProtocol
|
||||
/// <remarks date="2023-Jun-06" author="T.Wiedebusch">
|
||||
/// - Calculated sum volume from forward- minus reverse-volume.
|
||||
/// </remarks>
|
||||
/// <remarks date="2023-Jun-07" author="T.Wiedebusch">
|
||||
/// - Reverse volume multiplied with -1.0 as the test bench expects a negative value for reverse volume.
|
||||
/// </remarks>
|
||||
private static void DecodeProtocolL(ref MagFluxRecord dataMagFluxRec, IList<String> fields)
|
||||
{
|
||||
// time stamp attachment
|
||||
@@ -189,11 +192,11 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.Protocols.StreamingProtocol
|
||||
// build result values
|
||||
dataMagFluxRec.ForwardVolumeCm = UInt64.Parse(fields[(Int32)ProtLsubString.FwdVolume],
|
||||
NumberStyles.AllowHexSpecifier) * MilliLitersToCmFactor;
|
||||
dataMagFluxRec.ReverseVolumeCm = UInt64.Parse(fields[(Int32)ProtLsubString.RevVolume],
|
||||
NumberStyles.AllowHexSpecifier) * MilliLitersToCmFactor;
|
||||
dataMagFluxRec.NegativeReverseVolumeCm = UInt64.Parse(fields[(Int32)ProtLsubString.RevVolume],
|
||||
NumberStyles.AllowHexSpecifier) * MilliLitersToCmFactor * -1.0;
|
||||
dataMagFluxRec.TimeS = UInt32.Parse(fields[(Int32)ProtLsubString.CpuTime],
|
||||
NumberStyles.AllowHexSpecifier) * CpuTimeToSecondsFactor;
|
||||
dataMagFluxRec.VolumeCm = dataMagFluxRec.ForwardVolumeCm - dataMagFluxRec.ReverseVolumeCm;
|
||||
dataMagFluxRec.VolumeCm = dataMagFluxRec.ForwardVolumeCm + dataMagFluxRec.NegativeReverseVolumeCm;
|
||||
|
||||
// parse the floating point value of the flow rate which is a string containing the hex value as 32 bit
|
||||
var hex = UInt32.Parse(fields[(Int32)ProtLsubString.FlowRate], NumberStyles.AllowHexSpecifier);
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
5ed75d99ee45ff67821090f1b3dbb001dd9e4fe3
|
||||
1a3d4919c9c702245832d925951f2b7cb72fc333
|
||||
|
||||
@@ -19,6 +19,21 @@ namespace Xylem.Common.Metrology.Measurements
|
||||
/// </summary>
|
||||
public Double VolumeCm;
|
||||
|
||||
/// <summary>
|
||||
/// Reverse volume in cubic meters
|
||||
/// </summary>
|
||||
public Double ForwardVolumeCm;
|
||||
|
||||
/// <summary>
|
||||
/// Reverse volume in cubic meters as negative value
|
||||
/// </summary>
|
||||
public Double NegativeReverseVolumeCm;
|
||||
|
||||
/// <summary>
|
||||
/// Flow rate in cubic meters per hour
|
||||
/// </summary>
|
||||
public Double FlowRateCmPh;
|
||||
|
||||
/// <summary>
|
||||
/// Overflow volume
|
||||
/// </summary>
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
0d85a5b3a7561b41163c20e5dc7713bcd0d65555
|
||||
f64d563def603c89cafafa61a3219ba97e1e344c
|
||||
|
||||
@@ -285,7 +285,7 @@ namespace Xylem.Common.Ui.MagFluxToolBox
|
||||
{
|
||||
tbxVolume.Text = $@"{e.NewData.VolumeCm:F3}";
|
||||
tbxFwdVolume.Text = $@"{e.NewData.ForwardVolumeCm:F3}";
|
||||
tbxRevVolume.Text = $@"{e.NewData.ReverseVolumeCm:F3}";
|
||||
tbxRevVolume.Text = $@"{e.NewData.NegativeReverseVolumeCm:F3}";
|
||||
tbxFlowRate.Text = $@"{e.NewData.FlowRateCmPh:F3}";
|
||||
tbxStatus.Text = $@"0x{e.NewData.StatusBits:X8}";
|
||||
tbxTime.Text = $@"{e.NewData.TimeS:F3}";
|
||||
|
||||
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.7.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.7.0.0")]
|
||||
[assembly: AssemblyVersion("1.8.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.8.0.0")]
|
||||
|
||||
Reference in New Issue
Block a user