diff --git a/AppDiagnostic/AppDiagnostic.csproj b/AppDiagnostic/AppDiagnostic.csproj index cef866153..a1fb98fd1 100644 --- a/AppDiagnostic/AppDiagnostic.csproj +++ b/AppDiagnostic/AppDiagnostic.csproj @@ -8,7 +8,7 @@ WinExe AppDiagnostic AppDiagnostic - v4.7.2 + v4.8 512 true true @@ -102,4 +102,4 @@ - \ No newline at end of file + diff --git a/Common/Common.csproj b/Common/Common.csproj index c8dab6ef0..e75a63226 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties Common Common - v4.7.2 + v4.8 512 @@ -114,4 +114,4 @@ --> - \ No newline at end of file + diff --git a/Config/Config.csproj b/Config/Config.csproj index 3ce343348..0cf5dd778 100644 --- a/Config/Config.csproj +++ b/Config/Config.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Config Config - v4.7.2 + v4.8 512 @@ -150,4 +150,4 @@ --> - \ No newline at end of file + diff --git a/DataMatrix4Net/DataMatrix4Net.csproj b/DataMatrix4Net/DataMatrix4Net.csproj index 153ed4cb2..851482f15 100644 --- a/DataMatrix4Net/DataMatrix4Net.csproj +++ b/DataMatrix4Net/DataMatrix4Net.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties DataMatrix4Net DataMatrix4Net - v4.7.2 + v4.8 512 @@ -58,4 +58,4 @@ --> - \ No newline at end of file + diff --git a/DataStreamInterface/DataStreamInterface.csproj b/DataStreamInterface/DataStreamInterface.csproj index df67cc35b..4cab37521 100644 --- a/DataStreamInterface/DataStreamInterface.csproj +++ b/DataStreamInterface/DataStreamInterface.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties DataStreamInterface DataStreamInterface - v4.7.2 + v4.8 512 @@ -61,4 +61,4 @@ --> - \ No newline at end of file + diff --git a/Decrypt/Decrypt.csproj b/Decrypt/Decrypt.csproj index 17fc4022c..c97d3e5d2 100644 --- a/Decrypt/Decrypt.csproj +++ b/Decrypt/Decrypt.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Decrypt Decrypt - v4.7.2 + v4.8 512 @@ -63,4 +63,4 @@ --> - \ No newline at end of file + diff --git a/DeviceTest/DeviceTest.csproj b/DeviceTest/DeviceTest.csproj index 4df32557c..26721fa4e 100644 --- a/DeviceTest/DeviceTest.csproj +++ b/DeviceTest/DeviceTest.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties DeviceTest DeviceTest - v4.7.2 + v4.8 512 @@ -114,4 +114,4 @@ --> - \ No newline at end of file + diff --git a/Dirichlet.Numerics/Dirichlet.Numerics.csproj b/Dirichlet.Numerics/Dirichlet.Numerics.csproj index 9efef9c34..ea3ba8ebc 100644 --- a/Dirichlet.Numerics/Dirichlet.Numerics.csproj +++ b/Dirichlet.Numerics/Dirichlet.Numerics.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Dirichlet.Numerics Dirichlet.Numerics - v4.7.2 + v4.8 512 @@ -51,4 +51,4 @@ --> - \ No newline at end of file + diff --git a/Encrypt/Encrypt.csproj b/Encrypt/Encrypt.csproj index 39742e459..26184aa89 100644 --- a/Encrypt/Encrypt.csproj +++ b/Encrypt/Encrypt.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Encrypt Encrypt - v4.7.2 + v4.8 512 @@ -63,4 +63,4 @@ --> - \ No newline at end of file + diff --git a/EventViewer/EventViewer.csproj b/EventViewer/EventViewer.csproj index 5bcfac64c..421530f14 100644 --- a/EventViewer/EventViewer.csproj +++ b/EventViewer/EventViewer.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties EventViewer EventViewer - v4.7.2 + v4.8 512 @@ -142,4 +142,4 @@ --> - \ No newline at end of file + diff --git a/FeatureVectorCalculator/FeatureVectorCalculator.csproj b/FeatureVectorCalculator/FeatureVectorCalculator.csproj index 0c4ba5275..5ffd9d768 100644 --- a/FeatureVectorCalculator/FeatureVectorCalculator.csproj +++ b/FeatureVectorCalculator/FeatureVectorCalculator.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties FeatureVectorCalculator FeatureVectorCalculator - v4.7.2 + v4.8 512 @@ -97,4 +97,4 @@ --> - \ No newline at end of file + diff --git a/GemCard/GemCard.csproj b/GemCard/GemCard.csproj index e3993d092..a20b0c517 100644 --- a/GemCard/GemCard.csproj +++ b/GemCard/GemCard.csproj @@ -1,4 +1,4 @@ - + Local @@ -28,7 +28,7 @@ 3.5 - v4.7.2 + v4.8 publish\ true Disk @@ -180,4 +180,4 @@ - \ No newline at end of file + diff --git a/GenCode128/GenCode128.csproj b/GenCode128/GenCode128.csproj index e3e9a8dac..effa854df 100644 --- a/GenCode128/GenCode128.csproj +++ b/GenCode128/GenCode128.csproj @@ -1,4 +1,4 @@ - + Local @@ -35,7 +35,7 @@ - v4.7.2 + v4.8 2.0 publish\ true @@ -146,4 +146,4 @@ - \ No newline at end of file + diff --git a/GenericTest/GenericTest.csproj b/GenericTest/GenericTest.csproj index 918b66e34..b7567be3b 100644 --- a/GenericTest/GenericTest.csproj +++ b/GenericTest/GenericTest.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties GenericTest GenericTest - v4.7.2 + v4.8 512 @@ -160,4 +160,4 @@ --> - \ No newline at end of file + diff --git a/GenesisCordonelInterface/GenesisCordonelInterface.csproj b/GenesisCordonelInterface/GenesisCordonelInterface.csproj index a0bc0a997..f0ace632c 100644 --- a/GenesisCordonelInterface/GenesisCordonelInterface.csproj +++ b/GenesisCordonelInterface/GenesisCordonelInterface.csproj @@ -81,9 +81,6 @@ ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll - - ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll - ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.Registers.dll @@ -250,6 +247,10 @@ + + {04201E95-90A0-4B73-A72F-379739B2A3AE} + GenesisCore + {D0C8D887-ED52-40AB-A069-90BCE0E801E2} CordonelPreadjustmentUi diff --git a/GenesisCordonelInterface/UI/LaatzenAPI_CordonelPreadjustmentUI/FrmCordonelPreadjustmentUI.cs b/GenesisCordonelInterface/UI/LaatzenAPI_CordonelPreadjustmentUI/FrmCordonelPreadjustmentUI.cs index 8055bf04e..cfc5b7bb9 100644 --- a/GenesisCordonelInterface/UI/LaatzenAPI_CordonelPreadjustmentUI/FrmCordonelPreadjustmentUI.cs +++ b/GenesisCordonelInterface/UI/LaatzenAPI_CordonelPreadjustmentUI/FrmCordonelPreadjustmentUI.cs @@ -13,6 +13,7 @@ using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore; using Xylem.Common.Hardware.WaterMeter.WaterMeterCore; using Xylem.Common.Ui.CordonelPreadjustmentUi; +using CordonelPreadjustmentUi; using static Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.GenesisMeter; using System.Linq;//...MF diff --git a/GraphLib/GraphLib.csproj b/GraphLib/GraphLib.csproj index 86b8fc788..239197ebf 100644 --- a/GraphLib/GraphLib.csproj +++ b/GraphLib/GraphLib.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties ClassLibrary1 GraphLib - v4.7.2 + v4.8 @@ -115,4 +115,4 @@ - \ No newline at end of file + diff --git a/LabelPrinting/LabelPrinting.csproj b/LabelPrinting/LabelPrinting.csproj index 009040fa4..9364e0ee1 100644 --- a/LabelPrinting/LabelPrinting.csproj +++ b/LabelPrinting/LabelPrinting.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties LabelPrinting LabelPrinting - v4.7.2 + v4.8 512 @@ -174,4 +174,4 @@ --> - \ No newline at end of file + diff --git a/MergeResultsDBs/MergeResultsDBs.csproj b/MergeResultsDBs/MergeResultsDBs.csproj index 44cc691ec..ca6fa94cd 100644 --- a/MergeResultsDBs/MergeResultsDBs.csproj +++ b/MergeResultsDBs/MergeResultsDBs.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties MergeResultsDBs MergeResultsDBs - v4.7.2 + v4.8 512 @@ -82,4 +82,4 @@ --> - \ No newline at end of file + diff --git a/OrderManagement/OrderManagement.csproj b/OrderManagement/OrderManagement.csproj index d57934961..877fede06 100644 --- a/OrderManagement/OrderManagement.csproj +++ b/OrderManagement/OrderManagement.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties OrderManagement OrderManagement - v4.7.2 + v4.8 512 @@ -179,4 +179,4 @@ --> - \ No newline at end of file + diff --git a/ProductionTracing/ProductionTracing.csproj b/ProductionTracing/ProductionTracing.csproj index bc712b860..6dba850e5 100644 --- a/ProductionTracing/ProductionTracing.csproj +++ b/ProductionTracing/ProductionTracing.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties ProductionTracing ProductionTracing - v4.7.2 + v4.8 512 @@ -204,4 +204,4 @@ --> - \ No newline at end of file + diff --git a/RecordProcessing/RecordProcessing.csproj b/RecordProcessing/RecordProcessing.csproj index d916984be..50d2e431c 100644 --- a/RecordProcessing/RecordProcessing.csproj +++ b/RecordProcessing/RecordProcessing.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties RecordProcessing RFPowerCommon - v4.7.2 + v4.8 512 @@ -81,4 +81,4 @@ --> - \ No newline at end of file + diff --git a/ResetBatchNr/ResetBatchNr.csproj b/ResetBatchNr/ResetBatchNr.csproj index 27ff40693..dbfe3c13c 100644 --- a/ResetBatchNr/ResetBatchNr.csproj +++ b/ResetBatchNr/ResetBatchNr.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties ResetBatchNr ResetBatchNr - v4.7.2 + v4.8 512 @@ -66,4 +66,4 @@ --> - \ No newline at end of file + diff --git a/RestClient/RestClient.csproj b/RestClient/RestClient.csproj index 45c59384c..5986a19c2 100644 --- a/RestClient/RestClient.csproj +++ b/RestClient/RestClient.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties RestClient RestClient - v4.7.2 + v4.8 512 @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/Results/DB.cs b/Results/DB.cs index 3eee27365..c81fec55b 100644 --- a/Results/DB.cs +++ b/Results/DB.cs @@ -108,7 +108,11 @@ namespace Results throw new Exception("Connection string was not specified"); } - if (SessionFactory == null) SessionFactory = CreateSessionFactory(); + if (SessionFactory == null) + { + DatabaseMigrationHelper.EnsureSchema(dbType, connectionString); + SessionFactory = CreateSessionFactory(); + } return SessionFactory.OpenSession(); } diff --git a/Results/Entities/MeterTestRslt.cs b/Results/Entities/MeterTestRslt.cs index beb66d7c2..f420e1aed 100644 --- a/Results/Entities/MeterTestRslt.cs +++ b/Results/Entities/MeterTestRslt.cs @@ -58,7 +58,11 @@ namespace Results.Entities #endif public virtual WaterMeter WaterMeter { get; set; } /// reference to the WaterMeter entity - public virtual TestRslt TestRslt { get; set; } /// reference to the TestRslt entity + public virtual TestRslt TestRslt { get; set; } + + /// reference to the TestRslt entity + + public virtual int Q3Channel { get; set; } /// Wrappers public virtual string Name() { return TestRslt.Name(); } @@ -97,6 +101,7 @@ namespace Results.Entities public virtual WaterMeterData WaterMeterData() { return WaterMeter.WaterMeterData; } public virtual Batch Batch() { return WaterMeter.Batch; } + public virtual bool IsPilotRslt() { diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index aacb422fc..bb96b025e 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -110,6 +110,9 @@ namespace Results.Entities public virtual string Workflow { get; set; } /// Not mapped to DB !!! Production tracing workflow name public virtual bool LastRecordIsNok { get; set; } /// Not mapped to DB !!! Previous record verification result public virtual bool PrintLabel { get; set; } /// Not mapped to DB !!! + + /// mapped to DB !!! Q3 channel number + public virtual int Q3Channel { get; set; } public virtual WaterMeterData WaterMeterData { get; set; } public virtual Batch Batch { get; set; } @@ -493,6 +496,7 @@ namespace Results.Entities FWVersion = string.Empty; #endif PrintLabel = true; + Q3Channel = 0; //No Q3 calibration by default } @@ -556,7 +560,8 @@ namespace Results.Entities Workflow = src.Workflow; /// Not mapped to DB LastRecordIsNok = src.LastRecordIsNok; /// Not mapped to DB PrintLabel = src.PrintLabel; /// Not mapped to DB - + Q3Channel = src.Q3Channel; /// Mapped to DB + foreach (var mtr in MeterTestRslts) { MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (CompoundMeterId)mtr.CompoundMeterId); @@ -771,6 +776,10 @@ namespace Results.Entities { MeterTestRslts[i].WriteBinary(writer); } + + //New Q3 calibration adds + writer.Write(2);//version number + writer.Write(Q3Channel); } public virtual void ReadBinary(BinaryReader reader, IList wmDatasRetrievedSoFar, IList testRslts) @@ -879,6 +888,13 @@ namespace Results.Entities mtr.ReadBinary(reader, testRslts); MeterTestRslts.Add(mtr); } + + //New Q3 calibration adds + int version = reader.ReadInt32(); + if (version == 2) + { + Q3Channel = reader.ReadInt32(); + } } } } diff --git a/Results/Entities/WaterMeterData.cs b/Results/Entities/WaterMeterData.cs index 5eaf6e3a0..3aca613ad 100644 --- a/Results/Entities/WaterMeterData.cs +++ b/Results/Entities/WaterMeterData.cs @@ -51,6 +51,7 @@ namespace Results.Entities public virtual bool Compound { get; set; } public virtual bool HeatMeter { get; set; } public virtual int WMTypeId { get; set; } /// Mapped to DB only when ORACLE_DB is defined + public virtual int Q3Channel { get; set; } /// Q3 Channel = 0 no set > 0 is Q3 calibration /// /// Default constructor, safe values @@ -59,6 +60,7 @@ namespace Results.Entities { PulsesPerLtr = 1; PulsesPerLtrAux = 1; + Q3Channel = 0; } /// @@ -101,6 +103,7 @@ namespace Results.Entities Compound = oriWMData.Compound; HeatMeter = oriWMData.HeatMeter; WMTypeId = oriWMData.WMTypeId; + Q3Channel = oriWMData.Q3Channel; } @@ -146,6 +149,7 @@ namespace Results.Entities if (Compound != wmd.Compound) return false; if (HeatMeter != wmd.HeatMeter) return false; if (WMTypeId != wmd.WMTypeId) return false; + if (Q3Channel != wmd.Q3Channel) return false; return true; } @@ -206,6 +210,8 @@ namespace Results.Entities writer.Write(Compound); writer.Write(HeatMeter); writer.Write(WMTypeId); + writer.Write(2); //Version of the binary format + writer.Write(Q3Channel); } public virtual void ReadBinary(BinaryReader reader) @@ -246,6 +252,15 @@ namespace Results.Entities Compound = reader.ReadBoolean(); HeatMeter = reader.ReadBoolean(); WMTypeId = reader.ReadInt32(); + + //Version 2 of the binary format introduced Q3Channel + int Version = 0; + Q3Channel = 0; + try { Version = reader.ReadInt32(); }catch(Exception) { Version = 0; } + if (Version == 2) + { + try { Q3Channel = reader.ReadInt32(); } catch (Exception) { Q3Channel = 0; } + } } } } diff --git a/Results/Entities/helpers/DatabaseMigrationHelper.cs b/Results/Entities/helpers/DatabaseMigrationHelper.cs new file mode 100644 index 000000000..cd4af3082 --- /dev/null +++ b/Results/Entities/helpers/DatabaseMigrationHelper.cs @@ -0,0 +1,135 @@ +using System; +using MySql.Data.MySqlClient; +using Common; + +namespace Results.Entities.helpers +{ + public static class DatabaseMigrationHelper + { + public static void EnsureSchema(DBType dbType, string connectionString) + { + switch (dbType) + { + case DBType.MySql: + EnsureMySqlSchema(connectionString); + break; + + case DBType.SQLite: + EnsureSQLiteSchema(connectionString); + break; + } + } + + private static void EnsureMySqlSchema(string connectionString) + { + using (var conn = new MySqlConnection(connectionString)) + { + conn.Open(); + + EnsureColumnMySql(conn, "WaterMeterData", "Q3Channel", "INT NOT NULL DEFAULT 0"); + EnsureColumnMySql(conn, "WaterMeter", "Q3Channel", "INT NOT NULL DEFAULT 0"); + EnsureColumnMySql(conn, "MeterTestRslt", "Q3Channel", "INT NOT NULL DEFAULT 0"); + } + } + + private static void EnsureColumnMySql( + MySqlConnection conn, + string tableName, + string columnName, + string columnDefinition) + { + using (var transaction = conn.BeginTransaction()) + { + try + { + bool exists; + + using (var cmd = conn.CreateCommand()) + { + cmd.Transaction = transaction; + cmd.CommandText = @" + SELECT COUNT(*) + FROM INFORMATION_SCHEMA.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = @tableName + AND COLUMN_NAME = @columnName"; + + cmd.Parameters.AddWithValue("@tableName", tableName); + cmd.Parameters.AddWithValue("@columnName", columnName); + + exists = Convert.ToInt32(cmd.ExecuteScalar()) > 0; + } + + if (!exists) + { + using (var alter = conn.CreateCommand()) + { + alter.Transaction = transaction; + + alter.CommandText = + "ALTER TABLE `" + tableName + "` ADD COLUMN `" + columnName + "` " + columnDefinition; + + alter.ExecuteNonQuery(); + } + } + + transaction.Commit(); + } + catch + { + transaction.Rollback(); + throw; + } + } + } + + private static void EnsureSQLiteSchema(string databaseFile) + { + using (var conn = new System.Data.SQLite.SQLiteConnection("Data Source=" + databaseFile)) + { + conn.Open(); + + EnsureColumnSQLite(conn, "WaterMeterData", "Q3Channel", "INTEGER NOT NULL DEFAULT 0"); + EnsureColumnSQLite(conn, "WaterMeter", "Q3Channel", "INTEGER NOT NULL DEFAULT 0"); + EnsureColumnSQLite(conn, "MeterTestRslt", "Q3Channel", "INTEGER NOT NULL DEFAULT 0"); + } + } + + private static void EnsureColumnSQLite( + System.Data.SQLite.SQLiteConnection conn, + string tableName, + string columnName, + string columnDefinition) + { + bool exists = false; + + using (var cmd = conn.CreateCommand()) + { + cmd.CommandText = "PRAGMA table_info(" + tableName + ")"; + + using (var reader = cmd.ExecuteReader()) + { + while (reader.Read()) + { + if (string.Equals(reader["name"].ToString(), columnName, StringComparison.OrdinalIgnoreCase)) + { + exists = true; + break; + } + } + } + } + + if (!exists) + { + using (var alter = conn.CreateCommand()) + { + alter.CommandText = + "ALTER TABLE " + tableName + " ADD COLUMN " + columnName + " " + columnDefinition; + + alter.ExecuteNonQuery(); + } + } + } + } +} \ No newline at end of file diff --git a/Results/Mappings/MeterTestRsltMap.cs b/Results/Mappings/MeterTestRsltMap.cs index 9789b4608..35a57abf3 100644 --- a/Results/Mappings/MeterTestRsltMap.cs +++ b/Results/Mappings/MeterTestRsltMap.cs @@ -49,6 +49,7 @@ namespace Results.Mappings #endif References(x => x.WaterMeter); References(x => x.TestRslt); + Map(x => x.Q3Channel).Not.Nullable() .Default("0"); } } } diff --git a/Results/Mappings/WaterMeterDataMap.cs b/Results/Mappings/WaterMeterDataMap.cs index 35b703458..622e43739 100644 --- a/Results/Mappings/WaterMeterDataMap.cs +++ b/Results/Mappings/WaterMeterDataMap.cs @@ -58,6 +58,8 @@ namespace Results.Mappings #if ORACLE_DB Map(x => x.WMTypeId); #endif - } + Map(x => x.Q3Channel) .Not.Nullable() .Default("0"); + + } } } diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs index d95887032..b3fbcb73b 100644 --- a/Results/Mappings/WaterMeterMap.cs +++ b/Results/Mappings/WaterMeterMap.cs @@ -65,6 +65,7 @@ namespace Results.Mappings Map(x => x.Pruefindex); Map(x => x.HydrPruefung); #endif + Map(x => x.Q3Channel);// Genesis meter identification References(x => x.WaterMeterData); References(x => x.Batch); HasMany(x => x.MeterTestRslts) diff --git a/Results/Results.csproj b/Results/Results.csproj index f0dc793c6..c19dbcdda 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Results Results - v4.7.2 + v4.8 512 @@ -53,6 +53,9 @@ ..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll + + ..\packages\System.Data.SQLite.2.0.3\lib\net471\System.Data.SQLite.dll + @@ -69,6 +72,7 @@ + @@ -271,4 +275,4 @@ --> - \ No newline at end of file + diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index 7038b8375..4304f6344 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties ResultsBrowser ResultsBrowser - v4.7.2 + v4.8 512 @@ -327,4 +327,4 @@ --> - \ No newline at end of file + diff --git a/S640TestApp/S640TestApp.csproj b/S640TestApp/S640TestApp.csproj index e03750815..d7490fdcd 100644 --- a/S640TestApp/S640TestApp.csproj +++ b/S640TestApp/S640TestApp.csproj @@ -9,7 +9,7 @@ Properties S640TestApp S640TestApp - v4.7.2 + v4.8 512 diff --git a/SchematicDrawing/SchematicDrawing.csproj b/SchematicDrawing/SchematicDrawing.csproj index c438c5178..507f862a5 100644 --- a/SchematicDrawing/SchematicDrawing.csproj +++ b/SchematicDrawing/SchematicDrawing.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties SchematicDrawing SchematicDrawing - v4.7.2 + v4.8 512 @@ -217,4 +217,4 @@ --> - \ No newline at end of file + diff --git a/SharedDatabase/SharedDatabase.csproj b/SharedDatabase/SharedDatabase.csproj index bdb461ffc..4d3d1f0a0 100644 --- a/SharedDatabase/SharedDatabase.csproj +++ b/SharedDatabase/SharedDatabase.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties SharedDatabase SharedDatabase - v4.7.2 + v4.8 512 @@ -232,4 +232,4 @@ --> - \ No newline at end of file + diff --git a/Statistics/Statistics.csproj b/Statistics/Statistics.csproj index 5ae871b2a..9ed7e35a8 100644 --- a/Statistics/Statistics.csproj +++ b/Statistics/Statistics.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Statistics Statistics - v4.7.2 + v4.8 512 @@ -146,4 +146,4 @@ --> - \ No newline at end of file + diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 8cca50798..50b62ac3b 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.9.3109.1")] -[assembly: AssemblyFileVersion("3.9.3109.1")] +[assembly: AssemblyVersion("3.9.3110.1")] +[assembly: AssemblyFileVersion("3.9.3110.1")] diff --git a/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.Designer.cs b/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.Designer.cs index 86d9058c0..d7ebf5939 100644 --- a/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.Designer.cs +++ b/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.Designer.cs @@ -44,7 +44,7 @@ this.tabPage2 = new System.Windows.Forms.TabPage(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.ScenariousViewButton = new System.Windows.Forms.Button(); - this.preadjustmenActionsViewButton = new System.Windows.Forms.Button(); + this.preadjustmentActionsViewButton = new System.Windows.Forms.Button(); this.slotsComPortsRegistersActionsViewButton = new System.Windows.Forms.Button(); this.uniDataSorageActionsViewButton = new System.Windows.Forms.Button(); this.combinedActionsViewButton = new System.Windows.Forms.Button(); @@ -191,7 +191,7 @@ // groupBox5 // this.groupBox5.Controls.Add(this.ScenariousViewButton); - this.groupBox5.Controls.Add(this.preadjustmenActionsViewButton); + this.groupBox5.Controls.Add(this.preadjustmentActionsViewButton); this.groupBox5.Controls.Add(this.slotsComPortsRegistersActionsViewButton); this.groupBox5.Controls.Add(this.uniDataSorageActionsViewButton); this.groupBox5.Controls.Add(this.combinedActionsViewButton); @@ -211,15 +211,15 @@ this.ScenariousViewButton.Text = "Scenarious"; this.ScenariousViewButton.UseVisualStyleBackColor = true; // - // preadjustmenActionsViewButton + // preadjustmentActionsViewButton // - this.preadjustmenActionsViewButton.Location = new System.Drawing.Point(6, 127); - this.preadjustmenActionsViewButton.Name = "preadjustmenActionsViewButton"; - this.preadjustmenActionsViewButton.Size = new System.Drawing.Size(150, 30); - this.preadjustmenActionsViewButton.TabIndex = 2; - this.preadjustmenActionsViewButton.Text = "Preadjustment"; - this.preadjustmenActionsViewButton.UseVisualStyleBackColor = true; - this.preadjustmenActionsViewButton.Click += new System.EventHandler(this.preadjustmenActionsViewButton_Click); + this.preadjustmentActionsViewButton.Location = new System.Drawing.Point(6, 127); + this.preadjustmentActionsViewButton.Name = "preadjustmentActionsViewButton"; + this.preadjustmentActionsViewButton.Size = new System.Drawing.Size(150, 30); + this.preadjustmentActionsViewButton.TabIndex = 2; + this.preadjustmentActionsViewButton.Text = "Preadjustment"; + this.preadjustmentActionsViewButton.UseVisualStyleBackColor = true; + this.preadjustmentActionsViewButton.Click += new System.EventHandler(this.preadjustmentActionsViewButton_Click); // // slotsComPortsRegistersActionsViewButton // @@ -412,7 +412,7 @@ private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.Button combinedActionsViewButton; private System.Windows.Forms.Button btnDiagTablesConfigurationButton; - private System.Windows.Forms.Button preadjustmenActionsViewButton; + private System.Windows.Forms.Button preadjustmentActionsViewButton; private System.Windows.Forms.Button ScenariousViewButton; } } \ No newline at end of file diff --git a/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.cs b/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.cs index f1334d53f..27acbdb10 100644 --- a/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.cs +++ b/TBF/Rig/BridgeComponents/GciBridge/UI/MainView.cs @@ -502,11 +502,11 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI new ConfigurationView(this)); } - private void preadjustmenActionsViewButton_Click(object sender, EventArgs e) + private void preadjustmentActionsViewButton_Click(object sender, EventArgs e) { SwitchGciView( - "PreadjustmenActionsView", - new PreadjustmentActionsView(this, _bridge, AddSlotRow, SaveSlots)); + "PreadjustmentActionsView", + new PreadjustmentActionsView(this, _bridge, AddSlotRow, SaveSlots)); } } diff --git a/TBF/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTest.cs b/TBF/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTest.cs index b56846ba7..22ec77c38 100644 --- a/TBF/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTest.cs +++ b/TBF/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTest.cs @@ -1483,8 +1483,8 @@ namespace TBF.Rig.RegisterReaders.GenesisRegReader.communication if (!genesisSmartReader.Q3CalibValid) { - log.Error("WriteQ3Calibration_Async() - Q3Calibration not valid"); - return "Q3Calibration not valid"; + log.Error("WriteQ3Calibration_Async() - Q3Channel not valid"); + return "Q3Channel not valid"; } //Get Activity Status @@ -1614,10 +1614,10 @@ namespace TBF.Rig.RegisterReaders.GenesisRegReader.communication //Get Activity Status LedState ledMode = LedState.active; // swich on LED byte valueLed = (ledMode == LedState.active) ? (byte)6 : (byte)0; - //TODO BUMI - implement variable values for Q3Calibration + //TODO BUMI - implement variable values for Q3Channel UInt16 valueSampleRate = 10; - //TODO BUMI - implement variable values for Q3Calibration - be shure is implemented in Head + //TODO BUMI - implement variable values for Q3Channel - be shure is implemented in Head string prepareMeterSizeAndCalibration = await PrepareMeterSizeAndCalibration(genesisSmartReader, cfg, gciBridge, token); if (prepareMeterSizeAndCalibration != ResultOk) { @@ -1714,14 +1714,14 @@ namespace TBF.Rig.RegisterReaders.GenesisRegReader.communication if (dSize == null || dSize.Length != 3) { log.Info( - $"PrepareMeterSizeAndCalibration( Slot: {genesisSmartReader.GetSlotNr}) - Problem with Q3Calibration calculation. Size: {int16MeterSize}"); + $"PrepareMeterSizeAndCalibration( Slot: {genesisSmartReader.GetSlotNr}) - Problem with Q3Channel calculation. Size: {int16MeterSize}"); return ResultNok; } genesisSmartReader .SetQ3Calibration(dSize); // new double[]{valueCalibrate,valueCalibrate,valueCalibrate} log.Info( - $"PrepareMeterSizeAndCalibration( Slot: {genesisSmartReader.GetSlotNr}) - Based MeterSize: {int16MeterSize} Set Q3Calibration: CH1({dSize[0]}), CH2({dSize[1]}), CH3({dSize[2]})"); + $"PrepareMeterSizeAndCalibration( Slot: {genesisSmartReader.GetSlotNr}) - Based MeterSize: {int16MeterSize} Set Q3Channel: CH1({dSize[0]}), CH2({dSize[1]}), CH3({dSize[2]})"); } else { @@ -1730,7 +1730,7 @@ namespace TBF.Rig.RegisterReaders.GenesisRegReader.communication } }catch(Exception ex) { - log.Error($"PrepareMeterSizeAndCalibration( Slot: {genesisSmartReader.GetSlotNr}) - Error during Q3Calibration calculation: {ex.Message}"); + log.Error($"PrepareMeterSizeAndCalibration( Slot: {genesisSmartReader.GetSlotNr}) - Error during Q3Channel calculation: {ex.Message}"); genesisSmartReader.SetQ3Calibration(new double[] { valueCalibrate, valueCalibrate, valueCalibrate }); return ResultNok; diff --git a/TBF/Rig/RegisterReaders/GenesisRegReader/implementations/GenesisSmartReader.cs b/TBF/Rig/RegisterReaders/GenesisRegReader/implementations/GenesisSmartReader.cs index cceaa6379..75a9078fb 100644 --- a/TBF/Rig/RegisterReaders/GenesisRegReader/implementations/GenesisSmartReader.cs +++ b/TBF/Rig/RegisterReaders/GenesisRegReader/implementations/GenesisSmartReader.cs @@ -3960,7 +3960,7 @@ namespace TBF.Rig.RegisterReaders.GenesisRegReader.implementations public int GetSlotNr { get => genesisHeadCfg?.SlotNr ?? -1; } - //TODO BUMI implement variable values for Q3Calibration! + //TODO BUMI implement variable values for Q3Channel! public void SetQ3Calibration(double[] q3CalibInitial) { this.q3CalibInitial = q3CalibInitial; } private double refVolume = double.NaN; diff --git a/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs index 29e0e9665..2fb7c1960 100644 --- a/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -962,6 +962,7 @@ namespace TBF.Rig.TestMethods.FlyingStart WMPosition = wmNrChX, YearOfProduction = 0, Disabled = false, + Q3Channel = iCH + 1 }; chXWaterMeter.CopyContentFrom(waterMeterParent); @@ -980,6 +981,7 @@ namespace TBF.Rig.TestMethods.FlyingStart //create copy of meterRslt and add to additionalResultsByChannel MeterTestRslt meterTestRsltChX = new MeterTestRslt(chXWaterMeter, meterRslt.TestRslt, (CompoundMeterId)meterRslt.CompoundMeterId); + meterTestRsltChX.Q3Channel = iCH + 1; chXWaterMeter.MeterTestRslts.Add(meterTestRsltChX); MeterTestRslt chanelXMeterRslt = BatchRslts.GetMeterTestRslt(testName, wmNrChX-1, Common.CompoundMeterId.Single); diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index e444e0a50..61464a66f 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -186,12 +186,24 @@ ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll + + ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.Registers.dll + ..\packages\Common\Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll ..\packages\Common\Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll + + ..\packages\Common\Xylem.Common.Logic.ProductionOrderCore.dll + + + ..\packages\Common\Xylem.Common.Ui.CordonelPreadjustmentUi.dll + + + ..\packages\Common\Xylem.Common.Utils.Logging.dll + False ..\packages\Common\Xylem.Common.Utils.Logging.dll @@ -250,17 +262,17 @@ MainView.cs - + UserControl - - UniDataStorageReaderInterfaceView.cs + + UniDataSorageActionsView.cs - + UserControl - - CombinedInterfaceView.cs + + CombinedActionsView.cs UserControl @@ -268,11 +280,17 @@ ConfigurationView.cs - + UserControl - - GenesisCordonelInterfaceView.cs + + SlotsComPortsRegistersActionsView.cs + + + UserControl + + + PreadjustmentActionsView.cs @@ -3299,17 +3317,20 @@ MainView.cs - - CombinedInterfaceView.cs + + CombinedActionsView.cs ConfigurationView.cs - - UniDataStorageReaderInterfaceView.cs + + UniDataSorageActionsView.cs - - GenesisCordonelInterfaceView.cs + + SlotsComPortsRegistersActionsView.cs + + + PreadjustmentActionsView.cs PumpCfgCtrl.cs diff --git a/TBF/UI/Calendar/Calendar.csproj b/TBF/UI/Calendar/Calendar.csproj index f3a27b2bc..776aec5b4 100644 --- a/TBF/UI/Calendar/Calendar.csproj +++ b/TBF/UI/Calendar/Calendar.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Calendar4NET Calendar - v4.7.2 + v4.8 512 @@ -135,4 +135,4 @@ --> - \ No newline at end of file + diff --git a/TBFTests/DBTest.cs b/TBFTests/DBTest.cs index e5f6596b7..fe17d476e 100644 --- a/TBFTests/DBTest.cs +++ b/TBFTests/DBTest.cs @@ -83,7 +83,7 @@ namespace TBFTests TestData testData = new TestData { - Name = "Q3Calibration", + Name = "Q3Channel", Repeats = 1, Method = "SmartCommunication" }; diff --git a/TBFTests/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTestImpelementations.cs b/TBFTests/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTestImpelementations.cs index fd5c9e4c9..117ffa184 100644 --- a/TBFTests/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTestImpelementations.cs +++ b/TBFTests/Rig/RegisterReaders/GenesisRegReader/communication/OptoHeadTestImpelementations.cs @@ -108,7 +108,7 @@ namespace TBFTests.Rig.RegisterReaders.GenesisRegReader.communication Test test = new Test { - Name = "Q3Calibration", + Name = "Q3Channel", Part = 1 }; diff --git a/TBFTests/TBFTests.csproj b/TBFTests/TBFTests.csproj index 7c6970cc6..201ddf7b7 100644 --- a/TBFTests/TBFTests.csproj +++ b/TBFTests/TBFTests.csproj @@ -113,6 +113,7 @@ + diff --git a/ToFirstMonitor/ToFirstMonitor.csproj b/ToFirstMonitor/ToFirstMonitor.csproj index b4bfc01a3..e249c3467 100644 --- a/ToFirstMonitor/ToFirstMonitor.csproj +++ b/ToFirstMonitor/ToFirstMonitor.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties ToFirstMonitor ToFirstMonitor - v4.7.2 + v4.8 512 @@ -70,4 +70,4 @@ --> - \ No newline at end of file + diff --git a/ToSecondMonitor/ToSecondMonitor.csproj b/ToSecondMonitor/ToSecondMonitor.csproj index 55d7abc51..8f88e4029 100644 --- a/ToSecondMonitor/ToSecondMonitor.csproj +++ b/ToSecondMonitor/ToSecondMonitor.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ Properties ToSecondMonitor ToSecondMonitor - v4.7.2 + v4.8 512 @@ -67,4 +67,4 @@ --> - \ No newline at end of file + diff --git a/UserManagement/UserManagement.csproj b/UserManagement/UserManagement.csproj index cbc8bb472..bc37ef70f 100644 --- a/UserManagement/UserManagement.csproj +++ b/UserManagement/UserManagement.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties UserManagement UserManagement - v4.7.2 + v4.8 512 @@ -164,4 +164,4 @@ --> - \ No newline at end of file + diff --git a/WorkflowConfigurator/WorkflowConfigurator.csproj b/WorkflowConfigurator/WorkflowConfigurator.csproj index 074d53ac0..c8a8e4400 100644 --- a/WorkflowConfigurator/WorkflowConfigurator.csproj +++ b/WorkflowConfigurator/WorkflowConfigurator.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties WorkflowConfigurator WorkflowConfigurator - v4.7.2 + v4.8 512 @@ -243,4 +243,4 @@ --> - \ No newline at end of file + diff --git a/Workplace/Workplace.csproj b/Workplace/Workplace.csproj index c758637dd..379b4d738 100644 --- a/Workplace/Workplace.csproj +++ b/Workplace/Workplace.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Workplace Workplace - v4.7.2 + v4.8 512 @@ -421,43 +421,43 @@ Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always @@ -469,31 +469,31 @@ Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always @@ -505,4 +505,4 @@ --> - \ No newline at end of file + diff --git a/packages/Common/Logic.ProductionToProductMapper.dll b/packages/Common/Logic.ProductionToProductMapper.dll index 82c9c5426..88c200382 100644 Binary files a/packages/Common/Logic.ProductionToProductMapper.dll and b/packages/Common/Logic.ProductionToProductMapper.dll differ diff --git a/packages/Common/Logic.ProductionToProductMapper.pdb b/packages/Common/Logic.ProductionToProductMapper.pdb index 0ef52929c..ec93fbf6c 100644 Binary files a/packages/Common/Logic.ProductionToProductMapper.pdb and b/packages/Common/Logic.ProductionToProductMapper.pdb differ diff --git a/packages/Common/Xylem.Common.CommonCore.Configuration.dll b/packages/Common/Xylem.Common.CommonCore.Configuration.dll index 85161dfa6..25135f13c 100644 Binary files a/packages/Common/Xylem.Common.CommonCore.Configuration.dll and b/packages/Common/Xylem.Common.CommonCore.Configuration.dll differ diff --git a/packages/Common/Xylem.Common.CommonCore.Configuration.pdb b/packages/Common/Xylem.Common.CommonCore.Configuration.pdb index 5b340ed9f..b71cc76c9 100644 Binary files a/packages/Common/Xylem.Common.CommonCore.Configuration.pdb and b/packages/Common/Xylem.Common.CommonCore.Configuration.pdb differ diff --git a/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.dll b/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.dll index cafde6486..cd1e1170b 100644 Binary files a/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.dll and b/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.dll differ diff --git a/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.pdb b/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.pdb index 85081b034..28b96a70d 100644 Binary files a/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.pdb and b/packages/Common/Xylem.Common.CommonCore.ThreadWatcher.pdb differ diff --git a/packages/Common/Xylem.Common.CommonCore.dll b/packages/Common/Xylem.Common.CommonCore.dll index 870d347eb..06e35d5ef 100644 Binary files a/packages/Common/Xylem.Common.CommonCore.dll and b/packages/Common/Xylem.Common.CommonCore.dll differ diff --git a/packages/Common/Xylem.Common.CommonCore.pdb b/packages/Common/Xylem.Common.CommonCore.pdb index dfa1388e8..a0e848b8d 100644 Binary files a/packages/Common/Xylem.Common.CommonCore.pdb and b/packages/Common/Xylem.Common.CommonCore.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.dll b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.dll index 7895ec9ea..fac9c774a 100644 Binary files a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.dll and b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.pdb b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.pdb index cd27648ef..3fa669f90 100644 Binary files a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.pdb and b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.PortCore.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.dll b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.dll index 75018f172..7ee0cca57 100644 Binary files a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.dll and b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.pdb b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.pdb index ed121fa3f..e7ec5ed29 100644 Binary files a/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.pdb and b/packages/Common/Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.dll b/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.dll index 2e755000c..9f3cf8c9a 100644 Binary files a/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.dll and b/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.pdb b/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.pdb index 35d0c2d08..801938861 100644 Binary files a/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.pdb and b/packages/Common/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.dll index 4a8254828..37544ecae 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.pdb index 7e678c35b..22b667603 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Applications.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.dll index 17165707f..466b38b3c 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.pdb index 503be7b9b..90bae6ea6 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll index 686952a08..7a30bf3a3 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.pdb index c3dc4c543..b23a868f4 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll index 17f1fc536..a6d4fb135 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.pdb index 3ab9a2360..c070c1224 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll index af396add5..a480b765f 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.pdb index 23140a0f7..fe2cfeae7 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll index 222456e65..d5cd6d80c 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.pdb index 16dc16ec6..14d3c0cf6 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.dll index dd7bb47db..426fd7cf5 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.pdb index 0359ef5ac..84822d663 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.dll index 8fe438400..d92c5b2a0 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.pdb index d8ccf3ccd..cdb91245f 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.dll index 849e4ec28..cdd002a38 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.pdb index 41c9c789e..8cef354c9 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.Registers.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll index faa924706..7b09f4020 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.pdb index 473fe28e6..d32b4e9be 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterCore.pdb differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll index 7310d19f1..9256f9069 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.pdb b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.pdb index ef76ae6ee..ed2fb70bd 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.pdb and b/packages/Common/Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.pdb differ diff --git a/packages/Common/Xylem.Common.Logic.ProductionOrderCore.dll b/packages/Common/Xylem.Common.Logic.ProductionOrderCore.dll index e2009433d..522956b23 100644 Binary files a/packages/Common/Xylem.Common.Logic.ProductionOrderCore.dll and b/packages/Common/Xylem.Common.Logic.ProductionOrderCore.dll differ diff --git a/packages/Common/Xylem.Common.Logic.ProductionOrderCore.pdb b/packages/Common/Xylem.Common.Logic.ProductionOrderCore.pdb index 355f1d955..d04412073 100644 Binary files a/packages/Common/Xylem.Common.Logic.ProductionOrderCore.pdb and b/packages/Common/Xylem.Common.Logic.ProductionOrderCore.pdb differ diff --git a/packages/Common/Xylem.Common.Logic.RelatePcb.dll b/packages/Common/Xylem.Common.Logic.RelatePcb.dll index 450c8feb5..b38b4c1aa 100644 Binary files a/packages/Common/Xylem.Common.Logic.RelatePcb.dll and b/packages/Common/Xylem.Common.Logic.RelatePcb.dll differ diff --git a/packages/Common/Xylem.Common.Logic.RelatePcb.pdb b/packages/Common/Xylem.Common.Logic.RelatePcb.pdb index 80d7e71cc..899ca2d1d 100644 Binary files a/packages/Common/Xylem.Common.Logic.RelatePcb.pdb and b/packages/Common/Xylem.Common.Logic.RelatePcb.pdb differ diff --git a/packages/Common/Xylem.Common.Logic.ServiceCore.dll b/packages/Common/Xylem.Common.Logic.ServiceCore.dll index dce64d49a..e45eae2c7 100644 Binary files a/packages/Common/Xylem.Common.Logic.ServiceCore.dll and b/packages/Common/Xylem.Common.Logic.ServiceCore.dll differ diff --git a/packages/Common/Xylem.Common.Logic.ServiceCore.pdb b/packages/Common/Xylem.Common.Logic.ServiceCore.pdb index 1563ccdb9..de4d9e758 100644 Binary files a/packages/Common/Xylem.Common.Logic.ServiceCore.pdb and b/packages/Common/Xylem.Common.Logic.ServiceCore.pdb differ diff --git a/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.dll b/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.dll index e428a1b14..a1f00bc1b 100644 Binary files a/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.dll and b/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.dll differ diff --git a/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.pdb b/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.pdb index 115a58a33..74d029f6f 100644 Binary files a/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.pdb and b/packages/Common/Xylem.Common.Logic.SoftwareAccessHelper.pdb differ diff --git a/packages/Common/Xylem.Common.Metrology.Measurements.dll b/packages/Common/Xylem.Common.Metrology.Measurements.dll index 059e2dcdd..394ad4b82 100644 Binary files a/packages/Common/Xylem.Common.Metrology.Measurements.dll and b/packages/Common/Xylem.Common.Metrology.Measurements.dll differ diff --git a/packages/Common/Xylem.Common.Metrology.Measurements.pdb b/packages/Common/Xylem.Common.Metrology.Measurements.pdb index 388e6579a..03d01d0fc 100644 Binary files a/packages/Common/Xylem.Common.Metrology.Measurements.pdb and b/packages/Common/Xylem.Common.Metrology.Measurements.pdb differ diff --git a/packages/Common/Xylem.Common.Ui.CordonelPreadjustmentUi.pdb b/packages/Common/Xylem.Common.Ui.CordonelPreadjustmentUi.pdb index 59c451447..d7a54b8e0 100644 Binary files a/packages/Common/Xylem.Common.Ui.CordonelPreadjustmentUi.pdb and b/packages/Common/Xylem.Common.Ui.CordonelPreadjustmentUi.pdb differ diff --git a/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe b/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe index cbc2cd4f9..d829df7de 100644 Binary files a/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe and b/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe differ diff --git a/packages/Common/Xylem.Common.Ui.GenesisToolBox.pdb b/packages/Common/Xylem.Common.Ui.GenesisToolBox.pdb index fd8af146b..c41ce5b0e 100644 Binary files a/packages/Common/Xylem.Common.Ui.GenesisToolBox.pdb and b/packages/Common/Xylem.Common.Ui.GenesisToolBox.pdb differ diff --git a/packages/Common/Xylem.Common.Utils.ByteArrayStyle.dll b/packages/Common/Xylem.Common.Utils.ByteArrayStyle.dll index 1bbc296b2..781af6297 100644 Binary files a/packages/Common/Xylem.Common.Utils.ByteArrayStyle.dll and b/packages/Common/Xylem.Common.Utils.ByteArrayStyle.dll differ diff --git a/packages/Common/Xylem.Common.Utils.ByteArrayStyle.pdb b/packages/Common/Xylem.Common.Utils.ByteArrayStyle.pdb index 50106e925..521955454 100644 Binary files a/packages/Common/Xylem.Common.Utils.ByteArrayStyle.pdb and b/packages/Common/Xylem.Common.Utils.ByteArrayStyle.pdb differ diff --git a/packages/Common/Xylem.Common.Utils.Crc16Ccitt.dll b/packages/Common/Xylem.Common.Utils.Crc16Ccitt.dll index b2abafae4..f5a0be2bc 100644 Binary files a/packages/Common/Xylem.Common.Utils.Crc16Ccitt.dll and b/packages/Common/Xylem.Common.Utils.Crc16Ccitt.dll differ diff --git a/packages/Common/Xylem.Common.Utils.Crc16Ccitt.pdb b/packages/Common/Xylem.Common.Utils.Crc16Ccitt.pdb index 4f8c88ef1..e4dbe2ca7 100644 Binary files a/packages/Common/Xylem.Common.Utils.Crc16Ccitt.pdb and b/packages/Common/Xylem.Common.Utils.Crc16Ccitt.pdb differ diff --git a/packages/Common/Xylem.Common.Utils.Logging.dll b/packages/Common/Xylem.Common.Utils.Logging.dll index 4a5559fbd..3dfdf0851 100644 Binary files a/packages/Common/Xylem.Common.Utils.Logging.dll and b/packages/Common/Xylem.Common.Utils.Logging.dll differ diff --git a/packages/Common/Xylem.Common.Utils.Logging.pdb b/packages/Common/Xylem.Common.Utils.Logging.pdb index 6821d10f0..d02503b0b 100644 Binary files a/packages/Common/Xylem.Common.Utils.Logging.pdb and b/packages/Common/Xylem.Common.Utils.Logging.pdb differ diff --git a/packages/Common/Xylem.Common.Utils.ProcessExec.dll b/packages/Common/Xylem.Common.Utils.ProcessExec.dll index 6e67bfbe4..bc8d6ccfc 100644 Binary files a/packages/Common/Xylem.Common.Utils.ProcessExec.dll and b/packages/Common/Xylem.Common.Utils.ProcessExec.dll differ diff --git a/packages/Common/Xylem.Common.Utils.ProcessExec.pdb b/packages/Common/Xylem.Common.Utils.ProcessExec.pdb index 75da1c836..f9fc22655 100644 Binary files a/packages/Common/Xylem.Common.Utils.ProcessExec.pdb and b/packages/Common/Xylem.Common.Utils.ProcessExec.pdb differ diff --git a/packages/Common/XylemCommonUiLegacyGenCtl.dll b/packages/Common/XylemCommonUiLegacyGenCtl.dll index 630c825db..820e1b041 100644 Binary files a/packages/Common/XylemCommonUiLegacyGenCtl.dll and b/packages/Common/XylemCommonUiLegacyGenCtl.dll differ diff --git a/packages/Common/XylemCommonUiLegacyGenCtl.pdb b/packages/Common/XylemCommonUiLegacyGenCtl.pdb index 64809edf3..bdad89171 100644 Binary files a/packages/Common/XylemCommonUiLegacyGenCtl.pdb and b/packages/Common/XylemCommonUiLegacyGenCtl.pdb differ