From e3605b647c4bd5aad13785f95aa1ac4f870c4e22 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 2 Mar 2016 20:02:30 +0100 Subject: [PATCH] LU logging fixed, ver.2.3.231. --- .../BenchControl/DB/SensusOracle/Database.cs | 202 +++++++++++++++++- .../BenchControl/StateMachine.cs | 23 +- .../WaterMeters/iPerl/OptoTelegramRaw.cs | 9 +- .../WaterMeters/iPerl/WaterMeter.cs | 33 ++- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- 5 files changed, 226 insertions(+), 45 deletions(-) diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 02dfa4c13..bcc7203fb 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -10,6 +10,7 @@ using Oracle.DataAccess.Client; // ODP.NET Oracle managed provider using Oracle.DataAccess.Types; using Config.Entities; using TBF.BenchControl; +using TBF.BenchControl.Sequences; using TBF.Resources; namespace TBF.BenchControl.DB.SensusOracle @@ -727,8 +728,207 @@ namespace TBF.BenchControl.DB.SensusOracle } } + logger.WriteLine(string.Empty); - logger.WriteLine(string.Format("[allgemein]")); + logger.WriteLine("[Prüfdaten]"); + /// + logger.WriteLine(string.Format("Startzeit={0}", batch.StartTime.ToString("HH:mm:ss"))); + logger.WriteLine(string.Format("Endezeit={0}", batch.EndTime.ToString("HH:mm:ss"))); + logger.WriteLine(string.Format("Datum={0}", batch.StartTime.ToString("dd.MM.yyyy"))); + logger.WriteLine(string.Format("GesamtDauer={0}", batch.EndTime.Subtract(batch.StartTime).TotalSeconds)); + logger.WriteLine(string.Format("Dichtprüfung={0}", 0)); /// 1 + /// + logger.WriteLine(string.Format("Q-5_geprüft={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("Q-4_geprüft={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("Q-3_geprüft={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("Q-2_geprüft={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("Q-1_geprüft={0}", 1)); /// 1 + logger.WriteLine(string.Format("Prüfvolumen-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("Prüfmasse-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("Temp1_P-1={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp2_P-1={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp3_P-1={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp4_P-1={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp5_P-1={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp6_P-1={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp7_P-1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Temp8_P-1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Druck1_P-1={0}", 0)); /// 6,3 + logger.WriteLine(string.Format("Druck2_P-1={0}", 0)); /// 1,4 + logger.WriteLine(string.Format("K-Faktor-1={0}", 0)); /// 0,00000000 + logger.WriteLine(string.Format("Q_Waage-1={0}", 0)); /// 3880,87469 + logger.WriteLine(string.Format("Q_Vergleich-1={0}", 0)); /// 3869,47056 + logger.WriteLine(string.Format("Fehler_Vergleich-1={0}", 0)); /// -0,29472 + logger.WriteLine(string.Format("VZ_ZeitImpulse-1={0}", 0)); /// 500,14362 + logger.WriteLine(string.Format("VZ_Impulse-1={0}", 0)); /// 645097 + logger.WriteLine(string.Format("ZeitImpulse_VZ-1={0}", 0)); /// 976843 + logger.WriteLine(string.Format("VorwahlZähler-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("VZ_Nummer-1={0}", 0)); /// 1 + logger.WriteLine(string.Format("Anfangsgewicht-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("Endgewicht-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("MinDurchfluss-1={0}", 0)); /// 3862,00000 + logger.WriteLine(string.Format("MaxDurchfluss-1={0}", 0)); /// 3876,00000 + logger.WriteLine(string.Format("Q_Einstellzeit-1={0}", 0)); /// 7,28 + logger.WriteLine(string.Format("Pumpennummer-1={0}", 0)); /// 2 + logger.WriteLine(string.Format("Drehzahl-1={0}", 0)); /// 2269 + logger.WriteLine(string.Format("DAW_Wert-1={0}", 0)); /// 1501 + logger.WriteLine(string.Format("Leitfähigkeit-1={0}", 0)); /// 545,05 + logger.WriteLine(string.Format("LuftDruck-1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("LuftFeuchtigkeit-1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("HyDruck-1={0}", 0)); /// 6,2 + logger.WriteLine(string.Format("VorratsDruckHy-1={0}", 0)); /// 6,3 + logger.WriteLine(string.Format("Anfangsgewicht2_-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("Endgewicht2_-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("Prüfmasse2_-1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("GegenWaage-1={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("Q0_geprüft={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("Q1_geprüft={0}", 1)); /// 1 + logger.WriteLine(string.Format("Prüfvolumen1={0}", 0)); /// 3,73655 + logger.WriteLine(string.Format("Prüfmasse1={0}", 0)); /// 3,72610 + logger.WriteLine(string.Format("Temp1_P1={0}", 0)); /// 20,0 + logger.WriteLine(string.Format("Temp2_P1={0}", 0)); /// 20,0 + logger.WriteLine(string.Format("Temp3_P1={0}", 0)); /// 20,0 + logger.WriteLine(string.Format("Temp4_P1={0}", 0)); /// 20,0 + logger.WriteLine(string.Format("Temp5_P1={0}", 0)); /// 20,0 + logger.WriteLine(string.Format("Temp6_P1={0}", 0)); /// 20,0 + logger.WriteLine(string.Format("Temp7_P1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Temp8_P1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Druck1_P1={0}", 0)); /// 1,5 + logger.WriteLine(string.Format("Druck2_P1={0}", 0)); /// 1,4 + logger.WriteLine(string.Format("K-Faktor1={0}", 0)); /// 0,99820080 + logger.WriteLine(string.Format("Q_Waage1={0}", 0)); /// 26,89887 + logger.WriteLine(string.Format("Q_Vergleich1={0}", 0)); /// 26,83427 + logger.WriteLine(string.Format("Fehler_Vergleich1={0}", 0)); /// -0,24014 + logger.WriteLine(string.Format("VZ_ZeitImpulse1={0}", 0)); /// 500,07962 + logger.WriteLine(string.Format("VZ_Impulse1={0}", 0)); /// 4473091 + logger.WriteLine(string.Format("ZeitImpulse_VZ1={0}", 0)); /// 976718 + logger.WriteLine(string.Format("VorwahlZähler1={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("VZ_Nummer1={0}", 0)); /// 3 + logger.WriteLine(string.Format("Anfangsgewicht1={0}", 0)); /// 4,66535 + logger.WriteLine(string.Format("Endgewicht1={0}", 0)); /// 8,39145 + logger.WriteLine(string.Format("MinDurchfluss1={0}", 0)); /// 26,73800 + logger.WriteLine(string.Format("MaxDurchfluss1={0}", 0)); /// 27,04800 + logger.WriteLine(string.Format("Q_Einstellzeit1={0}", 0)); /// 4,17 + logger.WriteLine(string.Format("Pumpennummer1={0}", 0)); /// 3 + logger.WriteLine(string.Format("Drehzahl1={0}", 0)); /// 1743 + logger.WriteLine(string.Format("DAW_Wert1={0}", 0)); /// 2700 + logger.WriteLine(string.Format("Leitfähigkeit1={0}", 0)); /// 543,10 + logger.WriteLine(string.Format("LuftDruck1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("LuftFeuchtigkeit1={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("HyDruck1={0}", 0)); /// 6,2 + logger.WriteLine(string.Format("VorratsDruckHy1={0}", 0)); /// 6,3 + logger.WriteLine(string.Format("Anfangsgewicht2_1={0}", 0)); /// 37,94400 + logger.WriteLine(string.Format("Endgewicht2_1={0}", 0)); /// 37,94200 + logger.WriteLine(string.Format("Prüfmasse2_1={0}", 0)); /// -0,00200 + logger.WriteLine(string.Format("GegenWaage1={0}", 0)); /// 1 + /// + logger.WriteLine(string.Format("Q2_geprüft={0}", 1)); /// 1 + logger.WriteLine(string.Format("Prüfvolumen2={0}", 0)); /// 4,65370 + logger.WriteLine(string.Format("Prüfmasse2={0}", 0)); /// 4,64078 + logger.WriteLine(string.Format("Temp1_P2={0}", 0)); /// 19,9 + logger.WriteLine(string.Format("Temp2_P2={0}", 0)); /// 19,9 + logger.WriteLine(string.Format("Temp3_P2={0}", 0)); /// 19,9 + logger.WriteLine(string.Format("Temp4_P2={0}", 0)); /// 19,9 + logger.WriteLine(string.Format("Temp5_P2={0}", 0)); /// 19,9 + logger.WriteLine(string.Format("Temp6_P2={0}", 0)); /// 19,9 + logger.WriteLine(string.Format("Temp7_P2={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Temp8_P2={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Druck1_P2={0}", 0)); /// 1,5 + logger.WriteLine(string.Format("Druck2_P2={0}", 0)); /// 1,4 + logger.WriteLine(string.Format("K-Faktor2={0}", 0)); /// 0,99822140 + logger.WriteLine(string.Format("Q_Waage2={0}", 0)); /// 41,84627 + logger.WriteLine(string.Format("Q_Vergleich2={0}", 0)); /// 41,68738 + logger.WriteLine(string.Format("Fehler_Vergleich2={0}", 0)); /// -0,37970 + logger.WriteLine(string.Format("VZ_ZeitImpulse2={0}", 0)); /// 400,35379 + logger.WriteLine(string.Format("VZ_Impulse2={0}", 0)); /// 166897 + logger.WriteLine(string.Format("ZeitImpulse_VZ2={0}", 0)); /// 781941 + logger.WriteLine(string.Format("VorwahlZähler2={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("VZ_Nummer2={0}", 0)); /// 2 + logger.WriteLine(string.Format("Anfangsgewicht2={0}", 0)); /// 0,02457 + logger.WriteLine(string.Format("Endgewicht2={0}", 0)); /// 4,66535 + logger.WriteLine(string.Format("MinDurchfluss2={0}", 0)); /// 40,43333 + logger.WriteLine(string.Format("MaxDurchfluss2={0}", 0)); /// 42,23333 + logger.WriteLine(string.Format("Q_Einstellzeit2={0}", 0)); /// 3,80 + logger.WriteLine(string.Format("Pumpennummer2={0}", 0)); /// 3 + logger.WriteLine(string.Format("Drehzahl2={0}", 0)); /// 1743 + logger.WriteLine(string.Format("DAW_Wert2={0}", 0)); /// 500 + logger.WriteLine(string.Format("Leitfähigkeit2={0}", 0)); /// 543,10 + logger.WriteLine(string.Format("LuftDruck2={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("LuftFeuchtigkeit2={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("HyDruck2={0}", 0)); /// 6,2 + logger.WriteLine(string.Format("VorratsDruckHy2={0}", 0)); /// 6,3 + logger.WriteLine(string.Format("Anfangsgewicht2_2={0}", 0)); /// 37,95000 + logger.WriteLine(string.Format("Endgewicht2_2={0}", 0)); /// 37,94400 + logger.WriteLine(string.Format("Prüfmasse2_2={0}", 0)); /// -0,00600 + logger.WriteLine(string.Format("GegenWaage2={0}", 0)); /// 1 + /// + logger.WriteLine(string.Format("Q3_geprüft={0}", 1)); /// 1 + logger.WriteLine(string.Format("Prüfvolumen3={0}", 0)); /// 107,76493 + logger.WriteLine(string.Format("Prüfmasse3={0}", 0)); /// 107,46800 + logger.WriteLine(string.Format("Temp1_P3={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp2_P3={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp3_P3={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp4_P3={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp5_P3={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp6_P3={0}", 0)); /// 19,8 + logger.WriteLine(string.Format("Temp7_P3={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Temp8_P3={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("Druck1_P3={0}", 0)); /// 6,3 + logger.WriteLine(string.Format("Druck2_P3={0}", 0)); /// 1,4 + logger.WriteLine(string.Format("K-Faktor3={0}", 0)); /// 0,99824190 + logger.WriteLine(string.Format("Q_Waage3={0}", 0)); /// 3874,27093 + logger.WriteLine(string.Format("Q_Vergleich3={0}", 0)); /// 3867,08324 + logger.WriteLine(string.Format("Fehler_Vergleich3={0}", 0)); /// -0,18552 + logger.WriteLine(string.Format("VZ_ZeitImpulse3={0}", 0)); /// 100,13594 + logger.WriteLine(string.Format("VZ_Impulse3={0}", 0)); /// 129078 + logger.WriteLine(string.Format("ZeitImpulse_VZ3={0}", 0)); /// 195578 + logger.WriteLine(string.Format("VorwahlZähler3={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("VZ_Nummer3={0}", 0)); /// 1 + logger.WriteLine(string.Format("Anfangsgewicht3={0}", 0)); /// 11,20800 + logger.WriteLine(string.Format("Endgewicht3={0}", 0)); /// 118,67600 + logger.WriteLine(string.Format("MinDurchfluss3={0}", 0)); /// 3862,00000 + logger.WriteLine(string.Format("MaxDurchfluss3={0}", 0)); /// 3872,00000 + logger.WriteLine(string.Format("Q_Einstellzeit3={0}", 0)); /// 26,37 + logger.WriteLine(string.Format("Pumpennummer3={0}", 0)); /// 2 + logger.WriteLine(string.Format("Drehzahl3={0}", 0)); /// 2269 + logger.WriteLine(string.Format("DAW_Wert3={0}", 0)); /// 1501 + logger.WriteLine(string.Format("Leitfähigkeit3={0}", 0)); /// 543,10 + logger.WriteLine(string.Format("LuftDruck3={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("LuftFeuchtigkeit3={0}", 0)); /// 0,0 + logger.WriteLine(string.Format("HyDruck3={0}", 0)); /// 6,2 + logger.WriteLine(string.Format("VorratsDruckHy3={0}", 0)); /// 6,3 + logger.WriteLine(string.Format("Anfangsgewicht2_3={0}", 0)); /// 0,00818 + logger.WriteLine(string.Format("Endgewicht2_3={0}", 0)); /// 0,00800 + logger.WriteLine(string.Format("Prüfmasse2_3={0}", 0)); /// -0,00018 + logger.WriteLine(string.Format("GegenWaage3={0}", 0)); /// 1 + /// + logger.WriteLine(string.Format("Q4_geprüft={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("Q5_geprüft={0}", 0)); /// 0 + /// + logger.WriteLine(string.Format("FüllenDruck={0}", 0)); /// 0,00 + logger.WriteLine(string.Format("EvakVorneDruck={0}", 0)); /// 0,00 + logger.WriteLine(string.Format("EvakHintenDruck={0}", 0)); /// -1,00 + logger.WriteLine(string.Format("Spüldurchfluss={0}", 0)); /// 4722,00 + logger.WriteLine(string.Format("AbpressDruck={0}", 0)); /// 20,13 + logger.WriteLine(string.Format("AbpressDruckVorne={0}", 0)); /// 20,16 + logger.WriteLine(string.Format("AbpressDruckBeginn={0}", 0)); /// 0,00 + logger.WriteLine(string.Format("EntwässernDruck={0}", 0)); /// -1,00 + logger.WriteLine(string.Format("ZaehlwerktestAnfang={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("ZaehlwerktestEnde={0}", 0)); /// 0,00000 + logger.WriteLine(string.Format("ZaehlwerktestImpulse={0}", 0)); /// 0 + logger.WriteLine(string.Format("MeldungZaehler={0}", 0)); /// 0 + + + logger.WriteLine(string.Empty); + logger.WriteLine("[allgemein]"); + /// logger.WriteLine(string.Format("Prüfer={0}", 6)); /// 1047 logger.WriteLine(string.Format("PrüferID={0}", 6)); /// 246 logger.WriteLine(string.Format("AuftragKompakt={0}", 0)); /// 4248189 diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 33fd2eccd..62f879aa0 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -75,28 +75,7 @@ namespace TBF.BenchControl static IList states; /// list of states - static DateTime cycleStartTimeStamp; - public static DateTime CycleStartTimeStamp - { - get { return cycleStartTimeStamp; } - set - { - cycleStartTimeStamp = value; - CycleStartYY = (cycleStartTimeStamp.Year % 100).ToString("D2"); - CycleStartMM = cycleStartTimeStamp.Month.ToString("D2"); - CycleStartDD = cycleStartTimeStamp.Day.ToString("D2"); - CycleStartHH_MI_SS = string.Format("{0}_{1}_{2}", - cycleStartTimeStamp.Hour.ToString("D2"), - cycleStartTimeStamp.Minute.ToString("D2"), - cycleStartTimeStamp.Second.ToString("D2")); - } - } - - public static string CycleStartYY; - public static string CycleStartMM; - public static string CycleStartDD; - public static string CycleStartHH_MI_SS; - + public static DateTime CycleStartTimeStamp; public static IList DefaultValvesOpen { diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/OptoTelegramRaw.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/OptoTelegramRaw.cs index 280e5bffe..f64162a30 100644 --- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/OptoTelegramRaw.cs +++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/OptoTelegramRaw.cs @@ -91,7 +91,7 @@ namespace TBF.BenchControl.WaterMeters.iPerl /// ... /// /// A complete byte array data - /// ConfigStruct or null when byte array was not complete + /// true = telegram OK, false = telegram NOK public bool UpdateFromString(string telegram, int counter) { DateTime = DateTime.Now; @@ -103,6 +103,7 @@ namespace TBF.BenchControl.WaterMeters.iPerl (telegram[23] != '\t') || (telegram[28] != '\t') || (telegram[37] != '\t') || (telegram[40] != '\r') || (telegram[41] != '\n')) { + Flags = OptoTelegramFlags.InvalidTelegram; return false; } @@ -114,7 +115,11 @@ namespace TBF.BenchControl.WaterMeters.iPerl bool f6 = Int64.TryParse(telegram.Substring(29, 8), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out Timestamp); bool f7 = byte.TryParse(telegram.Substring(38, 2), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out CheckSum); - return f1 && f2 && f3 && f4 && f5 && f6 && f7; + bool allOk = f1 && f2 && f3 && f4 && f5 && f6 && f7; + + Flags = allOk ? OptoTelegramFlags.OK : OptoTelegramFlags.InvalidTelegram; + + return allOk; } diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs index 19362b0f2..65f24d5c4 100644 --- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs +++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs @@ -489,14 +489,14 @@ namespace TBF.BenchControl.WaterMeters.iPerl if (TestName != null && TestName.ToLower().Contains("q1")) flowNr = "01"; else if (TestName != null && TestName.ToLower().Contains("q2")) flowNr = "02"; else if (TestName != null && TestName.ToLower().Contains("q3")) flowNr = "03"; - else if (TestName != null && TestName.ToLower().Contains("adj")) flowNr = "00"; + else if (TestName != null && TestName.ToLower().Contains("adj")) flowNr = "0-1"; else flowNr = "99"; optoDataLogFileName = string.Format("{0}_{1}_{2}_{3}.txt", (ConfigStruct != null) ? ConfigStruct.PCBNumber2String() : "UnknownPcbNr", wmPosition, flowNr, - StateMachine.CycleStartHH_MI_SS); + StateMachine.CycleStartTimeStamp.ToString("HH_mm_ss")); StartParsingOptoSerialPort(); } @@ -553,25 +553,22 @@ namespace TBF.BenchControl.WaterMeters.iPerl void SaveOptoData() { - string directory = "C:\\TBF\\ProcessData\\"; /// TODO: determine correct relative path + string directory = string.Format("C:\\TBF\\ProcessData\\{0}\\{1}\\{2}\\", + StateMachine.CycleStartTimeStamp.ToString("yy"), + StateMachine.CycleStartTimeStamp.ToString("MM"), + StateMachine.CycleStartTimeStamp.ToString("dd")); try { - Directory.CreateDirectory(directory); - directory += (StateMachine.CycleStartYY + "\\"); - Directory.CreateDirectory(directory); - directory += (StateMachine.CycleStartMM + "\\"); - Directory.CreateDirectory(directory); - directory += (StateMachine.CycleStartDD + "\\"); - Directory.CreateDirectory(directory); + Directory.CreateDirectory(directory); - double scalFact = ScalingFactor(); + double scalFact = ScalingFactor(); - using (TextWriter optoLogFile = new StreamWriter(directory + optoDataLogFileName)) - { - optoLogFile.WriteLine(optoData[0].ToString(scalFact, null)); - for (int i = 1; i < optoDataCount; i++) optoLogFile.WriteLine(optoData[i].ToString(scalFact, optoData[i - 1])); - optoLogFile.Close(); - } + using (TextWriter optoLogFile = new StreamWriter(directory + optoDataLogFileName)) + { + optoLogFile.WriteLine(optoData[0].ToString(scalFact, null)); + for (int i = 1; i < optoDataCount; i++) optoLogFile.WriteLine(optoData[i].ToString(scalFact, optoData[i - 1])); + optoLogFile.Close(); + } } catch (Exception exc) { @@ -670,7 +667,7 @@ namespace TBF.BenchControl.WaterMeters.iPerl else { optoData[optoDataCount].Counter = optoDataCount; - optoData[optoDataCount++].SetFlags(OptoTelegramFlags.InvalidTelegram); + optoDataCount++; allRcvd = allRcvd.Substring(pos + 2); } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 639978a77..d243981e8 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.230.1")] -[assembly: AssemblyFileVersion("2.3.230.1")] +[assembly: AssemblyVersion("2.3.231.1")] +[assembly: AssemblyFileVersion("2.3.231.1")]