diff --git a/Common/.vs/config/applicationhost.config b/Common/.vs/config/applicationhost.config index 1b9332b4..40cde372 100644 --- a/Common/.vs/config/applicationhost.config +++ b/Common/.vs/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFile.cs b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFile.cs index 94802c08..c72d222c 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFile.cs +++ b/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( _currentGenesis.ReadRegister(Register.Configexchange.FileRead)); - fixedReadBackCount = remainingData > 0 ? fixedReadBackCount - remainingData : 0; + // fixedReadBackCount = remainingData > 0 ? fixedReadBackCount - remainingData : 0; while (remainingData > 0) { diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache index 2d9cbed7..b81d5f66 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7ac73abb7afd9e6ddc0520a1568581c7ed0afd36 +46bd00889699f5a20a4981a22f62b66368323855 diff --git a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache index 0028f628..133b97f0 100644 --- a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache +++ b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -f64d563def603c89cafafa61a3219ba97e1e344c +0d85a5b3a7561b41163c20e5dc7713bcd0d65555 diff --git a/Common/Ui/GenesisToolBox/frmMainForm.Designer.cs b/Common/Ui/GenesisToolBox/frmMainForm.Designer.cs index b6196a50..4c43cc3c 100644 --- a/Common/Ui/GenesisToolBox/frmMainForm.Designer.cs +++ b/Common/Ui/GenesisToolBox/frmMainForm.Designer.cs @@ -291,7 +291,7 @@ this.button3.TabIndex = 19; this.button3.Text = "button3"; this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click); + //this.button3.Click += new System.EventHandler(this.button3_Click); // // BtnFileSplit //