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

still fixing fai bugs

Browse Source
This commit is contained in:
Roland Drabesch
2022-09-06 16:22:09 +02:00
parent 58358332c6
commit b65026ce01
26 changed files with 745 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelAssemblyLine/Model/LeakViewModel.cs
+2 -1
View File
@@ -268,6 +268,7 @@ namespace CordonelAssemblyLine.Model
{
try
{
var url = ServiceUrls.MeterProcessStateUrl();
url = url + $"GetPressureStateDetailed?PcbId={CurrentPcbID}&TopCount=1";
var tmp = 0;
@@ -286,7 +287,7 @@ namespace CordonelAssemblyLine.Model
PressureResultData = new PressureResultDataNotifyable();
}
PressureResultData = new PressureResultDataNotifyable(pressureResultData.First());
PressureResultData = new PressureResultDataNotifyable();
if (!CurrentPcbHasPressure)
{
PressureResultData.Testpoints.Remove(PressureResultData.Testpoints.First(r => r.Ident == 10));
Common/CordonelAssemblyLine/Model/PickingModel.cs
+62 -1
View File
@@ -282,6 +282,7 @@ namespace CordonelAssemblyLine.Model
WaitForBuildingMeterReady,
WaitForBuildingPressureReady,
LutUpdate,
JustSapProgress,
}
private PickingStateMachine sm = PickingStateMachine.Init;
@@ -739,6 +740,15 @@ namespace CordonelAssemblyLine.Model
Scanner = $"Offen {ScannerPort}";
setState($"Warte auf Scannereingabe({ScannerPort})");
if (barScanner != null && !String.IsNullOrEmpty(barScanner.Input))
{
if (barScanner.Input == "%Cordonel_SAP_100%" || barScanner.Input == "%Cordonel_SAP_101%")
{
sm = PickingStateMachine.JustSapProgress;
}
else
{
int o = 0;
if (int.TryParse(barScanner.Input, out o))
{
Order = barScanner.Input;
Scanner = $"Geschlossen {ScannerPort}";
@@ -750,8 +760,59 @@ namespace CordonelAssemblyLine.Model
lblS01Color = progressDone;
lblS02Color = progressWating;
}
}
}
break;
case PickingStateMachine.JustSapProgress:
using (var Batch = new MeterBatch())
{
using (var tryMeter = new GenesisMeter())
{
try
{
setState($"Warte auf Pcb");
Slot = $"Öffne EP {SlotNr}";
tryMeter.SetupFromConfigFile(SlotNr);
Batch.AddMeter(tryMeter);
tryMeter.Logout();
Log("Try to get PcbID");
PcbId = tryMeter.GetPcbId();
var hasDetect = !string.IsNullOrEmpty(PcbId);
if (hasDetect)
{
setState($"Pcb gefunden {PcbId}");
Log($"New PcbID detected {PcbId}");
//barScanner.Input = "%Cordonel_SAP_100%";
sm = PickingStateMachine.WaitForBuildingMeterReady;
}
else
{
Slot = $"Keine Konnektivität EP {SlotNr}";
lblS02Text = Slot;
Log($"No Meter found");
}
}
catch (Exception e)
{
Log($"Error occur.{ Environment.NewLine} {e.Message}");
}
}
}
break;
case PickingStateMachine.WaitForDetect:
using (var Batch = new MeterBatch())
{
@@ -959,7 +1020,7 @@ namespace CordonelAssemblyLine.Model
{
}
if (OrderDetails.PressurePresent)
if (OrderDetails != null && OrderDetails.PressurePresent)
{
barScanner = new BarScanner(ScannerPort, token);
Common/CordonelPreadjustmentUi/Parameters/FlushParams.cs
+9 -1
View File
@@ -17,10 +17,18 @@ namespace CordonelPreadjustmentUi.Parameters
{
case MeterSize.DN50:
case MeterSize.DN40:
FlowrateQmH = 40;
DurationS = 120;
break;
case MeterSize.DN65:
FlowrateQmH = 80;
DurationS = 120;
break;
case MeterSize.DN80:
FlowrateQmH = 100;
DurationS = 120;
break;
default:
Message = $"Warning no parameter for meter size {meterSize.GetHashCode()} use default!{Environment.NewLine}";
FlowrateQmH = 40;
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
+1
View File
@@ -1882,6 +1882,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
public byte[] SendUI1236Command(byte[] UI1236Frame,bool waitForResult = true,bool checkRegister = false,ushort skipRetryErrorCode = 4)
{
this._logger.Info(string.Format("Slot:{0} - Sending Ui-1236 frame: {1} ", (object)this.Slot, (object)UI1236Frame));
this.RequestProtocol.AdditionalRetryTimeoutMs = 500000;
RequestRecord sendFifoUi1236 = this.RequestProtocol.AddRecordToSendFifoUI1236(UI1236Frame);
this.RequestProtocolProcess();
return sendFifoUi1236.ResponsePayload.ToArray();
Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/RequestProtocol.cs
+1 -2
View File
@@ -200,7 +200,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol
//increase the timeout with each retry
_timeOutMs = _recordInProcess.ResponseTimeoutMs + AdditionalRetryTimeoutMs +
CommunicationConfig.ResponseTimeoutMs * (_recordInProcess.RetryCtr + 1);
//start initial communication or retry
OnRecordReadyToSend?.Invoke(this, new ListBytePortDataEventArgs(_recordInProcess.EncodedRequestData));
var requestTimeUtc = DateTimeOffset.UtcNow;
@@ -323,7 +322,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol
ITransmitProtocol transmitProtocol = this.GetTransmitProtocol();
List<byte> encodedRequestData = transmitProtocol.DecodeDataForPhysicalLayerUI1236(payload);
TransmitPortSettings transmitPortSettings = transmitProtocol.GetTransmitPortSettings();
RequestRecord sendFifoUi1236 = new RequestRecord(maxValue, requestProtocolData, encodedRequestData, transmitPortSettings.ResponseTimeoutMs, register, hideDataInLog, skipRetryErrorCode);
RequestRecord sendFifoUi1236 = new RequestRecord(maxValue, requestProtocolData, encodedRequestData,50000, register, hideDataInLog, skipRetryErrorCode);
this._recordsSendFifo.Enqueue(sendFifoUi1236);
return sendFifoUi1236;
}
Common/Hardware/WaterMeter/Genesis/Registers/RegisterConverter.cs
+2 -1
View File
@@ -64,7 +64,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers
}
else if (value is SByte)
{
converted[0] = (Byte)Convert.ToSByte(value);
return BitConverter.GetBytes(Convert.ToSByte(value));
}
else if (value is Boolean)
{
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
46bd00889699f5a20a4981a22f62b66368323855
5ed75d99ee45ff67821090f1b3dbb001dd9e4fe3
Common/Logic/ProductionOrderCore/OrderData/OrderProgrammingParameters.cs
+1 -1
View File
@@ -139,7 +139,7 @@ namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
foreach (DataRow row in MapData.Rows)
{
//ret.Add(new ProgrammingParameters(row["RegisterName"].ToString(), RegisterConverter.ConvertFrom<sbyte>((sbyte)row["RegisterValue"]), ProgrammingSource.Vako));
ret.Add(new ProgrammingParameters(row["RegisterName"].ToString(), RegisterConverter.ConvertFrom(Convert.ToInt32(row["RegisterValue"])), ProgrammingSource.Vako));
}
}
Common/ProductionUiCordonel/FinalTest.xaml.cs
+8 -8
View File
@@ -449,19 +449,19 @@ namespace ProductionUiCordonel
//pc.Processes.Add(new ProductionProcessFinalParameterizationFix()); //[x] [x] []
pc.Processes.Add(new ProductionProcessFinalParameterizationVakoCsd(connectProcess)); //[x] [x] []
var radioCheck = new ProductionProcessRadioCheck();
orderBarcode.isDone += delegate (object sender, EventArgs e)
{
radioCheck.Ordernumber = ((ProductionProcessCheckOrderNumber)sender).Ordernumber;
};
pc.Processes.Add(radioCheck); //[] [] []
//var radioCheck = new ProductionProcessRadioCheck();
//orderBarcode.isDone += delegate (object sender, EventArgs e)
//{
// radioCheck.Ordernumber = ((ProductionProcessCheckOrderNumber)sender).Ordernumber;
//};
//pc.Processes.Add(radioCheck); //[] [] []
//pc.Processes.Add(new ProductionProcessSpecialConfig()); //[x] [x] []
pc.Processes.Add(new ProductionProcessShippingMode()); //[] [] []
pc.Processes.Add(new ProductionProcessShippingMode(true)); //[] [] []
pc.Processes.Add(new ProductionProcessFinalParameterizationVakoCsd(connectProcess)); //[x] [x] []
pc.Processes.Add(new ProductionProcessShippingMode()); //[] [] []
pc.Processes.Add(new ProductionProcessShippingMode(false)); //[] [] []
pc.Processes.Add(new ProductionProcessFullReadOut()); //[x] [x] [x]
pc.Processes.Add(new ProductionProcessLogOff()); //[] [] []
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckOrderNumber.cs
+2
View File
@@ -151,6 +151,8 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
var a = JsonConvert.DeserializeObject<string[]>(responseJson);
SerialNumber = Convert.ToInt32(a[0]);
Ordernumber = Convert.ToInt32(a[1]);
Meter.SerialNumber = SerialNumber.ToString();
}
}
else
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckSerialNumber.cs
+1 -1
View File
@@ -82,7 +82,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
private void UserControl_KeyDown(object sender, string input)
{
var a = input;
PcbSerialNumber = Meter.SerialNumber;
UserControl.txtHiddenInput.Text = "";
if (a.Trim().Contains(PcbSerialNumber.Trim()))
{
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs
+8 -1
View File
@@ -124,7 +124,11 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
}
//todo: find a better sln for SENSUSRADIO_EncryptionKey
//SENSUSRADIO_EncryptionKey dont reserve SENSUSRADIO_EncryptionKey!
if (item.RegisterName.ToLower().Contains("SENSUSRADIO_EncryptionKey".ToLower()))
if (item.RegisterName.ToLower().Contains("displaypow".ToLower()) || item.RegisterName.ToLower().Contains("METROLOGYASST_FlowPoint".ToLower()) )
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, new byte[] { item.RegisterValue.ToArray()[0] }, true, true));
}
else if (item.RegisterName.ToLower().Contains("SENSUSRADIO_EncryptionKey".ToLower()))
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.ToArray(), true, true));
}
@@ -133,6 +137,9 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.Reverse().ToArray(), true, true));
}
//else if (!item.RegisterName.ToLower().Contains("apparrangement"))
//{
// overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.Reverse().ToArray(), true, true));
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessPasswordFile.cs
+2
View File
@@ -58,6 +58,8 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
public override void StartProcess()
{
base.currentProcessState = ProductionProcessState.Done;
return;
bool ret = RequestPassword();
updateImage(UserControl.RequestPassword, ret);
base.Progress = base.Progress + 16;
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessShippingMode.cs
+14 -2
View File
@@ -13,10 +13,12 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
public class ProductionProcessShippingMode : BaseProductionProcess
{
private UcPlain UserControl;
public ProductionProcessShippingMode()
private bool doRestart = false;
public ProductionProcessShippingMode(bool restart = false)
{
name = "Versandbereitschaft herstellen";
currentProcessState = ProductionProcessState.Waiting;
doRestart = restart;
}
public override void InitUserControl()
{
@@ -72,12 +74,18 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
var SENSUSRADIO_ExtendedAlarmMask = Meter.ReadRegister("SENSUSRADIO_ExtendedAlarmMask");
if (radioResetSuccess[0] == 0x02 && writeList.All(a => a == true) && SENSUSRADIO_MainAlarmMask[0] != 0)
{
if (doRestart)
{
var _meterResetPsu = new MeterResetPsu(Meter)
{
StoreConfigEnable = true
};
var rebootSucceeded = _meterResetPsu.MeterResetPsuExecute();
var CheckValuesAufterBoot = new List<Tuple<string, byte[]>>();
Thread.Sleep(10000);
Meter.Login();
CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("METROLOGYASST_PulseLength", Meter.ReadRegister("METROLOGYASST_PulseLength")));
CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("POWERMON_BatteryQuantity", Meter.ReadRegister("POWERMON_BatteryQuantity")));
CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("GENESISFLOW_MeterSize", Meter.ReadRegister("GENESISFLOW_MeterSize")));
@@ -109,7 +117,11 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
Meter.WriteLog("reboot compare failed");
base.currentProcessState = ProductionProcessState.Error;
}
}
else
{
base.currentProcessState = ProductionProcessState.Done;
}
}
else
Common/Service/MeterProcessState/Controllers/FinalCheckController.cs
+38
View File
@@ -656,6 +656,14 @@ namespace Service.MeterProcessState.Controllers
dt = dataacces.ExecuteQuery(sb.ToString());
//"StartDT":"29.07.2022 06:47:27"
var hit = false;
var hitAmbi = false;
@@ -720,6 +728,8 @@ namespace Service.MeterProcessState.Controllers
}
if (!hit)
{
//workaroudn for a year
@@ -734,6 +744,34 @@ namespace Service.MeterProcessState.Controllers
}
//return new RadioConfigurationParams();//
}
try
{
sb = new StringBuilder();
sb.AppendLine(" SELECT top 1 [DS_ID] ,[ID_PCB] ,[ID_TEST] ,[JSON] FROM [MyOraDB]..[DELTACHEF].[GENESIS_PCBFUNCTIONALTEST_PD] ");
sb.AppendLine($" where [ID_PCB] = '{CheckPcbId.Value}' ");
sb.AppendLine(" order by ID_TEST desc ");
var dtPrdDate = dataacces.ExecuteQuery(sb.ToString());
if (dtPrdDate.Rows.Count == 1)
{
var St = dtPrdDate.Rows[0]["JSON"].ToString();
var startInex = St.IndexOf("\"StartDT\":\"") + "\"StartDT\":\"".Length;
var datestring = St.Substring(startInex, "29.07.2022 06:47:27".Length);
DateTime.TryParse(datestring, out lastProdDate);
}
}
catch (Exception)
{
throw;
}
dateTime = lastProdDate;
return new PickingCompareItem(MeterSize, FrequencyIndicator, PressurePresent, checkAppsIdVersion);
Common/Service/MeterProcessState/Controllers/MarriageController.cs
+1 -1
View File
@@ -407,7 +407,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
var internalSerialNr = -1;
string cust = null;
if (!ScanToSerialNr.ConvertScanToSerialNr(Scan, out internalSerialNr, out cust))
if (ScanToSerialNr.ConvertScanToSerialNr(Scan, out internalSerialNr, out cust))
{
if (internalSerialNr != -1)
{
Common/SoftwareAccessHelper/LocalWebRequest.cs
+5 -5
View File
@@ -80,7 +80,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
{
var client = new RestClient(Url);
WebRequest.DefaultWebProxy = null;
//WebRequest.DefaultWebProxy = null;
var request = new RestRequest(Method.POST);
ServicePointManager.Expect100Continue = false;
@@ -124,7 +124,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
{
var client = new RestClient(Url);
WebRequest.DefaultWebProxy = null;
// WebRequest.DefaultWebProxy = null;
var request = new RestRequest(Method.POST);
ServicePointManager.Expect100Continue = false;
@@ -167,7 +167,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
{
var client = new RestClient(Url);
WebRequest.DefaultWebProxy = null;
//WebRequest.DefaultWebProxy = null;
var request = new RestRequest(Method.POST);
ServicePointManager.Expect100Continue = false;
@@ -217,7 +217,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
{
var client = new RestClient(Url);
WebRequest.DefaultWebProxy = null;
//WebRequest.DefaultWebProxy = null;
ServicePointManager.Expect100Continue = false;
var request = new RestRequest(Method.POST);
@@ -276,7 +276,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
{
var client = new RestClient(Url);
WebRequest.DefaultWebProxy = null;
//WebRequest.DefaultWebProxy = null;
var request = new RestRequest(Method.GET);
ServicePointManager.Expect100Continue = false;
if (!TimeoutMS.HasValue)
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
81d60b90addc793525740e9993e19bf6665bd401
0d85a5b3a7561b41163c20e5dc7713bcd0d65555
Common/Ui/GenesisToolBox/FrmConfigurations.Designer.cs
Generated
+331 -288
View File
@@ -34,41 +34,43 @@
this.cbComSlot = new System.Windows.Forms.ComboBox();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.btnLogout = new System.Windows.Forms.Button();
this.btnRead = new System.Windows.Forms.Button();
this.btnWrite = new System.Windows.Forms.Button();
this.btnDisplayDefault = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.lblPulsesequence = new System.Windows.Forms.Label();
this.rbTestModeOn = new System.Windows.Forms.RadioButton();
this.rbTestModeOff = new System.Windows.Forms.RadioButton();
this.nudAdapterPresence = new System.Windows.Forms.NumericUpDown();
this.label8 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.cbxPulseLength = new System.Windows.Forms.ComboBox();
this.cbxPulseMode = new System.Windows.Forms.ComboBox();
this.nudPulseResolution = new System.Windows.Forms.NumericUpDown();
this.nudPulseWeight = new System.Windows.Forms.NumericUpDown();
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.lblPulseWeightInternal = new System.Windows.Forms.Label();
this.lblPrencesInMin = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.cbPulseWiegth = new System.Windows.Forms.ComboBox();
this.panel1 = new System.Windows.Forms.Panel();
this.rbEvenDistOff = new System.Windows.Forms.RadioButton();
this.rbEvenDistOn = new System.Windows.Forms.RadioButton();
this.lblPrencesInMin = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.lblPulseWeightInternal = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.nudPulseResolution = new System.Windows.Forms.NumericUpDown();
this.cbxPulseMode = new System.Windows.Forms.ComboBox();
this.cbxPulseLength = new System.Windows.Forms.ComboBox();
this.label8 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.nudAdapterPresence = new System.Windows.Forms.NumericUpDown();
this.rbTestModeOff = new System.Windows.Forms.RadioButton();
this.rbTestModeOn = new System.Windows.Forms.RadioButton();
this.lblPulsesequence = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.btnDisplayDefault = new System.Windows.Forms.Button();
this.btnWrite = new System.Windows.Forms.Button();
this.btnRead = new System.Windows.Forms.Button();
this.btnLogout = new System.Windows.Forms.Button();
this.lblPulseWeightMl = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.lblP2000PulseSetup = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudAdapterPresence)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudPulseResolution)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudPulseWeight)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudPulseResolution)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudAdapterPresence)).BeginInit();
this.SuspendLayout();
//
// lblState
@@ -119,6 +121,10 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.lblP2000PulseSetup);
this.tabPage1.Controls.Add(this.label12);
this.tabPage1.Controls.Add(this.lblPulseWeightMl);
this.tabPage1.Controls.Add(this.cbPulseWiegth);
this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Controls.Add(this.lblPrencesInMin);
this.tabPage1.Controls.Add(this.label13);
@@ -126,7 +132,6 @@
this.tabPage1.Controls.Add(this.lblPulseWeightInternal);
this.tabPage1.Controls.Add(this.label11);
this.tabPage1.Controls.Add(this.label10);
this.tabPage1.Controls.Add(this.nudPulseWeight);
this.tabPage1.Controls.Add(this.nudPulseResolution);
this.tabPage1.Controls.Add(this.cbxPulseMode);
this.tabPage1.Controls.Add(this.cbxPulseLength);
@@ -154,256 +159,32 @@
this.tabPage1.UseVisualStyleBackColor = true;
this.tabPage1.Click += new System.EventHandler(this.tabPage1_Click);
//
// btnLogout
// cbPulseWiegth
//
this.btnLogout.Location = new System.Drawing.Point(303, 8);
this.btnLogout.Name = "btnLogout";
this.btnLogout.Size = new System.Drawing.Size(85, 30);
this.btnLogout.TabIndex = 12;
this.btnLogout.Text = "Logout";
this.btnLogout.UseVisualStyleBackColor = true;
this.btnLogout.Click += new System.EventHandler(this.btnLogout_Click);
//
// btnRead
//
this.btnRead.Location = new System.Drawing.Point(84, 239);
this.btnRead.Name = "btnRead";
this.btnRead.Size = new System.Drawing.Size(129, 53);
this.btnRead.TabIndex = 0;
this.btnRead.Text = "Read";
this.btnRead.UseVisualStyleBackColor = true;
this.btnRead.Click += new System.EventHandler(this.btnRead_Click);
//
// btnWrite
//
this.btnWrite.Location = new System.Drawing.Point(219, 239);
this.btnWrite.Name = "btnWrite";
this.btnWrite.Size = new System.Drawing.Size(129, 53);
this.btnWrite.TabIndex = 1;
this.btnWrite.Text = "Write";
this.btnWrite.UseVisualStyleBackColor = true;
this.btnWrite.Click += new System.EventHandler(this.btnWrite_Click);
//
// btnDisplayDefault
//
this.btnDisplayDefault.Location = new System.Drawing.Point(426, 239);
this.btnDisplayDefault.Name = "btnDisplayDefault";
this.btnDisplayDefault.Size = new System.Drawing.Size(113, 53);
this.btnDisplayDefault.TabIndex = 8;
this.btnDisplayDefault.Text = "Set DisplayDefault";
this.btnDisplayDefault.UseVisualStyleBackColor = true;
this.btnDisplayDefault.Click += new System.EventHandler(this.btnDisplayDefault_Click);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(5, 34);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(142, 13);
this.label2.TabIndex = 10;
this.label2.Text = "IRDA_AdapterPresenceLimit";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(5, 58);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(114, 13);
this.label3.TabIndex = 11;
this.label3.Text = "IRDA_PulseSequence";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(6, 82);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(212, 13);
this.label4.TabIndex = 12;
this.label4.Text = "METROLOGYASST_PulseEvenDistribution";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(6, 106);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(168, 13);
this.label5.TabIndex = 13;
this.label5.Text = "METROLOGYASST_PulseLength";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(6, 130);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(162, 13);
this.label6.TabIndex = 14;
this.label6.Text = "METROLOGYASST_PulseMode";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(5, 10);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(55, 13);
this.label7.TabIndex = 15;
this.label7.Text = "TestMode";
//
// lblPulsesequence
//
this.lblPulsesequence.AutoSize = true;
this.lblPulsesequence.Location = new System.Drawing.Point(234, 58);
this.lblPulsesequence.Name = "lblPulsesequence";
this.lblPulsesequence.Size = new System.Drawing.Size(13, 13);
this.lblPulsesequence.TabIndex = 16;
this.lblPulsesequence.Text = "0";
//
// rbTestModeOn
//
this.rbTestModeOn.AutoSize = true;
this.rbTestModeOn.Location = new System.Drawing.Point(237, 8);
this.rbTestModeOn.Name = "rbTestModeOn";
this.rbTestModeOn.Size = new System.Drawing.Size(39, 17);
this.rbTestModeOn.TabIndex = 17;
this.rbTestModeOn.TabStop = true;
this.rbTestModeOn.Text = "On";
this.rbTestModeOn.UseVisualStyleBackColor = true;
//
// rbTestModeOff
//
this.rbTestModeOff.AutoSize = true;
this.rbTestModeOff.Location = new System.Drawing.Point(293, 8);
this.rbTestModeOff.Name = "rbTestModeOff";
this.rbTestModeOff.Size = new System.Drawing.Size(39, 17);
this.rbTestModeOff.TabIndex = 18;
this.rbTestModeOff.TabStop = true;
this.rbTestModeOff.Text = "Off";
this.rbTestModeOff.UseVisualStyleBackColor = true;
//
// nudAdapterPresence
//
this.nudAdapterPresence.Location = new System.Drawing.Point(237, 27);
this.nudAdapterPresence.Name = "nudAdapterPresence";
this.nudAdapterPresence.Size = new System.Drawing.Size(111, 20);
this.nudAdapterPresence.TabIndex = 21;
this.nudAdapterPresence.ValueChanged += new System.EventHandler(this.nudAdapterPresence_ValueChanged);
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(6, 178);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(169, 13);
this.label8.TabIndex = 23;
this.label8.Text = "METROLOGYASST_PulseWeight";
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(6, 154);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(185, 13);
this.label9.TabIndex = 22;
this.label9.Text = "METROLOGYASST_PulseResolution";
//
// cbxPulseLength
//
this.cbxPulseLength.FormattingEnabled = true;
this.cbxPulseLength.Location = new System.Drawing.Point(237, 103);
this.cbxPulseLength.Name = "cbxPulseLength";
this.cbxPulseLength.Size = new System.Drawing.Size(111, 21);
this.cbxPulseLength.TabIndex = 26;
//
// cbxPulseMode
//
this.cbxPulseMode.FormattingEnabled = true;
this.cbxPulseMode.Location = new System.Drawing.Point(237, 127);
this.cbxPulseMode.Name = "cbxPulseMode";
this.cbxPulseMode.Size = new System.Drawing.Size(111, 21);
this.cbxPulseMode.TabIndex = 27;
//
// nudPulseResolution
//
this.nudPulseResolution.Location = new System.Drawing.Point(237, 152);
this.nudPulseResolution.Maximum = new decimal(new int[] {
7,
0,
0,
0});
this.nudPulseResolution.Name = "nudPulseResolution";
this.nudPulseResolution.Size = new System.Drawing.Size(111, 20);
this.nudPulseResolution.TabIndex = 28;
this.nudPulseResolution.Value = new decimal(new int[] {
7,
0,
0,
0});
//
// nudPulseWeight
//
this.nudPulseWeight.Location = new System.Drawing.Point(237, 176);
this.nudPulseWeight.Maximum = new decimal(new int[] {
-1,
0,
0,
0});
this.nudPulseWeight.Name = "nudPulseWeight";
this.nudPulseWeight.Size = new System.Drawing.Size(111, 20);
this.nudPulseWeight.TabIndex = 29;
this.nudPulseWeight.ValueChanged += new System.EventHandler(this.nudPulseWeight_ValueChanged);
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(354, 183);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(28, 13);
this.label10.TabIndex = 30;
this.label10.Text = "in ml";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(467, 183);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(72, 13);
this.label11.TabIndex = 31;
this.label11.Text = "in internal unit";
//
// lblPulseWeightInternal
//
this.lblPulseWeightInternal.AutoSize = true;
this.lblPulseWeightInternal.Location = new System.Drawing.Point(388, 183);
this.lblPulseWeightInternal.Name = "lblPulseWeightInternal";
this.lblPulseWeightInternal.Size = new System.Drawing.Size(13, 13);
this.lblPulseWeightInternal.TabIndex = 32;
this.lblPulseWeightInternal.Text = "0";
//
// lblPrencesInMin
//
this.lblPrencesInMin.AutoSize = true;
this.lblPrencesInMin.Location = new System.Drawing.Point(401, 34);
this.lblPrencesInMin.Name = "lblPrencesInMin";
this.lblPrencesInMin.Size = new System.Drawing.Size(13, 13);
this.lblPrencesInMin.TabIndex = 35;
this.lblPrencesInMin.Text = "0";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(485, 34);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(54, 13);
this.label13.TabIndex = 34;
this.label13.Text = "in minutes";
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(354, 34);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(41, 13);
this.label14.TabIndex = 33;
this.label14.Text = "internal";
this.cbPulseWiegth.FormattingEnabled = true;
this.cbPulseWiegth.Items.AddRange(new object[] {
" 1 l/Imp.",
"10 l/Imp.",
"100 l/Imp.",
"1.000 l/Imp.",
"1 Gallons/Imp.",
"10 Gallons/Imp.",
"100 Gallons/Imp.",
"1.000 Gallons/Imp.",
"1 Cub. Feet/Imp.",
"10 Cub. Feet/Imp.",
"100 Cub. Feet/Imp.",
"1.000 Cub. Feet/Imp.",
"1 Barrel/Imp.",
"10 Barrels/Imp.",
"100 Barrels/Imp.",
"1.000 Barrels/Imp.",
"ohne"});
this.cbPulseWiegth.Location = new System.Drawing.Point(237, 180);
this.cbPulseWiegth.Name = "cbPulseWiegth";
this.cbPulseWiegth.Size = new System.Drawing.Size(111, 21);
this.cbPulseWiegth.TabIndex = 37;
this.cbPulseWiegth.SelectedIndexChanged += new System.EventHandler(this.cbPulseWiegth_SelectedIndexChanged);
//
// panel1
//
@@ -436,6 +217,271 @@
this.rbEvenDistOn.Text = "On";
this.rbEvenDistOn.UseVisualStyleBackColor = true;
//
// lblPrencesInMin
//
this.lblPrencesInMin.AutoSize = true;
this.lblPrencesInMin.Location = new System.Drawing.Point(401, 34);
this.lblPrencesInMin.Name = "lblPrencesInMin";
this.lblPrencesInMin.Size = new System.Drawing.Size(13, 13);
this.lblPrencesInMin.TabIndex = 35;
this.lblPrencesInMin.Text = "0";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(485, 34);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(54, 13);
this.label13.TabIndex = 34;
this.label13.Text = "in minutes";
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(354, 34);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(41, 13);
this.label14.TabIndex = 33;
this.label14.Text = "internal";
//
// lblPulseWeightInternal
//
this.lblPulseWeightInternal.AutoSize = true;
this.lblPulseWeightInternal.Location = new System.Drawing.Point(467, 206);
this.lblPulseWeightInternal.Name = "lblPulseWeightInternal";
this.lblPulseWeightInternal.Size = new System.Drawing.Size(13, 13);
this.lblPulseWeightInternal.TabIndex = 32;
this.lblPulseWeightInternal.Text = "0";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(467, 183);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(72, 13);
this.label11.TabIndex = 31;
this.label11.Text = "in internal unit";
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(354, 183);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(28, 13);
this.label10.TabIndex = 30;
this.label10.Text = "in ml";
//
// nudPulseResolution
//
this.nudPulseResolution.Location = new System.Drawing.Point(237, 152);
this.nudPulseResolution.Maximum = new decimal(new int[] {
7,
0,
0,
0});
this.nudPulseResolution.Name = "nudPulseResolution";
this.nudPulseResolution.Size = new System.Drawing.Size(111, 20);
this.nudPulseResolution.TabIndex = 28;
this.nudPulseResolution.Value = new decimal(new int[] {
7,
0,
0,
0});
//
// cbxPulseMode
//
this.cbxPulseMode.FormattingEnabled = true;
this.cbxPulseMode.Location = new System.Drawing.Point(237, 127);
this.cbxPulseMode.Name = "cbxPulseMode";
this.cbxPulseMode.Size = new System.Drawing.Size(111, 21);
this.cbxPulseMode.TabIndex = 27;
//
// cbxPulseLength
//
this.cbxPulseLength.FormattingEnabled = true;
this.cbxPulseLength.Location = new System.Drawing.Point(237, 103);
this.cbxPulseLength.Name = "cbxPulseLength";
this.cbxPulseLength.Size = new System.Drawing.Size(111, 21);
this.cbxPulseLength.TabIndex = 26;
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(6, 178);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(169, 13);
this.label8.TabIndex = 23;
this.label8.Text = "METROLOGYASST_PulseWeight";
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(6, 154);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(185, 13);
this.label9.TabIndex = 22;
this.label9.Text = "METROLOGYASST_PulseResolution";
//
// nudAdapterPresence
//
this.nudAdapterPresence.Location = new System.Drawing.Point(237, 27);
this.nudAdapterPresence.Name = "nudAdapterPresence";
this.nudAdapterPresence.Size = new System.Drawing.Size(111, 20);
this.nudAdapterPresence.TabIndex = 21;
this.nudAdapterPresence.ValueChanged += new System.EventHandler(this.nudAdapterPresence_ValueChanged);
//
// rbTestModeOff
//
this.rbTestModeOff.AutoSize = true;
this.rbTestModeOff.Location = new System.Drawing.Point(293, 8);
this.rbTestModeOff.Name = "rbTestModeOff";
this.rbTestModeOff.Size = new System.Drawing.Size(39, 17);
this.rbTestModeOff.TabIndex = 18;
this.rbTestModeOff.TabStop = true;
this.rbTestModeOff.Text = "Off";
this.rbTestModeOff.UseVisualStyleBackColor = true;
//
// rbTestModeOn
//
this.rbTestModeOn.AutoSize = true;
this.rbTestModeOn.Location = new System.Drawing.Point(237, 8);
this.rbTestModeOn.Name = "rbTestModeOn";
this.rbTestModeOn.Size = new System.Drawing.Size(39, 17);
this.rbTestModeOn.TabIndex = 17;
this.rbTestModeOn.TabStop = true;
this.rbTestModeOn.Text = "On";
this.rbTestModeOn.UseVisualStyleBackColor = true;
//
// lblPulsesequence
//
this.lblPulsesequence.AutoSize = true;
this.lblPulsesequence.Location = new System.Drawing.Point(234, 58);
this.lblPulsesequence.Name = "lblPulsesequence";
this.lblPulsesequence.Size = new System.Drawing.Size(13, 13);
this.lblPulsesequence.TabIndex = 16;
this.lblPulsesequence.Text = "0";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(5, 10);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(55, 13);
this.label7.TabIndex = 15;
this.label7.Text = "TestMode";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(6, 130);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(162, 13);
this.label6.TabIndex = 14;
this.label6.Text = "METROLOGYASST_PulseMode";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(6, 106);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(168, 13);
this.label5.TabIndex = 13;
this.label5.Text = "METROLOGYASST_PulseLength";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(6, 82);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(212, 13);
this.label4.TabIndex = 12;
this.label4.Text = "METROLOGYASST_PulseEvenDistribution";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(5, 58);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(114, 13);
this.label3.TabIndex = 11;
this.label3.Text = "IRDA_PulseSequence";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(5, 34);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(142, 13);
this.label2.TabIndex = 10;
this.label2.Text = "IRDA_AdapterPresenceLimit";
//
// btnDisplayDefault
//
this.btnDisplayDefault.Location = new System.Drawing.Point(282, 239);
this.btnDisplayDefault.Name = "btnDisplayDefault";
this.btnDisplayDefault.Size = new System.Drawing.Size(113, 53);
this.btnDisplayDefault.TabIndex = 8;
this.btnDisplayDefault.Text = "Set DisplayDefault";
this.btnDisplayDefault.UseVisualStyleBackColor = true;
this.btnDisplayDefault.Click += new System.EventHandler(this.btnDisplayDefault_Click);
//
// btnWrite
//
this.btnWrite.Location = new System.Drawing.Point(147, 239);
this.btnWrite.Name = "btnWrite";
this.btnWrite.Size = new System.Drawing.Size(129, 53);
this.btnWrite.TabIndex = 1;
this.btnWrite.Text = "Write";
this.btnWrite.UseVisualStyleBackColor = true;
this.btnWrite.Click += new System.EventHandler(this.btnWrite_Click);
//
// btnRead
//
this.btnRead.Location = new System.Drawing.Point(3, 239);
this.btnRead.Name = "btnRead";
this.btnRead.Size = new System.Drawing.Size(129, 53);
this.btnRead.TabIndex = 0;
this.btnRead.Text = "Read";
this.btnRead.UseVisualStyleBackColor = true;
this.btnRead.Click += new System.EventHandler(this.btnRead_Click);
//
// btnLogout
//
this.btnLogout.Location = new System.Drawing.Point(303, 8);
this.btnLogout.Name = "btnLogout";
this.btnLogout.Size = new System.Drawing.Size(85, 30);
this.btnLogout.TabIndex = 12;
this.btnLogout.Text = "Logout";
this.btnLogout.UseVisualStyleBackColor = true;
this.btnLogout.Click += new System.EventHandler(this.btnLogout_Click);
//
// lblPulseWeightMl
//
this.lblPulseWeightMl.AutoSize = true;
this.lblPulseWeightMl.Location = new System.Drawing.Point(354, 206);
this.lblPulseWeightMl.Name = "lblPulseWeightMl";
this.lblPulseWeightMl.Size = new System.Drawing.Size(13, 13);
this.lblPulseWeightMl.TabIndex = 38;
this.lblPulseWeightMl.Text = "0";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(466, 223);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(94, 13);
this.label12.TabIndex = 39;
this.label12.Text = "p2000 PulseSetup";
//
// lblP2000PulseSetup
//
this.lblP2000PulseSetup.AutoSize = true;
this.lblP2000PulseSetup.Location = new System.Drawing.Point(467, 249);
this.lblP2000PulseSetup.Name = "lblP2000PulseSetup";
this.lblP2000PulseSetup.Size = new System.Drawing.Size(13, 13);
this.lblP2000PulseSetup.TabIndex = 40;
this.lblP2000PulseSetup.Text = "0";
//
// FrmConfigurations
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -453,11 +499,10 @@
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudAdapterPresence)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudPulseResolution)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudPulseWeight)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudPulseResolution)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudAdapterPresence)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -487,7 +532,6 @@
private System.Windows.Forms.NumericUpDown nudAdapterPresence;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.NumericUpDown nudPulseWeight;
private System.Windows.Forms.NumericUpDown nudPulseResolution;
private System.Windows.Forms.ComboBox cbxPulseMode;
private System.Windows.Forms.ComboBox cbxPulseLength;
@@ -500,10 +544,9 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.RadioButton rbEvenDistOff;
private System.Windows.Forms.RadioButton rbEvenDistOn;
private System.Windows.Forms.ComboBox cbPulseWiegth;
private System.Windows.Forms.Label lblPulseWeightMl;
private System.Windows.Forms.Label lblP2000PulseSetup;
private System.Windows.Forms.Label label12;
}
}
Common/Ui/GenesisToolBox/FrmConfigurations.cs
+85 -4
View File
@@ -175,8 +175,9 @@ namespace Xylem.Common.Ui.GenesisToolBox
cbxPulseMode.SelectedItem = ((METROLOGYASST_PulseMode)PulseMode);
nudPulseResolution.Value = PulseResolution;
nudPulseWeight.Value = PulseWeight * (Decimal)0.03125;
lblPulseWeightMl.Text = (PulseWeight * (Decimal)0.03125).ToString();
lblPulseWeightInternal.Text = PulseWeight.ToString();
cbPulseWiegth.SelectedText = getText(PulseWeight);
}
@@ -197,7 +198,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
Int32 PulseMode = ((METROLOGYASST_PulseMode)cbxPulseMode.SelectedItem).GetHashCode();
Byte PulseResolution = (Byte)nudPulseResolution.Value;
UInt32 PulseWeight = (UInt32)(nudPulseWeight.Value / (Decimal)0.03125);
UInt32 PulseWeight = getValue(cbPulseWiegth.SelectedText);
actionResult = null;
@@ -278,7 +280,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
private void nudPulseWeight_ValueChanged(Object sender, EventArgs e)
{
lblPulseWeightInternal.Text = (nudPulseWeight.Value / (Decimal)0.03125).ToString();
}
private void btnDisplayDefault_Click(Object sender, EventArgs e)
@@ -316,6 +318,85 @@ namespace Xylem.Common.Ui.GenesisToolBox
{
_meterBatch.Dispose();
}
private void cbPulseWiegth_SelectedIndexChanged(object sender, EventArgs e)
{
var PInternal = getValue(cbPulseWiegth.SelectedItem.ToString().Trim());
lblPulseWeightMl.Text = (PInternal * (Decimal)0.03125).ToString();
lblPulseWeightInternal.Text = (PInternal).ToString();
var PulseFQm3 = (PInternal * (Decimal)0.03125);
lblP2000PulseSetup.Text = (1000000 / PulseFQm3).ToString();
}
private string getText(uint v)
{
string intHelper = "NA";
switch (v)
{
case 0x00007D00: intHelper = "1 l/Imp."; break;
case 0x0004E200: intHelper = "10 l/Imp."; break;
case 0x0030D400: intHelper = "100 l/Imp."; break;
case 0x01E84800: intHelper = "1.000 l/Imp."; break;
case 0x0001D92D: intHelper = "1 Gallons/Imp."; break;
case 0x00127BC3: intHelper = "10 Gallons/Imp."; break;
case 0x00B8D5A0: intHelper = "100 Gallons/Imp."; break;
case 0x07382500: intHelper = "1.000 Gallons/Imp."; break;
case 0x000DD399: intHelper = "1 Cub. Feet/Imp."; break;
case 0x008A4400: intHelper = "10 Cub. Feet/Imp."; break;
case 0x0566D000: intHelper = "100 Cub. Feet/Imp."; break;
case 0x36042000: intHelper = "1.000 Cub. Feet/Imp."; break;
case 0x004DA169: intHelper = "1 Barrel/Imp."; break;
case 0x03084E1E: intHelper = "10 Barrels/Imp."; break;
case 0x1E530D2F: intHelper = "100 Barrels/Imp."; break;
case 0xFFF0279D: intHelper = "1.000 Barrels/Imp."; break;
case 0x00000000: intHelper = "ohne"; break;
default: intHelper = "ohne"; break;
}
return intHelper;
}
private uint getValue(string v)
{
uint intHelper = 0;
switch (v.Replace(" ", ""))
{
case "1l/Imp.": intHelper = 0x00007D00; break;
case "10l/Imp.": intHelper = 0x0004E200; break;
case "100l/Imp.": intHelper = 0x0030D400; break;
case "1.000l/Imp.": intHelper = 0x01E84800; break;
case "1Gallons/Imp.": intHelper = 0x0001D92D; break;
case "10Gallons/Imp.": intHelper = 0x00127BC3; break;
case "100Gallons/Imp.": intHelper = 0x00B8D5A0; break;
case "1.000Gallons/Imp.": intHelper = 0x07382500; break;
case "1Cub.Feet/Imp.": intHelper = 0x000DD399; break;
case "10Cub.Feet/Imp.": intHelper = 0x008A4400; break;
case "100Cub.Feet/Imp.": intHelper = 0x0566D000; break;
case "1.000Cub.Feet/Imp.": intHelper = 0x36042000; break;
case "1Barrel/Imp.": intHelper = 0x004DA169; break;
case "10Barrels/Imp.": intHelper = 0x03084E1E; break;
case "100Barrels/Imp.": intHelper = 0x1E530D2F; break;
case "1.000Barrels/Imp.": intHelper = 0xFFF0279D; break;
case "ohne": intHelper = 0; break;
default: intHelper = 0; break;
}
return intHelper;
}
}
}
Common/Ui/GenesisToolBox/frmMainForm.Designer.cs
Generated
+13
View File
@@ -50,6 +50,7 @@
this.btnFiles = new System.Windows.Forms.Button();
this.btnLegacyTestApp = new System.Windows.Forms.Button();
this.lblVersionNumber = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
this.gpGerneral.SuspendLayout();
this.gpLAA.SuspendLayout();
this.gbDeveloper.SuspendLayout();
@@ -57,6 +58,7 @@
//
// gpGerneral
//
this.gpGerneral.Controls.Add(this.button1);
this.gpGerneral.Controls.Add(this.button4);
this.gpGerneral.Controls.Add(this.btnLutUpdate);
this.gpGerneral.Controls.Add(this.btnPressure);
@@ -298,6 +300,16 @@
this.lblVersionNumber.TabIndex = 23;
this.lblVersionNumber.Text = "----------";
//
// button1
//
this.button1.Location = new System.Drawing.Point(6, 413);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(152, 40);
this.button1.TabIndex = 19;
this.button1.Text = "Pulse Config";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click_1);
//
// FrmMainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -347,6 +359,7 @@
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button button5;
private System.Windows.Forms.Label lblVersionNumber;
private System.Windows.Forms.Button button1;
}
}
Common/Ui/GenesisToolBox/frmMainForm.cs
+8
View File
@@ -386,5 +386,13 @@ namespace Xylem.Common.Ui.GenesisToolBox
form.Closed += Form_Closed;
Hide();
}
private void button1_Click_1(object sender, EventArgs e)
{
var form = new FrmConfigurations();
form.Show();
form.Closed += Form_Closed;
Hide();
}
}
}
Common/Ui/GenesisToolBox/frmRegisterStore.Designer.cs
Generated
+13
View File
@@ -55,6 +55,7 @@
this.button7 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button();
this.button8 = new System.Windows.Forms.Button();
this.btnUI1236Com = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.registerGridView)).BeginInit();
this.pnlBussy.SuspendLayout();
this.SuspendLayout();
@@ -311,11 +312,22 @@
this.button8.UseVisualStyleBackColor = true;
this.button8.Click += new System.EventHandler(this.button8_Click);
//
// btnUI1236Com
//
this.btnUI1236Com.Location = new System.Drawing.Point(396, 120);
this.btnUI1236Com.Name = "btnUI1236Com";
this.btnUI1236Com.Size = new System.Drawing.Size(114, 30);
this.btnUI1236Com.TabIndex = 70;
this.btnUI1236Com.Text = "UI1236";
this.btnUI1236Com.UseVisualStyleBackColor = true;
this.btnUI1236Com.Click += new System.EventHandler(this.btnUI1236Com_Click);
//
// FrmRegisterStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(695, 553);
this.Controls.Add(this.btnUI1236Com);
this.Controls.Add(this.button8);
this.Controls.Add(this.button6);
this.Controls.Add(this.button7);
@@ -374,5 +386,6 @@
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button button6;
private System.Windows.Forms.Button button8;
private System.Windows.Forms.Button btnUI1236Com;
}
}
Common/Ui/GenesisToolBox/frmRegisterStore.cs
+39
View File
@@ -2154,5 +2154,44 @@ namespace Xylem.Common.Ui.GenesisToolBox
}
}
}
private void btnUI1236Com_Click(object sender, EventArgs e)
{
if (cbComSlot.SelectedItem != null) // && cbComSlot.SelectedValue is ListBoxItem)
{
Int32 slotNR = 0;
if (!string.IsNullOrEmpty(cbComSlot.SelectedItem.ToString()) &&
int.TryParse(cbComSlot.SelectedItem.ToString(), out slotNR))
{
try
{
conntect(slotNR);
foreach (var me in _meterBatch.ListOfMeters)
{
if (me is GenesisMeter)
{
if (((GenesisMeter)me).IsLoggedOn)
{
_currentGenesis = ((GenesisMeter)me);
_currentGenesis.SendUI1236Command(new byte[] { 0x0d, 0x04, 0x08, 0x01, 0x00, 0x1a }, true, false);
}
}
}
}
catch (Exception ex)
{
return;
}
return;
}
}
}
}
}
Common/Ui/LegacyGenesisControl/ICtlBatch.cs
+5 -1
View File
@@ -15,7 +15,9 @@ namespace XylemCommonUiLegacyGenCtl
void AddMeter(string serialNumber, int slot);
void AddAllMeters();
void MeterDone(int slot, bool Succeed);
void MeterDoneWithDetails(int slot, bool Succeed, out string LutCrc, out bool MeterHasPreadjustment);
void MeterDoneWithDetails(int slot, bool Succeed);
string LutCrc(int slot);
bool MeterHasPreadjustment(int slot);
void SetErrorFrame(int slot, double errorFrame = 0.0);
@@ -54,5 +56,7 @@ namespace XylemCommonUiLegacyGenCtl
void SetTestSetupContainer(dynamic container);
}
}
Common/Ui/LegacyGenesisControl/ctlBatch.cs
+41 -10
View File
@@ -94,11 +94,14 @@ namespace XylemCommonUiLegacyGenCtl
private int? ProgreessCurrent = null;
private Dictionary<int, double> slotErrorFrameDic = new Dictionary<int, double>();
private Dictionary<int, string> slotLut = new Dictionary<int, string>();
private Dictionary<int, bool> slotPreadjustment = new Dictionary<int, bool>();
private Dictionary<string, Tuple<Label, string>> lableValueCollection;
private bool isFlyingStartStop = true;
public bool IsFlyingStartStop { get; private set; }
private double StoreRefVolume, StoretestTimeRef;
private Stopwatch stopWatch = new Stopwatch();
private Dictionary<int, string> rowIndex = new Dictionary<int, string>();
@@ -702,16 +705,47 @@ namespace XylemCommonUiLegacyGenCtl
_logger.Error(ex, $"error at RemoveMeter(slot={slot}");
}
}
public void MeterDoneWithDetails(int slot, bool Succeed, out string LutCrc, out bool MeterHasPreadjustment)
public string LutCrc(int slot)
{
LutCrc = "";
MeterHasPreadjustment = false;
if (!slotLut.ContainsKey(slot))
{
return "";
}
return slotLut[slot];
}
public bool MeterHasPreadjustment(int slot)
{
if (!slotPreadjustment.ContainsKey(slot))
{
return false;
}
return slotPreadjustment[slot];
}
public void MeterDoneWithDetails(int slot, bool Succeed)
{
if (!slotLut.ContainsKey(slot))
{
slotLut.Add(slot, "");
}
else
{
slotLut[slot] = "";
}
if (!slotPreadjustment.ContainsKey(slot))
{
slotPreadjustment.Add(slot, false);
}
else
{
slotPreadjustment[slot] = false;
}
MeterDone(slot, Succeed);
var meter = batch.ListOfMeters.First(f => f.Slot == slot);
if (meter != null && meter is GenesisMeter gen)
{
LutCrc = gen.LutCrc;
slotLut[slot] = gen.LutCrc;
try
{
var responseJson = LocalWebRequest.GetRequest($"{ServiceUrls.MeterInfoForTestBench()}{gen.PcbId}");
@@ -720,7 +754,7 @@ namespace XylemCommonUiLegacyGenCtl
if (!String.IsNullOrEmpty(SerialNumber))
{
int tmp;
MeterHasPreadjustment = int.TryParse(a[4], out tmp);
slotPreadjustment[slot] = int.TryParse(a[4], out tmp);
}
}
catch (Exception)
@@ -732,9 +766,6 @@ namespace XylemCommonUiLegacyGenCtl
}
}
public void MeterDone(int slot, bool Succeed)
{
try
@@ -786,7 +817,7 @@ namespace XylemCommonUiLegacyGenCtl
}
genMeter.WriteRegister(Register.Genesisflow.SampleRate, 2);
genMeter.WriteRegister(Register.Genesisflow.LedMode, 0,true);
genMeter.WriteRegister(Register.Genesisflow.LedMode, 0, true);
meter.WriteLog($"MeterIsDone {state} {genMeter.LutCrc }");
}
else