michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ver. 3.1.1836

Browse Source
This commit is contained in:
Milan Hanajik
2021-12-14 08:15:05 +01:00
parent 47511ef873
commit 804cf2aaea
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.1.1835.0")]
[assembly: AssemblyFileVersion("3.1.1835.0")]
[assembly: AssemblyVersion("3.1.1836.0")]
[assembly: AssemblyFileVersion("3.1.1836.0")]
TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
+2 -3
View File
@@ -1059,10 +1059,9 @@ namespace TBF.Rig.TestMethods.S640Communication
else if (activity == S640Activity.End)
{
#if ORACLE_DB
file.WriteLine(string.Format(" <Meter RadioAddress=\"{0}\" MeterNumber=\"{1}\" CustomerText=\"{2}\" NewRadioAddress=\"{3}\" PCBNumber=\"{4}\" EncyptionKey=\"\" />",
file.WriteLine(string.Format(" <Meter RadioAddress=\"{0}\" MeterNumber=\"{1}\" CustomerText=\"\" NewRadioAddress=\"{2}\" PCBNumber=\"{3}\" EncyptionKey=\"\" />",
wm.OriRadioAddress,
wm.AssignedSerialNr.ToString(),
wm.AssignedSerialNr.ToString(),
wm.RadioAddress,
wm.SerialNrAux));
#endif
@@ -1072,7 +1071,7 @@ namespace TBF.Rig.TestMethods.S640Communication
file.WriteLine(" </Meters>");
file.WriteLine(string.Format(" <Metro Enable=\"{0}\" PulseRatePiston=\"{1}\" PulseRateLED=\"{2}\" OffsetFactor=\"{3}\" FactoryCalibration=\"{4}\" Units=\"{5}\" MeterSize=\"{6}\" OffsetTime=\"{7}\" />",
B2S(pPars.MetroEnable),
pPars.PulseRatePiston.ToString("F3", CultureInfo.InvariantCulture),
pPars.PulseRatePiston.ToString("F12", CultureInfo.InvariantCulture),
pPars.PulseRateLed.ToString(CultureInfo.InvariantCulture),
pPars.OffsetFactor.ToString(CultureInfo.InvariantCulture),
pPars.FactoryCalibration,