diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs
index ffd508160..52670ae0e 100644
--- a/Results/Entities/WaterMeter.cs
+++ b/Results/Entities/WaterMeter.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -43,8 +43,9 @@ namespace Results.Entities
{
public virtual int Id { get; protected set; }
public virtual string SerialNr { get; set; } /// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
- public virtual string SerialNrAux { get; set; } /// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
- public virtual string PurchaseOrder { get; set; }
+ public virtual string SerialNrAux { get; set; } /// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
+ public virtual string RadioAddress { get; set; }
+ public virtual string PurchaseOrder { get; set; }
public virtual int YearOfProduction { get; set; }
public virtual int WMPosition { get; set; } /// 1-based water meter position
public virtual string EndState { get; set; } /// End state (of the main water meter)
diff --git a/Results/ItemID.cs b/Results/ItemID.cs
index 01d9fc372..e91e5e8ea 100644
--- a/Results/ItemID.cs
+++ b/Results/ItemID.cs
@@ -333,15 +333,17 @@ namespace Results
RegValve, /// 282
X1, /// 283
- X2,
- X3,
- X4,
- X5,
- X6,
- X7,
- X8,
+ X2, /// 284
+ X3, /// 285
+ X4, /// 286
+ X5, /// 287
+ X6, /// 288
+ X7, /// 289
+ X8, /// 290
X9, /// 291
+ RadioAddress, /// 292
+
Count,
}
}
diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs
index f6af4fa25..bc758fb0e 100644
--- a/Results/Mappings/WaterMeterMap.cs
+++ b/Results/Mappings/WaterMeterMap.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2015-2017 Sensus Metering Systems
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using Results.Entities;
@@ -13,7 +13,8 @@ namespace Results.Mappings
Id(x => x.Id);
Map(x => x.SerialNr);
Map(x => x.SerialNrAux);
- Map(x => x.PurchaseOrder);
+ Map(x => x.RadioAddress);
+ Map(x => x.PurchaseOrder);
Map(x => x.YearOfProduction);
Map(x => x.WMPosition);
Map(x => x.EndState);
diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index 136cacf02..2428f9962 100644
--- a/Results/Properties/AssemblyInfo.cs
+++ b/Results/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("2.26.1622.0")]
-[assembly: AssemblyFileVersion("2.26.1622.0")]
+[assembly: AssemblyVersion("2.27.1776.0")]
+[assembly: AssemblyFileVersion("2.27.1776.0")]
diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs
index e90261970..de7a1c463 100644
--- a/Results/Resources/Strings.Designer.cs
+++ b/Results/Resources/Strings.Designer.cs
@@ -906,6 +906,15 @@ namespace Results.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Radio address.
+ ///
+ internal static string Radio_address {
+ get {
+ return ResourceManager.GetString("Radio_address", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Ref.pulses.
///
@@ -1581,6 +1590,15 @@ namespace Results.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Radio address.
+ ///
+ internal static string Tooltip_RA {
+ get {
+ return ResourceManager.GetString("Tooltip_RA", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Calculated density of water from table or formula at water density calibration temperature (r).
///
diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx
index 47e9adeeb..abd960999 100644
--- a/Results/Resources/Strings.resx
+++ b/Results/Resources/Strings.resx
@@ -831,4 +831,10 @@
Info flags
+
+ Radio address
+
+
+ Radio address
+
\ No newline at end of file
diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index f823a1fbc..dbf0d61dc 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -367,11 +367,12 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text5)));
/// Water meters results
- AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
- AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
- AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
- AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
- AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID, "Formatted WM ID", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.RadioAddress, Strings.Radio_address, Strings.Tooltip_RA, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID, "Formatted WM ID", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));
/// Water meters results (single)
AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state, Strings.End_state, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
diff --git a/TBF/BenchControl/TestMethods/S640Communication/S640CommForm.cs b/TBF/BenchControl/TestMethods/S640Communication/S640CommForm.cs
index e4c6323b7..0e6c1cd04 100644
--- a/TBF/BenchControl/TestMethods/S640Communication/S640CommForm.cs
+++ b/TBF/BenchControl/TestMethods/S640Communication/S640CommForm.cs
@@ -441,8 +441,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
if ((optoHeadsConfig & (1L << i)) != 0 && checkBoxes[i].Checked && optoHeads[i] != null)
{
/// Save PCB Number of the water meter
- ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNr = optoHeads[i].PcbNumber.ToString(); /// PCB number (640) or body number (620)
- ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNrAux = optoHeads[i].RadioAddress.ToString(); /// Radio address (640)
+ ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNr = optoHeads[i].PcbNumber.ToString(); /// PCB number (640) or body number (620)
+ ProcessData.BatchRslts.Batch.WaterMeters[i].RadioAddress = optoHeads[i].RadioAddress.ToString(); /// Radio address (640)
}
else
{
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 507c79eb8..42a72cfcc 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.26.1775.0")]
-[assembly: AssemblyFileVersion("2.26.1775.0")]
+[assembly: AssemblyVersion("2.27.1776.0")]
+[assembly: AssemblyFileVersion("2.27.1776.0")]