merge done

Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFile.cs

@@ -29,17 +29,17 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
         private Int32 _fileWriteTimeOutMs = ExtendedFileIoTimeoutMs;
 
         private readonly GenesisMeter _currentGenesis;
-        private Int32 _filePointer;
         //TODO THW test only private const String StrNewFileReadWriteMode = "wb+";
         //wb open file for writing in binary mode, if file exists its contents will be overwritten,
         //if file does not exist it will be created
         private const String StrNewFileReadWriteMode = "wb";
         //Open for reading in binary mode. If the file does not exist, fopen( ) returns NULL
         public Int32 _filePointer;
-        private const String StrNewFileReadWriteMode = "wb+";
+
         private const String StrOpenFileReadOnlyMode = "rb";
         //Open for both reading and writing in binary mode. If the file does not exist, fopen( ) returns NULL
-        private const String StrOpenFileReadWriteMode = "rb+";
+        private const String StrOpenFileReadWriteMode = "wb+";
+
         private String _fileName;
         private Int32 _overallBytesCtr;
 
@@ -384,7 +384,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
                 //write size to 1
                 _currentGenesis.WriteRegister(Register.Configexchange.FileRead, 1, false);
                 //write counts to expected length
-                _currentGenesis.WriteRegister(Register.Configexchange.FileRead, fixedReadBackCount, false);
+                _currentGenesis.WriteRegister(Register.Configexchange.FileRead, readBackCount, false);
                 //write file pointer
                 _currentGenesis.WriteRegister(Register.Configexchange.FileRead, _filePointer);
 
@@ -394,7 +394,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
                     var remainingData = RegisterConverter.ConvertTo<Int32>(
                         _currentGenesis.ReadRegister(Register.Configexchange.FileRead));
 
-                    fixedReadBackCount = remainingData > 0 ? fixedReadBackCount - remainingData : 0;
+                   // fixedReadBackCount = remainingData > 0 ? fixedReadBackCount - remainingData : 0;
 
                     while (remainingData > 0)
                     {

Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-7ac73abb7afd9e6ddc0520a1568581c7ed0afd36
+46bd00889699f5a20a4981a22f62b66368323855