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

ö

Browse Source
This commit is contained in:
Roland Drabesch
2023-08-02 16:45:17 +02:00
parent 7843225499
commit c64b0d901b
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/TempFlansh/Program.cs
+7 -6
View File
@@ -13,10 +13,10 @@ namespace TempFlansh
[STAThread]
private static void Main()
{
//Console.WriteLine("Comport");
//short cport = short.Parse(Console.ReadLine());
//var ap = TempHelper.UniversalOpenCom(cport, 4800, 8, 0, 0);
//var helper = new TempHelper();
Console.WriteLine("Comport");
short cport = short.Parse(Console.ReadLine());
var ap = TempHelper.UniversalOpenCom(cport, 4800, 8, 0, 0);
var helper = new TempHelper();
//var filename = $"{DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}_temp.log";
////while (true)
////{
@@ -50,8 +50,9 @@ namespace TempFlansh
while (pipeServer.IsConnected)
{
sw.WriteLine("19.0");
//sw.WriteLine(helper.ReadCurrentDisplayValue().ToString());
//sw.WriteLine("19.0");
sw.WriteLine(helper.ReadCurrentDisplayValue().ToString());
Console.WriteLine(helper.ReadCurrentDisplayValue().ToString());
Thread.Sleep(500);
}
Common/Ui/GenesisToolBox/FrmTempMeter.cs
+8 -5
View File
@@ -695,7 +695,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
this._currentGenesis?.StartRecordData();
this._currentGenesis?.WriteRegister<Byte>(Register.Genesisflow.SampleRate, 16, checkRegister: true);
this.automaticCalibration = new AutomaticTemperaturCalibration(() => 10.0/*() => this.OutputAvgTof()*/);
this.automaticCalibration = new AutomaticTemperaturCalibration(() => this.OutputAvgTof());
this.automaticCalibration.TemperatureMesured += this.SaveMessurement;
this.automaticCalibration.StartMessuring();
@@ -718,7 +718,10 @@ namespace Xylem.Common.Ui.GenesisToolBox
var pcbid = this._currentGenesis.PcbId;
File.AppendAllLines($"{timestamp:yyyy_MM_dd}.messurements", new[] { $"{pcbid};{referenceT};{meterTOF};{timestamp.ToLongTimeString()}" });
LocalWebRequest.PostRequestAsync($"http://10.49.40.25/MeterProcessState/api/TempFlange/AddLut?PcbId={pcbid}&RefTempC={referenceT}&AvgTof={meterTOF}");
var tmp = referenceT.ToString("us-US");
var tof = meterTOF.ToString("us-US");
LocalWebRequest.PostRequestAsync($"http://10.49.40.25/MeterProcessState/api/TempFlange/AddLut?PcbId={pcbid}&RefTempC={tmp}&AvgTof={tof}");
}
}
@@ -738,7 +741,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
public AutomaticTemperaturCalibration(Func<double> meterTCallback)
{
if (this.meterTCallback != null)
if (meterTCallback != null)
{
this.meterTCallback = meterTCallback;
this.messurementsCount = Appsettings.MessurementDauer / Appsettings.MessurementStep;
@@ -886,8 +889,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
{
var referenceTemperatureLine = this.streamReader.ReadLine();
if (double.TryParse(referenceTemperatureLine, NumberStyles.Any, new CultureInfo("us"), out referenceT)
|| double.TryParse(referenceTemperatureLine, NumberStyles.Any, new CultureInfo("de"), out referenceT))
if (double.TryParse(referenceTemperatureLine, NumberStyles.Any, new CultureInfo("de"), out referenceT)
|| double.TryParse(referenceTemperatureLine, NumberStyles.Any, new CultureInfo("us"), out referenceT))
{
succeeded = true;
Common/Ui/GenesisToolBox/Infrastructure/Appsettings.cs
+3 -3
View File
@@ -14,8 +14,8 @@
/// </summary>
public static int TemperatureCheckInMs
{
get => GetValue<int>(60_000);
set => value.SetValue(60_000);
get => GetValue<int>(6_000);
set => value.SetValue(6_000);
}
/// <summary>
@@ -68,7 +68,7 @@
private static double GetValue<T>(double @default, [CallerMemberName] string property = "")
{
if (double.TryParse($"{settings[property].Value}", out var value))
if (double.TryParse($"{settings[property]?.Value}", out var value))
{
return value;
}