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

version changed back to 2.6.0

Browse Source
This commit is contained in:
Stoyan Zlatev
2023-09-04 14:34:54 +02:00
parent 626baaf2d7
commit 4b808005e7
3 changed files with 13 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.shared/SharedAssemblyInfo.cs
+2 -2
View File
@@ -14,5 +14,5 @@ using System.Reflection;
//[assembly: AssemblyVersion("1.2.*.0")]
[assembly: AssemblyVersion("2.6.4.*")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyVersion("2.6.0.*")]
[assembly: AssemblyFileVersion("2.6.0.0")]
Common/Ui/GenesisToolBox/FrmTempMeter.cs
+9 -57
View File
@@ -68,7 +68,7 @@
{
try
{
if (!int.TryParse($"{this.slotsList.SelectedItem}", out int slotNr))
if (!int.TryParse($"{this.slotsList.SelectedItem}", out var slotNr))
{
return;
}
@@ -104,7 +104,6 @@
var a = GetLutsText(currentGenesis.PcbId);
//
currentGenesis.InitMeasurement();
Invoke(new Action(() =>
{
@@ -123,7 +122,7 @@
this.SetEnabled(ProgrammState.Connected);
}));
});//.ContinueWith(delegate { ViewProgressPcb(false); });
});
}
catch (Exception ex)
{
@@ -166,7 +165,6 @@
private String GetLutsText(String PcbId)
{
var ret = new StringBuilder();
var err = 0;
var resp = LocalWebRequest.GetRequest($"http://10.49.40.25/MeterProcessState/api/TempFlange/GetLut?PcbId={PcbId}");
ret.AppendLine($"Ref Temp C°\t|\t AvgTof");
@@ -198,52 +196,7 @@
return ret.ToString();
}
public void tmp()
{
//var cRecords = _currentGenesis.CurrentRecords.ToList();
//Log($"cRecords.Count={cRecords.Count}");
//if (cRecords != null && cRecords.Any())
//{
// decimal checkTempMeter = 0;
// if (MeterTempMode == TempMode.CalcTof)
// {
// //
// var sumTof = 0.0;
// var countTof = 0;
// foreach (var tofItem in cRecords.Where(c => c.Channel == 2))
// {
// if (tofItem.Channel == 2)
// {
// Log($"TotalTimeOfFlightS;{(tofItem.TotalTimeOfFlightS * 1000).ToString()}");
// Log($"RAWTEMP;{interPol(TempFromTofLUT, (tofItem.TotalTimeOfFlightS * 1000))}");
// sumTof = (tofItem.TotalTimeOfFlightS * 1000) + sumTof;
// countTof = countTof + 1;
// }
// }
// var x = (sumTof / countTof) / 1000;
// Log($"avgTof;{x}({sumTof}/{countTof})");
// checkTempMeter = interPol(TempFromTofLUT, x);
// Meter.CurrentRecords.Clear();
// }
// else
// {
// checkTempMeter = (decimal)cRecords.Last().TemperatureDegC;
// }
//}
}
private DateTimeOffset start;
private Task tempTask;
private void BtnStartRecord_Click(Object sender, EventArgs e)
{
@@ -337,8 +290,6 @@
{
Decimal checkTempMeter = 0;
//
var sumTof = 0.0;
var countTof = 0;
foreach (var tofItem in cRecords.Where(c => c.Channel == 2))
@@ -347,17 +298,18 @@
if (tofItem.Channel == 2)
{
sumTof = (tofItem.TotalTimeOfFlightS * 1000) + sumTof;
sumTof = tofItem.TotalTimeOfFlightS * 1000 + sumTof;
countTof = countTof + 1;
}
}
var x = (sumTof / countTof) / 1000;
var x = sumTof / countTof / 1000;
checkTempMeter = interPol(cordonelTempLut, x);
var a = new Hardware.WaterMeter.Genesis.DataPackages.MeasurementRecords.CalibrationRecord();
var a = new CalibrationRecord();
while (currentGenesis.CurrentRecords.TryDequeue(out a))
{
// do nothing
@@ -546,8 +498,8 @@
File.AppendAllText(fiName, jsonData);
}
private Int32 PlateauMinLengt = 15;
private Double TempConstMarker = 0.01;
//private Int32 PlateauMinLengt = 15;
//private Double TempConstMarker = 0.01;
private List<TempTofCalc> toGrid = new List<TempTofCalc>();
private void timer3_Tick(Object sender, EventArgs e)
@@ -558,7 +510,7 @@
private Double generateTof(Random r , Double temp)
{
var tmp = r.Next(1, 5);
var retrn = (temp / 9000) - Math.Pow(temp, 1.6) / 100_000;
var retrn = temp / 9000 - Math.Pow(temp, 1.6) / 100_000;
return retrn - (retrn * tmp / 100 + Math.Pow(tmp, 1.6) / 100_000);
}
Common/Ui/GenesisToolBox/GenesisToolBox.csproj
+2 -2
View File
@@ -25,7 +25,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.5.0.%2a</ApplicationVersion>
<ApplicationVersion>2.6.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
@@ -43,7 +43,7 @@
<LangVersion>7.0</LangVersion>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<DocumentationFile>bin\Debug\Xylem.Common.Ui.GenesisToolBox.xml</DocumentationFile>
<NoWarn>1591</NoWarn>
<NoWarn>0003;1591;</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>