marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge done

Browse Source
This commit is contained in:
Roland Drabesch
2022-04-06 12:38:36 +02:00
parent 80c0b07305
commit 152e775310
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.vs/config/applicationhost.config
+1 -1
View File
@@ -155,7 +155,7 @@
</site>
<site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
<virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" />
Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFile.cs
+5 -5
View File
@@ -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
View File
@@ -1 +1 @@
7ac73abb7afd9e6ddc0520a1568581c7ed0afd36
46bd00889699f5a20a4981a22f62b66368323855
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
f64d563def603c89cafafa61a3219ba97e1e344c
0d85a5b3a7561b41163c20e5dc7713bcd0d65555
Common/Ui/GenesisToolBox/frmMainForm.Designer.cs
Generated
+1 -1
View File
@@ -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
//