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

release

Browse Source
This commit is contained in:
Roland Drabesch 2022-04-21 11:31:41 +02:00
parent 9f8d315b8f
commit ad752435c1
10 changed files with 295 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/.shared/SharedAssemblyInfo.cs
View File

@ -15,4 +15,4 @@ using System.Reflection;
[assembly: AssemblyVersion("2.2.0.*")]
[assembly: AssemblyFileVersion("1.3.0.10")]
[assembly: AssemblyFileVersion("2.2.0.0")]

2
Common/.vs/config/applicationhost.config
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" />

512
Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json
View File

File diff suppressed because it is too large Load Diff

2
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
7ac73abb7afd9e6ddc0520a1568581c7ed0afd36
46bd00889699f5a20a4981a22f62b66368323855

3
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs
View File

@ -149,6 +149,9 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
return;
}
reTrysLeft = reTrysLeft - 1;
currentProcessState = ProductionProcessState.Done;
return;
}
catch (Exception ex)
{

4
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessConnect.cs
View File

@ -67,8 +67,8 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
{
try
{
//var url = $"http://localhost:56011/api/FinalCheck/GetProgrammingParameters?PcbID={base.Meter.PcbId}";
var url = $"{ServiceUrls.GenesisFinalCheckServiceUrl()}GetProgrammingParameters?PcbID={base.Meter.PcbId}";
var url = $"http://localhost:56011/api/FinalCheck/GetProgrammingParameters?PcbID={base.Meter.PcbId}";
//var url = $"{ServiceUrls.GenesisFinalCheckServiceUrl()}GetProgrammingParameters?PcbID={base.Meter.PcbId}";
var csdRet = LocalWebRequest.GetRequest(url, 80000);
return Newtonsoft.Json.JsonConvert.DeserializeObject<IList<ProgrammingParameters>>(csdRet);

4
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs
View File

@ -237,7 +237,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
}
else
{
if (cTask.Result.Item1.ToLower() == "SENSUSRADIO_MetroRadioLifeTimeCounter".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_LeakFlowThreshold".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_ExcessFlowVolumeThreshold".ToLower())
if (cTask.Result.Item1.ToLower().Contains("Metersize".ToLower()) || cTask.Result.Item1.ToLower() == "SENSUSRADIO_MetroRadioLifeTimeCounter".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_LeakFlowThreshold".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_ExcessFlowVolumeThreshold".ToLower())
{
base.NewStatus($"Warnung!Schreiben des Parameter {cTask.Result.Item1} war nicht erfolgreich");
}
@ -278,7 +278,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
else
{
base.currentProcessState = ProductionProcessState.Error;
reTrysLeft = 0;
reTrysLeft = -1;
base.NewStatus($"Warnung!Fehler beim laden des Parametersatzes");
}

10
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessRadioCheck.cs
View File

@ -261,15 +261,15 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
catch (Exception ex)
{
saveData.LimitId = 0;
RSSI_PAM_Min = 120;
RSSI_PAM_Min = 100;
RSSI_PAM_Max = 163;
RSSI_SEMI_Min = 150;
RSSI_SEMI_Max = 182;
RSSI_PAM_Max = 200;
RSSI_SEMI_Min = 100;
RSSI_SEMI_Max = 200;
// RSSI_PAM_Min RSSI_PAM_Max RSSI_SEMI_Min RSSI_SEMI_Max
//145 164 182
throw new Exception("Fehler in GetRssiMinMax()", ex);
// throw new Exception("Fehler in GetRssiMinMax()", ex);
}
}

2
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
f64d563def603c89cafafa61a3219ba97e1e344c
0d85a5b3a7561b41163c20e5dc7713bcd0d65555

25
Common/Ui/LegacyGenesisControl/ctlMeterReady.Designer.cs generated
View File

@ -39,7 +39,6 @@
this.lblDataP2 = new System.Windows.Forms.Label();
this.lblDataP3 = new System.Windows.Forms.Label();
this.tmrBusy = new System.Windows.Forms.Timer(this.components);
this.lblSerialNr = new System.Windows.Forms.Label();
this.lblFlowTest = new System.Windows.Forms.Label();
this.lblPreadjustment = new System.Windows.Forms.Label();
this.nudCalibrationTarget = new System.Windows.Forms.NumericUpDown();
@ -50,6 +49,7 @@
this.cbDoFlowCalibration = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.cbxDoTesting = new System.Windows.Forms.CheckBox();
this.lblSerialNr = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.nudCalibrationTarget)).BeginInit();
this.SuspendLayout();
//
@ -167,17 +167,6 @@
this.tmrBusy.Interval = 1000;
this.tmrBusy.Tick += new System.EventHandler(this.tmrBusy_Tick);
//
// lblSerialNr
//
this.lblSerialNr.AutoSize = true;
this.lblSerialNr.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblSerialNr.Location = new System.Drawing.Point(52, 3);
this.lblSerialNr.Name = "lblSerialNr";
this.lblSerialNr.Size = new System.Drawing.Size(109, 24);
this.lblSerialNr.TabIndex = 13;
this.lblSerialNr.Text = "000000000";
this.lblSerialNr.Click += new System.EventHandler(this.lblSerialNr_Click);
//
// lblFlowTest
//
this.lblFlowTest.AutoSize = true;
@ -315,11 +304,20 @@
this.cbxDoTesting.UseVisualStyleBackColor = true;
this.cbxDoTesting.CheckedChanged += new System.EventHandler(this.cbxDoTesting_CheckedChanged);
//
// lblSerialNr
//
this.lblSerialNr.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblSerialNr.Location = new System.Drawing.Point(48, 3);
this.lblSerialNr.Name = "lblSerialNr";
this.lblSerialNr.Size = new System.Drawing.Size(116, 22);
this.lblSerialNr.TabIndex = 24;
//
// ctlMeterReady
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.Controls.Add(this.lblSerialNr);
this.Controls.Add(this.label1);
this.Controls.Add(this.cbxDoTesting);
this.Controls.Add(this.cbDoFlowCalibration);
@ -331,7 +329,6 @@
this.Controls.Add(this.lblPreadjustment);
this.Controls.Add(this.lblFlowTest);
this.Controls.Add(this.lblSlot);
this.Controls.Add(this.lblSerialNr);
this.Controls.Add(this.lblDataP3);
this.Controls.Add(this.lblDataP2);
this.Controls.Add(this.lblDataP1);
@ -361,7 +358,6 @@
private System.Windows.Forms.Label lblDataP2;
private System.Windows.Forms.Label lblDataP3;
private System.Windows.Forms.Timer tmrBusy;
private System.Windows.Forms.Label lblSerialNr;
private System.Windows.Forms.Label lblFlowTest;
private System.Windows.Forms.Label lblPreadjustment;
private System.Windows.Forms.NumericUpDown nudCalibrationTarget;
@ -372,5 +368,6 @@
private System.Windows.Forms.CheckBox cbDoFlowCalibration;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox cbxDoTesting;
private System.Windows.Forms.TextBox lblSerialNr;
}
}