diff --git a/TBF/Rig/BridgeComponents/GciBridge/UI/Debug/DebugModels.cs b/TBF/Rig/BridgeComponents/GciBridge/UI/Debug/DebugModels.cs index 559085e41..d62f3e84c 100644 --- a/TBF/Rig/BridgeComponents/GciBridge/UI/Debug/DebugModels.cs +++ b/TBF/Rig/BridgeComponents/GciBridge/UI/Debug/DebugModels.cs @@ -3,8 +3,6 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore; using Xylem.Common.Hardware.WaterMeter.WaterMeterCore; diff --git a/TBF/Rig/RegisterReaders/iPerlReaderUNI/test/OpticalHeadTest.cs b/TBF/Rig/RegisterReaders/iPerlReaderUNI/test/OpticalHeadTest.cs index 7fba8286c..21447b6c4 100644 --- a/TBF/Rig/RegisterReaders/iPerlReaderUNI/test/OpticalHeadTest.cs +++ b/TBF/Rig/RegisterReaders/iPerlReaderUNI/test/OpticalHeadTest.cs @@ -1,10 +1,9 @@ -using Config.Resources; using log4net; using Sensus.iPerl.RfidCom.Helper; using System; using TBF.Rig.RegisterReaders.CommonRR; using TBF.Rig.RegisterReaders.CommonRR.IPerl; -using TBF.Rig.TestMethods.iPerlCommunication; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication; using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication.common; using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication.implementations; diff --git a/TBF/Rig/Sequences/MainSeq.cs b/TBF/Rig/Sequences/MainSeq.cs index ae6a22162..77e8b6112 100644 --- a/TBF/Rig/Sequences/MainSeq.cs +++ b/TBF/Rig/Sequences/MainSeq.cs @@ -21,7 +21,9 @@ using TBF.UiBridge; using SharedComponents; using System.Text; using TBF.Rig.RegisterReaders.CommonRR.IPerl; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication; +using iPerlCommunicationParams = TBF.Rig.TestMethods.GenesisCommunication.iPerlCommunicationParams; namespace TBF.Rig.Sequences { @@ -76,19 +78,19 @@ namespace TBF.Rig.Sequences // myRef.modelessDlg.Show(); /// 1nd argument - TestMethods.iPerlCommunication.TestMethodCfg iPerlCfg = cfg as TestMethods.iPerlCommunication.TestMethodCfg; + TestMethodCfg iPerlCfg = cfg as TestMethodCfg; /// 2rd argument: as is /// 3th argument - IList iPerlCommParams = new List(); - foreach (var tp in multiTestParams) iPerlCommParams.Add(tp as TestMethods.iPerlCommunication.iPerlCommunicationParams); + IList iPerlCommParams = new List(); + foreach (var tp in multiTestParams) iPerlCommParams.Add(tp as iPerlCommunicationParams); /*myRef.modelessDlg = new TestMethods.iPerlCommunication.iPerlCommunicationForm(iPerlCfg, tests, iPerlCommParams); myRef.modelessDlg.Show();*/ myRef.modelessDlg = new TestMethods.iPerlCommunication.iPerlCommunicationForm( - testMethod as TBF.Rig.TestMethods.iPerlCommunication.TestMethod, tests, iPerlCommParams); + testMethod as TestMethod, tests, iPerlCommParams); myRef.modelessDlg.Show(); } catch (Exception e) diff --git a/TBF/Rig/TestMethods/GenesisCommunication/GenesisCommunicationSeq.cs b/TBF/Rig/TestMethods/GenesisCommunication/GenesisCommunicationSeq.cs index bc4881e13..8a911683c 100644 --- a/TBF/Rig/TestMethods/GenesisCommunication/GenesisCommunicationSeq.cs +++ b/TBF/Rig/TestMethods/GenesisCommunication/GenesisCommunicationSeq.cs @@ -32,15 +32,15 @@ namespace TBF.Rig.TestMethods.GenesisCommunication System.Windows.Forms.Form modelessDlg; /// - delegate void iPerlCommFormDlgt(GenesisCommunicationSeq myRef, iPerlCommunication.TestMethod method, Test test, iPerlCommunicationParams testParams); + delegate void iPerlCommFormDlgt(GenesisCommunicationSeq myRef, TestMethod method, Test test, iPerlCommunicationParams testParams); /// - void OpenIPerlCommForm(GenesisCommunicationSeq myRef, iPerlCommunication.TestMethod method, Test test, iPerlCommunicationParams testParams) + void OpenIPerlCommForm(GenesisCommunicationSeq myRef, TestMethod method, Test test, iPerlCommunicationParams testParams) { //TODO solve this wia SmartCommunicationForm - throw new NotImplementedException(); - //myRef.modelessDlg = new iPerlCommunicationForm(method, test, testParams); - //myRef.modelessDlg.Show(); + + myRef.modelessDlg = new iPerlCommunicationForm(method, test, testParams); + myRef.modelessDlg.Show(); } diff --git a/TBF/Rig/TestMethods/GenesisCommunication/TestMethodCfgCtrl.cs b/TBF/Rig/TestMethods/GenesisCommunication/TestMethodCfgCtrl.cs index a3ca06902..7ad97fe42 100644 --- a/TBF/Rig/TestMethods/GenesisCommunication/TestMethodCfgCtrl.cs +++ b/TBF/Rig/TestMethods/GenesisCommunication/TestMethodCfgCtrl.cs @@ -14,13 +14,13 @@ namespace TBF.Rig.TestMethods.GenesisCommunication { public bool ShowMore { get { return false; } } - iPerlCommunication.TestMethodCfg config; + TestMethodCfg config; public IComponentCfg Config { get { return config as IComponentCfg; } set { - config = value as iPerlCommunication.TestMethodCfg; + config = value as TestMethodCfg; Redraw(); } } @@ -271,7 +271,7 @@ namespace TBF.Rig.TestMethods.GenesisCommunication if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0) { - iPerlCommunication.TestMethod.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, config)); + TestMethod.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, config)); } return flags; diff --git a/TBF/Rig/TestMethods/GenesisCommunication/iPerlCommunicationParams.cs b/TBF/Rig/TestMethods/GenesisCommunication/iPerlCommunicationParams.cs index e995c359a..814061dec 100644 --- a/TBF/Rig/TestMethods/GenesisCommunication/iPerlCommunicationParams.cs +++ b/TBF/Rig/TestMethods/GenesisCommunication/iPerlCommunicationParams.cs @@ -101,9 +101,9 @@ namespace TBF.Rig.TestMethods.GenesisCommunication retVal.Add(string.Format("{0} if enabled", iPerlCommunicationForm.ReadConfigurationStr)); retVal.Add(string.Format("{0} 80", iPerlCommunicationForm.SetTestModeStr)); retVal.Add("iPerl_check prevWorkStep direction q2factors"); - for (iPerlCommunication.ConditionID id = iPerlCommunication.ConditionID.A; id < iPerlCommunication.ConditionID.Count; id++) + for (ConditionID id = ConditionID.A; id < ConditionID.Count; id++) { - retVal.Add(string.Format(iPerlCommunication.SequenceConditionOp.ConditionNameFmt, id)); + retVal.Add(string.Format(SequenceConditionOp.ConditionNameFmt, id)); } return retVal; diff --git a/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationParams.cs b/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationParams.cs index eeb91f8c7..b3edaa3ba 100644 --- a/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationParams.cs +++ b/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationParams.cs @@ -9,6 +9,7 @@ using Common; using Config.Entities; using TBF.Resources; using TBF.Rig.Generic; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.TestMethods.iPerlCommunication; using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication; diff --git a/TBF/Rig/TestMethods/iPerlCommunication/SequenceConditionOp.cs b/TBF/Rig/TestMethods/iPerlCommunication/SequenceConditionOp.cs deleted file mode 100644 index cc9319161..000000000 --- a/TBF/Rig/TestMethods/iPerlCommunication/SequenceConditionOp.cs +++ /dev/null @@ -1,44 +0,0 @@ -/// -/// Copyright (c) 2022 Sensus Slovensko a.s. -/// -using TBF.Resources; - -namespace TBF.Rig.TestMethods.iPerlCommunication -{ - public enum ConditionID - { - A, - B, - C, - Count, - } - - public class SequenceConditionOp : IOperation - { - public const string ConditionNameFmt = "iPERL communication milestone {0}"; - - ConditionID id; - TestMethod testMethodComponent; - - public SequenceConditionOp(TestMethod testMethodComponent, ConditionID id) - { - this.testMethodComponent = testMethodComponent; - this.id = id; - } - - public void Start() { } - - public Event Run() - { - bool conditionMet = testMethodComponent.IperlCommMilestone[(int)id]; - return conditionMet ? Event.ConditionMet : Event.ConditionNotMet; - } - - public void Stop() { } - - public override string ToString() - { - return string.Format(ConditionNameFmt, id); - } - } -} diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs b/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs deleted file mode 100644 index 947a10445..000000000 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs +++ /dev/null @@ -1,180 +0,0 @@ -/// -/// Copyright (c) 2015-2022 Sensus Slovensko a.s. -/// -using System; -using System.Collections.Generic; -using log4net; -using Common; -using Config.Entities; -using TBF.Rig.GenericDevices; -using TBF.Rig.Sequences; -using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication; -using TBF.UiBridge; - -namespace TBF.Rig.TestMethods.iPerlCommunication -{ - public class TestMethod : SmartComponentBase, ISimultTestMethod, ISequenceCondition, ISessionDataMngmnt, ITestMethodSmart - { - private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData"); - - public FlowType MethodFlowType => FlowType.volume; - - public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); } - - public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } - public bool DoTransitions() { return false; } - - public bool SimultWithPrevious { get { return testMethodCfg.TestParams.SimultWithPrevious; } } - public bool SimultWithNext { get { return testMethodCfg.TestParams.SimultWithNext; } } - - #region Configuration Change Handling - - public static void OnCfgChange(object sender, CfgChangeArgs args) - { - if (CfgChangeHandler == null) return; - try { CfgChangeHandler(sender, args); } - catch (Exception e) { log.Error("CfgChangeHandler(...) failed", e); } - } - - public static event EventHandler CfgChangeHandler; - - public override void StartChangeHandler() - { - CfgChangeHandler += delegate(object sender, CfgChangeArgs args) - { - TestMethodCfg tmpCfg = args.Cfg as TestMethodCfg; - if (tmpCfg != null && tmpCfg.Name.Equals(Name)) - { - if (args.Command == CfgChangeCmd.CfgChange) - { - testMethodCfg.CommTimeout = tmpCfg.CommTimeout; - testMethodCfg.DelayBetweenRetries = tmpCfg.DelayBetweenRetries; - testMethodCfg.MaxCommRetries = tmpCfg.MaxCommRetries; - testMethodCfg.IperlCheckErrorsToStop = tmpCfg.IperlCheckErrorsToStop; - testMethodCfg.UseWebService = tmpCfg.UseWebService; - testMethodCfg.BaseUrl = tmpCfg.BaseUrl; - testMethodCfg.RelativeUrl = tmpCfg.RelativeUrl; - } - } - }; - } - - #endregion Configuration Change Handling - - - readonly TestMethodCfg testMethodCfg; - - public bool[] IperlCommMilestone; - IList sequenceConditionOps; - - public TestMethod() - { - CreateMilestonesAndConditions(); - } - - public TestMethod(Generic.IComponentCfg cfg) - : base(cfg) - { - testMethodCfg = cfg as TestMethodCfg; - CreateMilestonesAndConditions(); - } - - void CreateMilestonesAndConditions() - { - IperlCommMilestone = new bool[(int)ConditionID.Count]; - - sequenceConditionOps = new List(); - for (ConditionID id = ConditionID.A; id < ConditionID.Count; id++) - { - sequenceConditionOps.Add(new SequenceConditionOp(this, id)); - } - } - - /// IDevice interface - only Initialize() is used - public override void Initialize() - { - if (DebugLevel == DebugMode.Normal) - { - rfidDataLogger.Fatal("------------------------------------------------------------------------"); - rfidDataLogger.FatalFormat("Test Bench Framework ver. {0}", Program.Version); - - log.FatalFormat("{0} initialized: {1}", Name, this); - } - else - { - log.FatalFormat("{0} simulated: {1}", Name, this); - } - } - - public IList Execute(Test test, int repetNr, bool isLastRepetition) - { - if (DebugLevel == DebugMode.Normal) - { - return (new iPerlCommunicationSeq()).Execute(test, repetNr, this, testMethodCfg.TestParams); - } - else - { - /// DebugLevel == DebugMode.Simulate - (new iPerlCommunicationSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); - return new List { Event.Done }; - } - } - - - public int ConditionsCount { get { return (int)ConditionID.Count; } } - - public string ConditionName(int i) - { - return (i >= 0 && i < (int)ConditionID.Count) ? ConditionOp(i).ToString() : string.Empty; - } - - public IOperation ConditionOp(int i) - { - return (i >= 0 && i < (int)ConditionID.Count) ? sequenceConditionOps[i] : null; - } - - - public void StartSession() - { - /// Clear milestones - if (IperlCommMilestone != null) - { - for (int i = 0; i < IperlCommMilestone.Length; i++) - { - IperlCommMilestone[i] = false; - } - } - } - - public void SaveMark(object o) - { - /// No marks - } - - public void EndSession() - { - /// Nothing at the end of session - } - - public bool CheckDeviceCaps(Test test, OutputPath devices, out string message) - { - // Implement the method to satisfy the ITestMethod interface. - // For now, provide a basic implementation. - message = "Device capabilities check not implemented."; - return true; - } - - public override void MeterCommMilestone(int iItem, bool bValue) - { - throw new NotImplementedException(); - } - - public override bool IsMeterCommMilestone(int iItem) - { - throw new NotImplementedException(); - } - } -} diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfg.cs b/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfg.cs deleted file mode 100644 index 99f50111b..000000000 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfg.cs +++ /dev/null @@ -1,96 +0,0 @@ -/// -/// Copyright (c) 2015-2021 Sensus Slovensko a.s. -/// -using System.Collections.Generic; -using System.IO.Ports; -using System.Threading; -using System.Xml.Serialization; -using Common; -using Config.Entities; -using TBF.Rig.Generic; -using TBF.Rig.RegisterReaders.CommonRR.IPerl; -using TBF.Rig.TestMethods.SmartMeterFlyingStartMassCollection; - -namespace TBF.Rig.TestMethods.iPerlCommunication -{ - [XmlRoot("TestMethodCfg")] // Add this attribute to match the XML root - public class TestMethodCfg : ComponentCfgBase, IiPerlTestMethodCfg - { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0]; - public override XmlSerializer GetSerializer() { return Serializer; } - - public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new TestMethodCfgCtrl(); } - - // - public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } - public override IParamsProvider CreateTestParamsProvider() { return new iPerlCommunicationParams(true); } - public override IParamsProvider GetUITestParamsProvider(Test test) - { - return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; - } - - /// Private parameterless constructor invoked by all other (public) constructors - TestMethodCfg() - { - Name = "SmartCommunication"; - ParentName = string.Empty; - CommTimeout = 1800; /// ms - MaxCommRetries = 4; - WaitTimeAfterFailure = 2200; - PassThroughWaitTime = 1500; - NrThreads = 2; /// 1, 2 or 4 threads - IperlCheckErrorsToStop = 10; - MciTimeoutMs = 4000; // ms, NFC interface - BaudRate = 57600; // NFC Interface - DataBits = 8; // NFC Interface - ParityBit = Parity.None; // NFC Interface - StopBits = StopBits.Two; // NFC Interface - - TestParams = CreateTestParamsProvider() as iPerlCommunicationParams; - } - - public TestMethodCfg(IComponentFactory factory) - : this() - { - this.Factory = factory; - } - - public string ToString(int i) - { - return string.Format("Name={0}, CommTimeout={1}, MaxRetries={2}, NrThreads={3}", Name, CommTimeout, MaxCommRetries, NrThreads); - } - - - public int DelayBetweenRetries { get; set; } - public int MaxCommRetries { get; set; } - public int WaitTimeAfterFailure { get; set; } - public int PassThroughWaitTime { get; set; } - public int NrThreads { get; set; } - public int CommTimeout { get; set; } - public int IperlCheckErrorsToStop { get; set; } - public int MciTimeoutMs { get; set; } - public int BaudRate { get; set; } - public int DataBits { get; set; } - public Parity ParityBit { get; set; } - public StopBits StopBits { get; set; } - public int DfltQ2c_15_rl { get; set; } - public int DfltQ2c_15_lr { get; set; } - public int DfltQ2c_20_rl { get; set; } - public int DfltQ2c_20_lr { get; set; } - public int DfltQ2c_25_63_rl { get; set; } - public int DfltQ2c_25_63_lr { get; set; } - public int DfltQ2c_25_10_rl { get; set; } - public int DfltQ2c_25_10_lr { get; set; } - public int DfltQ2c_32_rl { get; set; } - public int DfltQ2c_32_lr { get; set; } - public int DfltQ2c_40_rl { get; set; } - public int DfltQ2c_40_lr { get; set; } - public bool UseWebService { get; set; } - public string BaseUrl { get; set; } - public string RelativeUrl { get; set; } - - ///Remember to Ignore in XmlSerializer !! - [XmlIgnore] - public ITestParams TestParams { get; set; } - } -} diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs b/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs deleted file mode 100644 index 033152d15..000000000 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs +++ /dev/null @@ -1,299 +0,0 @@ -/// -/// Copyright (c) 2015-2020 Sensus Slovensko a.s. -/// -using System; -using System.Windows.Forms; -using Common; -using Config.Entities; -using TBF.Rig.Generic; -using TBF.Resources; - -namespace TBF.Rig.TestMethods.iPerlCommunication -{ - public partial class TestMethodCfgCtrl : Configs.ConfigCtrlUtils, IComponentCfgCtrl - { - public bool ShowMore { get { return false; } } - - TestMethodCfg config; - public IComponentCfg Config - { - get { return config as IComponentCfg; } - set - { - config = value as TestMethodCfg; - Redraw(); - } - } - - public TestMethodCfgCtrl() - { - InitializeComponent(); - } - - private void EntryFormCfgCtrl_Load(object sender, EventArgs e) - { - Redraw(); - } - - public void Closing() - { - } - - void Redraw() - { - if (config == null) return; /// Control was not loaded, settings were not changed - classNameLabel.Text = config.Factory.ClassName; - nameTextBox.Text = config.Name; - commTimeoutTextBox.Text = config.CommTimeout.ToString(); - maxCommRetriesTextBox.Text = config.MaxCommRetries.ToString(); - delayBetweenRetriesTextBox.Text = config.DelayBetweenRetries.ToString(); - nrThreadsTextBox.Text = config.NrThreads.ToString(); - iperlCheckErrorsToStopTextBox.Text = config.IperlCheckErrorsToStop.ToString(); - - textBox15rl.Text = config.DfltQ2c_15_rl.ToString(); - textBox15lr.Text = config.DfltQ2c_15_lr.ToString(); - textBox20rl.Text = config.DfltQ2c_20_rl.ToString(); - textBox20lr.Text = config.DfltQ2c_20_lr.ToString(); - textBox25_63rl.Text = config.DfltQ2c_25_63_rl.ToString(); - textBox25_63lr.Text = config.DfltQ2c_25_63_lr.ToString(); - textBox25_10rl.Text = config.DfltQ2c_25_10_rl.ToString(); - textBox25_10lr.Text = config.DfltQ2c_25_10_lr.ToString(); - textBox32rl.Text = config.DfltQ2c_32_rl.ToString(); - textBox32lr.Text = config.DfltQ2c_32_lr.ToString(); - textBox40rl.Text = config.DfltQ2c_40_rl.ToString(); - textBox40lr.Text = config.DfltQ2c_40_lr.ToString(); - - useWebServiceCheckBox.Checked = config.UseWebService; - baseUrlTextBox.Text = config.BaseUrl; - relativeUrlTextBox.Text = config.RelativeUrl; - } - - public void Unlock() - { - nameTextBox.Enabled = true; - commTimeoutTextBox.Enabled = true; - maxCommRetriesTextBox.Enabled = true; - delayBetweenRetriesTextBox.Enabled = true; - nrThreadsTextBox.Enabled = true; - iperlCheckErrorsToStopTextBox.Enabled = true; - - textBox15rl.Enabled = true; - textBox15lr.Enabled = true; - textBox20rl.Enabled = true; - textBox20lr.Enabled = true; - textBox25_63rl.Enabled = true; - textBox25_63lr.Enabled = true; - textBox25_10rl.Enabled = true; - textBox25_10lr.Enabled = true; - textBox32rl.Enabled = true; - textBox32lr.Enabled = true; - textBox40rl.Enabled = true; - textBox40lr.Enabled = true; - - useWebServiceCheckBox.Enabled = true; - ManageCheckGroupBox(useWebServiceCheckBox, useWebServiceGroupBox); - baseUrlTextBox.Enabled = useWebServiceCheckBox.Enabled; - relativeUrlTextBox.Enabled = useWebServiceCheckBox.Enabled; - } - - public CfgUpdateFlags VerifyCfg(ref string message) - { - CfgUpdateFlags flags = CfgUpdateFlags.None; - - int dummy; - if (!int.TryParse(commTimeoutTextBox.Text, out dummy) || dummy < 500 || dummy > 5000) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'Comm. timeout' should be in range 500 .. 5000"; - } - if (!int.TryParse(maxCommRetriesTextBox.Text, out dummy) || dummy < 1 || dummy > 10) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'Max. retries' should be in range 1 .. 10"; - } - if (!int.TryParse(delayBetweenRetriesTextBox.Text, out dummy) || dummy < 0 || dummy > 5000) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'Comm. timeout' should be in range 0 .. 5000"; - } - if (!int.TryParse(nrThreadsTextBox.Text, out dummy) || (dummy != 1 && dummy != 2 && dummy != 4)) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'Nr. threads' should be 1, 2 or 4"; - } - if (!int.TryParse(iperlCheckErrorsToStopTextBox.Text, out dummy) || ((dummy < 1) && (dummy > 40))) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + string.Format(Strings.Invalid_0, iperlCheckErrorsToStopLabel.Text); - } - - if (!int.TryParse(textBox15rl.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN15 RL should be in range -50 .. 50"; - } - if (!int.TryParse(textBox15lr.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN15 LR should be in range -50 .. 50"; - } - if (!int.TryParse(textBox20rl.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN20 RL should be in range -50 .. 50"; - } - if (!int.TryParse(textBox20lr.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN20 LR should be in range -50 .. 50"; - } - if (!int.TryParse(textBox25_63rl.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 6.3 RL should be in range -50 .. 50"; - } - if (!int.TryParse(textBox25_63lr.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 6.3 LR should be in range -50 .. 50"; - } - if (!int.TryParse(textBox25_10rl.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 10 RL should be in range -50 .. 50"; - } - if (!int.TryParse(textBox25_10lr.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 10 LR should be in range -50 .. 50"; - } - if (!int.TryParse(textBox32rl.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN32 RL should be in range -50 .. 50"; - } - if (!int.TryParse(textBox32lr.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN32 LR should be in range -50 .. 50"; - } - if (!int.TryParse(textBox40rl.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN40 RL should be in range -50 .. 50"; - } - if (!int.TryParse(textBox40lr.Text, out dummy) || dummy < -50 || dummy > 50) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "Default Q2 correction factor DN40 LR should be in range -50 .. 50"; - } - - return flags; - } - - public CfgUpdateFlags UpdateCfg() - { - CfgUpdateFlags flags = CfgUpdateFlags.None; - - if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed - - if (config.Name != nameTextBox.Text) - { - config.Name = nameTextBox.Text; - flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); - } - - var CommTimeout = config.CommTimeout;; - var MaxCommRetries = config.MaxCommRetries; - var DelayBetweenRetries = config.DelayBetweenRetries; - var NrThreads = config.NrThreads; - var IperlCheckErrorsToStop = config.IperlCheckErrorsToStop; - var DfltQ2c_15_rl = config.DfltQ2c_15_rl; - var DfltQ2c_15_lr = config.DfltQ2c_15_lr; - var DfltQ2c_20_rl = config.DfltQ2c_20_rl; - var DfltQ2c_20_lr = config.DfltQ2c_20_lr; - var DfltQ2c_25_63_rl = config.DfltQ2c_25_63_rl; - var DfltQ2c_25_63_lr = config.DfltQ2c_25_63_lr; - var DfltQ2c_25_10_rl = config.DfltQ2c_25_10_rl; - var DfltQ2c_25_10_lr = config.DfltQ2c_25_10_lr; - var DfltQ2c_32_rl = config.DfltQ2c_32_rl; - var DfltQ2c_32_lr = config.DfltQ2c_32_lr; - var DfltQ2c_40_rl = config.DfltQ2c_40_rl; - var DfltQ2c_40_lr = config.DfltQ2c_40_lr; - var UseWebService = config.UseWebService; - var BaseUrl = config.BaseUrl; - var RelativeUrl = config.RelativeUrl; - - flags |= UpdateDifferent(ref CommTimeout, commTimeoutTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref MaxCommRetries, maxCommRetriesTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DelayBetweenRetries, delayBetweenRetriesTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref NrThreads, nrThreadsTextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref IperlCheckErrorsToStop, iperlCheckErrorsToStopTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - - flags |= UpdateDifferent(ref DfltQ2c_15_rl, textBox15rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_15_lr, textBox15lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_20_rl, textBox20rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_20_lr, textBox20lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_25_63_rl, textBox25_63rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_25_63_lr, textBox25_63lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_25_10_rl, textBox25_10rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_25_10_lr, textBox25_10lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_32_rl, textBox32rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_32_lr, textBox32lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_40_rl, textBox40rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref DfltQ2c_40_lr, textBox40lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - - flags |= UpdateDifferent(ref UseWebService, useWebServiceCheckBox.Checked, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref BaseUrl, baseUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref RelativeUrl, relativeUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - - - config.CommTimeout = CommTimeout; - config.MaxCommRetries = MaxCommRetries; - config.DelayBetweenRetries = DelayBetweenRetries; - config.NrThreads = NrThreads; - config.IperlCheckErrorsToStop = IperlCheckErrorsToStop; - config.DfltQ2c_15_rl = DfltQ2c_15_rl; - config.DfltQ2c_15_lr = DfltQ2c_15_lr; - config.DfltQ2c_20_rl = DfltQ2c_20_rl; - config.DfltQ2c_20_lr = DfltQ2c_20_lr; - config.DfltQ2c_25_63_rl = DfltQ2c_25_63_rl; - config.DfltQ2c_25_63_lr = DfltQ2c_25_63_lr; - config.DfltQ2c_25_10_rl = DfltQ2c_25_10_rl; - config.DfltQ2c_25_10_lr = DfltQ2c_25_10_lr; - config.DfltQ2c_32_rl = DfltQ2c_32_rl; - config.DfltQ2c_32_lr = DfltQ2c_32_lr; - config.DfltQ2c_40_rl = DfltQ2c_40_rl; - config.DfltQ2c_40_lr = DfltQ2c_40_lr; - config.UseWebService = UseWebService; - config.BaseUrl = BaseUrl; - config.RelativeUrl = RelativeUrl; - - if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0) - { - TestMethod.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, config)); - } - - return flags; - } - - private void ManageCheckGroupBox(CheckBox chk, GroupBox grp) - { - /// Make sure the CheckBox isn't in the GroupBox. This will only happen the first time. - if (chk.Parent == grp) - { - grp.Parent.Controls.Add(chk); /// Reparent the CheckBox so it's not in the GroupBox. - chk.Location = new System.Drawing.Point(chk.Left + grp.Left, chk.Top + grp.Top); /// Adjust the CheckBox's location. - chk.BringToFront(); /// Move the CheckBox to the top of the stacking order. - } - - /// Enable or disable the GroupBox. - grp.Enabled = chk.Checked; - } - - private void useWebServiceCheckBox_CheckedChanged(object sender, EventArgs e) - { - useWebServiceGroupBox.Enabled = useWebServiceCheckBox.Checked; - } - } -} diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs b/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs deleted file mode 100644 index a2dead935..000000000 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs +++ /dev/null @@ -1,520 +0,0 @@ -/// -/// Copyright (c) 2015 Sensus Metering Systems -/// Author: Milan Hanajík -/// -namespace TBF.Rig.TestMethods.iPerlCommunication -{ - partial class TestMethodCfgCtrl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.nameTextBox = new System.Windows.Forms.TextBox(); - this.nameLabel = new System.Windows.Forms.Label(); - this.classNameLabel = new System.Windows.Forms.Label(); - this.commTimeoutTextBox = new System.Windows.Forms.TextBox(); - this.commTimeoutLabel = new System.Windows.Forms.Label(); - this.maxCommRetriesTextBox = new System.Windows.Forms.TextBox(); - this.maxNrRetriesLabel = new System.Windows.Forms.Label(); - this.nrThreadsTextBox = new System.Windows.Forms.TextBox(); - this.nrThreadsLabel = new System.Windows.Forms.Label(); - this.iperlCheckErrorsToStopTextBox = new System.Windows.Forms.TextBox(); - this.iperlCheckErrorsToStopLabel = new System.Windows.Forms.Label(); - this.delayBetweenRetriesTextBox = new System.Windows.Forms.TextBox(); - this.delayBetweenRetriesLabel = new System.Windows.Forms.Label(); - this.relativeUrlTextBox = new System.Windows.Forms.TextBox(); - this.relativeUrlLabel = new System.Windows.Forms.Label(); - this.baseUrlTextBox = new System.Windows.Forms.TextBox(); - this.baseUrlLabel = new System.Windows.Forms.Label(); - this.useWebServiceCheckBox = new System.Windows.Forms.CheckBox(); - this.useWebServiceGroupBox = new System.Windows.Forms.GroupBox(); - this.dfltQ2corrFactorsGroupBox = new System.Windows.Forms.GroupBox(); - this.label8 = 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.label1 = new System.Windows.Forms.Label(); - this.textBox40lr = new System.Windows.Forms.TextBox(); - this.textBox32lr = new System.Windows.Forms.TextBox(); - this.textBox25_10lr = new System.Windows.Forms.TextBox(); - this.textBox25_63lr = new System.Windows.Forms.TextBox(); - this.textBox20lr = new System.Windows.Forms.TextBox(); - this.textBox15lr = new System.Windows.Forms.TextBox(); - this.textBox40rl = new System.Windows.Forms.TextBox(); - this.textBox32rl = new System.Windows.Forms.TextBox(); - this.textBox25_10rl = new System.Windows.Forms.TextBox(); - this.textBox25_63rl = new System.Windows.Forms.TextBox(); - this.textBox20rl = new System.Windows.Forms.TextBox(); - this.textBox15rl = new System.Windows.Forms.TextBox(); - this.useWebServiceGroupBox.SuspendLayout(); - this.dfltQ2corrFactorsGroupBox.SuspendLayout(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(237, 31); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 2; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(23, 34); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 1; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(234, 11); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 0; - this.classNameLabel.Text = "ComonentName"; - // - // commTimeoutTextBox - // - this.commTimeoutTextBox.Enabled = false; - this.commTimeoutTextBox.Location = new System.Drawing.Point(237, 53); - this.commTimeoutTextBox.Name = "commTimeoutTextBox"; - this.commTimeoutTextBox.Size = new System.Drawing.Size(45, 20); - this.commTimeoutTextBox.TabIndex = 4; - // - // commTimeoutLabel - // - this.commTimeoutLabel.AutoSize = true; - this.commTimeoutLabel.Location = new System.Drawing.Point(23, 56); - this.commTimeoutLabel.Name = "commTimeoutLabel"; - this.commTimeoutLabel.Size = new System.Drawing.Size(98, 13); - this.commTimeoutLabel.TabIndex = 3; - this.commTimeoutLabel.Text = "Comm. timeout [ms]"; - // - // maxCommRetriesTextBox - // - this.maxCommRetriesTextBox.Enabled = false; - this.maxCommRetriesTextBox.Location = new System.Drawing.Point(237, 75); - this.maxCommRetriesTextBox.Name = "maxCommRetriesTextBox"; - this.maxCommRetriesTextBox.Size = new System.Drawing.Size(45, 20); - this.maxCommRetriesTextBox.TabIndex = 6; - // - // maxNrRetriesLabel - // - this.maxNrRetriesLabel.AutoSize = true; - this.maxNrRetriesLabel.Location = new System.Drawing.Point(23, 78); - this.maxNrRetriesLabel.Name = "maxNrRetriesLabel"; - this.maxNrRetriesLabel.Size = new System.Drawing.Size(61, 13); - this.maxNrRetriesLabel.TabIndex = 5; - this.maxNrRetriesLabel.Text = "Max. retries"; - // - // nrThreadsTextBox - // - this.nrThreadsTextBox.Enabled = false; - this.nrThreadsTextBox.Location = new System.Drawing.Point(237, 119); - this.nrThreadsTextBox.Name = "nrThreadsTextBox"; - this.nrThreadsTextBox.Size = new System.Drawing.Size(45, 20); - this.nrThreadsTextBox.TabIndex = 10; - // - // nrThreadsLabel - // - this.nrThreadsLabel.AutoSize = true; - this.nrThreadsLabel.Location = new System.Drawing.Point(23, 122); - this.nrThreadsLabel.Name = "nrThreadsLabel"; - this.nrThreadsLabel.Size = new System.Drawing.Size(59, 13); - this.nrThreadsLabel.TabIndex = 9; - this.nrThreadsLabel.Text = "Nr. threads"; - // - // iperlCheckErrorsToStopTextBox - // - this.iperlCheckErrorsToStopTextBox.Enabled = false; - this.iperlCheckErrorsToStopTextBox.Location = new System.Drawing.Point(237, 141); - this.iperlCheckErrorsToStopTextBox.Name = "iperlCheckErrorsToStopTextBox"; - this.iperlCheckErrorsToStopTextBox.Size = new System.Drawing.Size(45, 20); - this.iperlCheckErrorsToStopTextBox.TabIndex = 13; - // - // iperlCheckErrorsToStopLabel - // - this.iperlCheckErrorsToStopLabel.AutoSize = true; - this.iperlCheckErrorsToStopLabel.Location = new System.Drawing.Point(23, 144); - this.iperlCheckErrorsToStopLabel.Name = "iperlCheckErrorsToStopLabel"; - this.iperlCheckErrorsToStopLabel.Size = new System.Drawing.Size(202, 13); - this.iperlCheckErrorsToStopLabel.TabIndex = 12; - this.iperlCheckErrorsToStopLabel.Text = "iperl_check errors count to stop the cycle"; - // - // delayBetweenRetriesTextBox - // - this.delayBetweenRetriesTextBox.Enabled = false; - this.delayBetweenRetriesTextBox.Location = new System.Drawing.Point(237, 97); - this.delayBetweenRetriesTextBox.Name = "delayBetweenRetriesTextBox"; - this.delayBetweenRetriesTextBox.Size = new System.Drawing.Size(45, 20); - this.delayBetweenRetriesTextBox.TabIndex = 8; - // - // delayBetweenRetriesLabel - // - this.delayBetweenRetriesLabel.AutoSize = true; - this.delayBetweenRetriesLabel.Location = new System.Drawing.Point(23, 100); - this.delayBetweenRetriesLabel.Name = "delayBetweenRetriesLabel"; - this.delayBetweenRetriesLabel.Size = new System.Drawing.Size(131, 13); - this.delayBetweenRetriesLabel.TabIndex = 7; - this.delayBetweenRetriesLabel.Text = "Delay between retries [ms]"; - // - // relativeUrlTextBox - // - this.relativeUrlTextBox.Enabled = false; - this.relativeUrlTextBox.Location = new System.Drawing.Point(89, 50); - this.relativeUrlTextBox.Name = "relativeUrlTextBox"; - this.relativeUrlTextBox.Size = new System.Drawing.Size(298, 20); - this.relativeUrlTextBox.TabIndex = 18; - // - // relativeUrlLabel - // - this.relativeUrlLabel.AutoSize = true; - this.relativeUrlLabel.Location = new System.Drawing.Point(13, 53); - this.relativeUrlLabel.Name = "relativeUrlLabel"; - this.relativeUrlLabel.Size = new System.Drawing.Size(71, 13); - this.relativeUrlLabel.TabIndex = 17; - this.relativeUrlLabel.Text = "Relative URL"; - // - // baseUrlTextBox - // - this.baseUrlTextBox.Enabled = false; - this.baseUrlTextBox.Location = new System.Drawing.Point(89, 24); - this.baseUrlTextBox.Name = "baseUrlTextBox"; - this.baseUrlTextBox.Size = new System.Drawing.Size(298, 20); - this.baseUrlTextBox.TabIndex = 16; - // - // baseUrlLabel - // - this.baseUrlLabel.AutoSize = true; - this.baseUrlLabel.Location = new System.Drawing.Point(13, 27); - this.baseUrlLabel.Name = "baseUrlLabel"; - this.baseUrlLabel.Size = new System.Drawing.Size(56, 13); - this.baseUrlLabel.TabIndex = 15; - this.baseUrlLabel.Text = "Base URL"; - // - // useWebServiceCheckBox - // - this.useWebServiceCheckBox.AutoSize = true; - this.useWebServiceCheckBox.Enabled = false; - this.useWebServiceCheckBox.Location = new System.Drawing.Point(15, 0); - this.useWebServiceCheckBox.Name = "useWebServiceCheckBox"; - this.useWebServiceCheckBox.Size = new System.Drawing.Size(189, 17); - this.useWebServiceCheckBox.TabIndex = 14; - this.useWebServiceCheckBox.Text = "Use web service for default values"; - this.useWebServiceCheckBox.UseVisualStyleBackColor = true; - this.useWebServiceCheckBox.CheckedChanged += new System.EventHandler(this.useWebServiceCheckBox_CheckedChanged); - // - // useWebServiceGroupBox - // - this.useWebServiceGroupBox.Controls.Add(this.baseUrlTextBox); - this.useWebServiceGroupBox.Controls.Add(this.useWebServiceCheckBox); - this.useWebServiceGroupBox.Controls.Add(this.relativeUrlTextBox); - this.useWebServiceGroupBox.Controls.Add(this.relativeUrlLabel); - this.useWebServiceGroupBox.Controls.Add(this.baseUrlLabel); - this.useWebServiceGroupBox.Location = new System.Drawing.Point(11, 266); - this.useWebServiceGroupBox.Name = "useWebServiceGroupBox"; - this.useWebServiceGroupBox.Size = new System.Drawing.Size(404, 83); - this.useWebServiceGroupBox.TabIndex = 0; - this.useWebServiceGroupBox.TabStop = false; - // - // dfltQ2corrFactorsGroupBox - // - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label8); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label7); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label6); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label5); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label4); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label3); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label2); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label1); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox40lr); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox32lr); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_10lr); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_63lr); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox20lr); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox15lr); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox40rl); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox32rl); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_10rl); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_63rl); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox20rl); - this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox15rl); - this.dfltQ2corrFactorsGroupBox.Location = new System.Drawing.Point(11, 175); - this.dfltQ2corrFactorsGroupBox.Name = "dfltQ2corrFactorsGroupBox"; - this.dfltQ2corrFactorsGroupBox.Size = new System.Drawing.Size(404, 85); - this.dfltQ2corrFactorsGroupBox.TabIndex = 14; - this.dfltQ2corrFactorsGroupBox.TabStop = false; - this.dfltQ2corrFactorsGroupBox.Text = "Default Q2 correction factors"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(344, 17); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(35, 13); - this.label8.TabIndex = 19; - this.label8.Text = "DN40"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(289, 17); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(35, 13); - this.label7.TabIndex = 18; - this.label7.Text = "DN32"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(233, 17); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(45, 13); - this.label6.TabIndex = 17; - this.label6.Text = "...Q3 10"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(163, 17); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(70, 13); - this.label5.TabIndex = 16; - this.label5.Text = "DN25 Q3 6.3"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(121, 17); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(35, 13); - this.label4.TabIndex = 15; - this.label4.Text = "DN20"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(65, 17); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(35, 13); - this.label3.TabIndex = 14; - this.label3.Text = "DN15"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(22, 57); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(24, 13); - this.label2.TabIndex = 13; - this.label2.Text = "L-R"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(22, 34); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(24, 13); - this.label1.TabIndex = 12; - this.label1.Text = "R-L"; - // - // textBox40lr - // - this.textBox40lr.Enabled = false; - this.textBox40lr.Location = new System.Drawing.Point(337, 54); - this.textBox40lr.Name = "textBox40lr"; - this.textBox40lr.Size = new System.Drawing.Size(50, 20); - this.textBox40lr.TabIndex = 11; - // - // textBox32lr - // - this.textBox32lr.Enabled = false; - this.textBox32lr.Location = new System.Drawing.Point(281, 54); - this.textBox32lr.Name = "textBox32lr"; - this.textBox32lr.Size = new System.Drawing.Size(50, 20); - this.textBox32lr.TabIndex = 10; - // - // textBox25_10lr - // - this.textBox25_10lr.Enabled = false; - this.textBox25_10lr.Location = new System.Drawing.Point(225, 54); - this.textBox25_10lr.Name = "textBox25_10lr"; - this.textBox25_10lr.Size = new System.Drawing.Size(50, 20); - this.textBox25_10lr.TabIndex = 9; - // - // textBox25_63lr - // - this.textBox25_63lr.Enabled = false; - this.textBox25_63lr.Location = new System.Drawing.Point(169, 54); - this.textBox25_63lr.Name = "textBox25_63lr"; - this.textBox25_63lr.Size = new System.Drawing.Size(50, 20); - this.textBox25_63lr.TabIndex = 8; - // - // textBox20lr - // - this.textBox20lr.Enabled = false; - this.textBox20lr.Location = new System.Drawing.Point(113, 54); - this.textBox20lr.Name = "textBox20lr"; - this.textBox20lr.Size = new System.Drawing.Size(50, 20); - this.textBox20lr.TabIndex = 7; - // - // textBox15lr - // - this.textBox15lr.Enabled = false; - this.textBox15lr.Location = new System.Drawing.Point(57, 54); - this.textBox15lr.Name = "textBox15lr"; - this.textBox15lr.Size = new System.Drawing.Size(50, 20); - this.textBox15lr.TabIndex = 6; - // - // textBox40rl - // - this.textBox40rl.Enabled = false; - this.textBox40rl.Location = new System.Drawing.Point(337, 31); - this.textBox40rl.Name = "textBox40rl"; - this.textBox40rl.Size = new System.Drawing.Size(50, 20); - this.textBox40rl.TabIndex = 5; - // - // textBox32rl - // - this.textBox32rl.Enabled = false; - this.textBox32rl.Location = new System.Drawing.Point(281, 31); - this.textBox32rl.Name = "textBox32rl"; - this.textBox32rl.Size = new System.Drawing.Size(50, 20); - this.textBox32rl.TabIndex = 4; - // - // textBox25_10rl - // - this.textBox25_10rl.Enabled = false; - this.textBox25_10rl.Location = new System.Drawing.Point(225, 31); - this.textBox25_10rl.Name = "textBox25_10rl"; - this.textBox25_10rl.Size = new System.Drawing.Size(50, 20); - this.textBox25_10rl.TabIndex = 3; - // - // textBox25_63rl - // - this.textBox25_63rl.Enabled = false; - this.textBox25_63rl.Location = new System.Drawing.Point(169, 31); - this.textBox25_63rl.Name = "textBox25_63rl"; - this.textBox25_63rl.Size = new System.Drawing.Size(50, 20); - this.textBox25_63rl.TabIndex = 2; - // - // textBox20rl - // - this.textBox20rl.Enabled = false; - this.textBox20rl.Location = new System.Drawing.Point(113, 31); - this.textBox20rl.Name = "textBox20rl"; - this.textBox20rl.Size = new System.Drawing.Size(50, 20); - this.textBox20rl.TabIndex = 1; - // - // textBox15rl - // - this.textBox15rl.Enabled = false; - this.textBox15rl.Location = new System.Drawing.Point(57, 31); - this.textBox15rl.Name = "textBox15rl"; - this.textBox15rl.Size = new System.Drawing.Size(50, 20); - this.textBox15rl.TabIndex = 0; - // - // TestMethodCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.dfltQ2corrFactorsGroupBox); - this.Controls.Add(this.useWebServiceGroupBox); - this.Controls.Add(this.delayBetweenRetriesTextBox); - this.Controls.Add(this.delayBetweenRetriesLabel); - this.Controls.Add(this.iperlCheckErrorsToStopTextBox); - this.Controls.Add(this.iperlCheckErrorsToStopLabel); - this.Controls.Add(this.nrThreadsTextBox); - this.Controls.Add(this.nrThreadsLabel); - this.Controls.Add(this.maxCommRetriesTextBox); - this.Controls.Add(this.maxNrRetriesLabel); - this.Controls.Add(this.commTimeoutTextBox); - this.Controls.Add(this.commTimeoutLabel); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "TestMethodCfgCtrl"; - this.Size = new System.Drawing.Size(427, 363); - this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); - this.useWebServiceGroupBox.ResumeLayout(false); - this.useWebServiceGroupBox.PerformLayout(); - this.dfltQ2corrFactorsGroupBox.ResumeLayout(false); - this.dfltQ2corrFactorsGroupBox.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.Label nameLabel; - private System.Windows.Forms.Label classNameLabel; - private System.Windows.Forms.TextBox commTimeoutTextBox; - private System.Windows.Forms.Label commTimeoutLabel; - private System.Windows.Forms.TextBox maxCommRetriesTextBox; - private System.Windows.Forms.Label maxNrRetriesLabel; - private System.Windows.Forms.TextBox nrThreadsTextBox; - private System.Windows.Forms.Label nrThreadsLabel; - private System.Windows.Forms.TextBox iperlCheckErrorsToStopTextBox; - private System.Windows.Forms.Label iperlCheckErrorsToStopLabel; - private System.Windows.Forms.TextBox delayBetweenRetriesTextBox; - private System.Windows.Forms.Label delayBetweenRetriesLabel; - private System.Windows.Forms.TextBox relativeUrlTextBox; - private System.Windows.Forms.Label relativeUrlLabel; - private System.Windows.Forms.TextBox baseUrlTextBox; - private System.Windows.Forms.Label baseUrlLabel; - private System.Windows.Forms.CheckBox useWebServiceCheckBox; - private System.Windows.Forms.GroupBox useWebServiceGroupBox; - private System.Windows.Forms.GroupBox dfltQ2corrFactorsGroupBox; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox40lr; - private System.Windows.Forms.TextBox textBox32lr; - private System.Windows.Forms.TextBox textBox25_10lr; - private System.Windows.Forms.TextBox textBox25_63lr; - private System.Windows.Forms.TextBox textBox20lr; - private System.Windows.Forms.TextBox textBox15lr; - private System.Windows.Forms.TextBox textBox40rl; - private System.Windows.Forms.TextBox textBox32rl; - private System.Windows.Forms.TextBox textBox25_10rl; - private System.Windows.Forms.TextBox textBox25_63rl; - private System.Windows.Forms.TextBox textBox20rl; - private System.Windows.Forms.TextBox textBox15rl; - } -} diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.resx b/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfgCtrl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodFactory.cs b/TBF/Rig/TestMethods/iPerlCommunication/TestMethodFactory.cs index d72ececac..afc56ddac 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethodFactory.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/TestMethodFactory.cs @@ -3,6 +3,7 @@ /// using System.Collections.Generic; using TBF.Rig.Generic; +using TBF.Rig.TestMethods.GenesisCommunication; namespace TBF.Rig.TestMethods.iPerlCommunication { diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 767dc30e9..5777725d2 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -20,6 +20,7 @@ using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead; using Results.Entities; using static Sensus.iPerl.NfcHandler.MCI_Protocol; using System.Threading.Tasks; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.TestMethods.iPerlCommunication.communication; using TBF.Rig.TestMethods.iPerlCommunication.communication.C4.diagnosticLed; using TBF.Rig.TestMethods.iPerlCommunication.communication.C4.protocolCommons; diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs deleted file mode 100644 index 0e7e78352..000000000 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs +++ /dev/null @@ -1,211 +0,0 @@ -/// -/// Copyright (c) 2015-2022 Sensus Slovensko a.s. -/// -using System; -using System.IO; -using System.Text; -using System.Xml.Serialization; -using Common; -using Config.Entities; -using TBF.Rig.Generic; -using TBF.Resources; -using System.Collections.Generic; - -namespace TBF.Rig.TestMethods.iPerlCommunication -{ - public class iPerlCommunicationParams : TestParamsBase, IParamsProvider, ITestParams - { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(iPerlCommunicationParams) })[0]; - public override XmlSerializer GetSerializer() { return Serializer; } - - public string Activity - { - get { return base.Activity; } - set { base.Activity = value; } - } - - /// Communication activity - public bool SimultWithPrevious; - public bool SimultWithNext; - - public override void InitializeAll() - { - Activity = iPerlCommunicationForm.ReadConfigurationStr; - SimultWithPrevious = false; - SimultWithNext = false; - } - - - string[] paramNames = new string[] - { - Strings.Activity, - Strings.Simultaneous_with_previous_step, - Strings.Simultaneous_with_next_step, - }; - public override string ParamName(int i) { return paramNames[i]; } - public override int ParamsCount() { return paramNames.Length; } - - public override ICollection ParamValues(int i) - { - if (i == 0) - { - var retVal = new List(); - retVal.Add(iPerlCommunicationForm.ReadConfigurationStr); - retVal.Add(iPerlCommunicationForm.ReadSerialNrStr); - retVal.Add(string.Format("{0} A0", iPerlCommunicationForm.SetTestModeStr)); - retVal.Add(string.Format("{0} A4", iPerlCommunicationForm.SetTestModeStr)); - retVal.Add(iPerlCommunicationForm.ReadCalibrationStr); - retVal.Add(iPerlCommunicationForm.ReadCalibrationV4Str); - retVal.Add(iPerlCommunicationForm.NormalizeCalibrationFactorStr); - retVal.Add(iPerlCommunicationForm.NormalizeCalibrationV4FactorsStr); - retVal.Add(iPerlCommunicationForm.GetDefaultQ2CorrectionsStr); - retVal.Add(iPerlCommunicationForm.ReadQ2CorrectionStr); - retVal.Add(iPerlCommunicationForm.ResetQ2CorrectionStr); - retVal.Add(iPerlCommunicationForm.WriteDefaultQ2CorrectionsStr); - retVal.Add(iPerlCommunicationForm.InitOrReadQ2CorrectionsStr); - retVal.Add(iPerlCommunicationForm.WriteCalibrationFactorStr); - retVal.Add(iPerlCommunicationForm.WriteCalibrationV4FactorsStr); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionStr); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionAltStr); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionGreeceStr); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionRLStr); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionLRStr); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionIncl05Str); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionAltIncl05Str); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionPlusIncl05Str); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionPlusAltIncl05Str); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionGreeceIncl05Str); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionRLIncl05Str); - retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionLRIncl05Str); - retVal.Add(iPerlCommunicationSeq.Q2correctedFromCmd + "Qx"); - retVal.Add(iPerlCommunicationSeq.StrictQ2ErrorCheckStr + "Qx"); - retVal.Add(iPerlCommunicationSeq.Q2correctionCheckCmd); - retVal.Add(iPerlCommunicationSeq.IperlCheckCmd); - retVal.Add(iPerlCommunicationForm.UpdateBothQ2FactorsTestRLOnlyStr); - retVal.Add(iPerlCommunicationForm.UpdateBothQ2FactorsTestLROnlyStr); - retVal.Add(iPerlCommunicationForm.UpdateQ2CorrectionsStr); - retVal.Add(iPerlCommunicationForm.ConditnlUpdateQ2CorrectionsStr); - retVal.Add(iPerlCommunicationForm.ConditnlUpdateQ2CorrRLStr); - retVal.Add(iPerlCommunicationForm.ConditnlUpdateQ2CorrLRStr); - retVal.Add("Q2 corrected from Q2adj"); - retVal.Add("Q2 correction check Q2bc Q2ac"); - retVal.Add(iPerlCommunicationForm.SetActiveModeStr); - retVal.Add(iPerlCommunicationForm.SetIdleModeStr); - retVal.Add("---"); - retVal.Add(iPerlCommunicationForm.Reset2HzCorrectionStr); - retVal.Add(iPerlCommunicationForm.Write2HzCorrectionStr); - retVal.Add(iPerlCommunicationForm.DewaReworkRLStr); - retVal.Add(iPerlCommunicationForm.DewaReworkLRStr); - retVal.Add(iPerlCommunicationForm.StartTestingSealedMetersStr); - retVal.Add(iPerlCommunicationForm.EndTestingSealedMetersStr); - retVal.Add(string.Format("{0} if enabled", iPerlCommunicationForm.ReadConfigurationStr)); - retVal.Add(string.Format("{0} 80", iPerlCommunicationForm.SetTestModeStr)); - retVal.Add("iPerl_check prevWorkStep direction q2factors"); - for (ConditionID id = ConditionID.A; id < ConditionID.Count; id++) - { - retVal.Add(string.Format(SequenceConditionOp.ConditionNameFmt, id)); - } - - return retVal; - } - else - { - return new string[] { Strings.yes, Strings.no }; - } - } - - public override string ToString(int i) - { - switch (i) - { - case 0: return Activity; - case 1: return (SimultWithPrevious ? Strings.yes : Strings.no); - case 2: return (SimultWithNext ? Strings.yes : Strings.no); - default: return string.Empty; - } - } - - public CfgUpdateFlags UpdateParam(int i, string strValue) - { - switch (i) - { - case 0: Activity = strValue; return CfgUpdateFlags.None; - case 1: SimultWithPrevious = strValue.ToLower().Equals(Strings.yes.ToLower()); return CfgUpdateFlags.None; - case 2: SimultWithNext = strValue.ToLower().Equals(Strings.yes.ToLower()); return CfgUpdateFlags.None; - default: return CfgUpdateFlags.None; - } - } - - public bool ValidateParam(int i, string strValue, out string message) - { - message = string.Empty; - - switch (i) - { - case 0: - return true; - case 1: - case 2: - if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; - break; - default: - message = "Invalid index"; - return false; - } - - message = ParamName(i) + " is invalid"; - return false; - } - - void CopyContentTo(iPerlCommunicationParams prms) - { - prms.Activity = this.Activity; - prms.SimultWithPrevious = this.SimultWithPrevious; - prms.SimultWithNext = this.SimultWithNext; - } - - public IParamsProvider Clone() - { - iPerlCommunicationParams pars = new iPerlCommunicationParams(); - CopyContentTo(pars); - return pars; - } - - public override void UpdateFromDbEntity(ComponentTest dbEntity) - { - if (dbEntity == null) return; - try - { - iPerlCommunicationParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as iPerlCommunicationParams; - - testParamsEntity = dbEntity; - componentName = dbEntity.CmpntName; - test = dbEntity.Test; - - if (tmp != null) tmp.CopyContentTo(this); - } - catch - { - } - } - - /// - /// Parameterless constructor initializes the parameters - /// - public iPerlCommunicationParams() - { - } - - public iPerlCommunicationParams(bool initialize) - { - if (initialize) InitializeAll(); - } - - public iPerlCommunicationParams(ComponentTest testParamsEntity, string componentName, Test test) - { - this.testParamsEntity = testParamsEntity; - this.componentName = componentName; - this.test = test; - } - } -} diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 4b07e5429..84c83a438 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -14,6 +14,7 @@ using TBF.UiBridge; using Results; using Results.Entities; using TBF.Rig.Generic; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead; namespace TBF.Rig.TestMethods.iPerlCommunication diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs index f65c32ade..4a27edc62 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs @@ -3,6 +3,7 @@ using System.Threading; using System.Web.UI.WebControls; using System.Windows.Forms; using TBF.Rig.Sequences; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.TestMethods.iPerlCommunication.communication; namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/NfcServices.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/NfcServices.cs index 9f50e64b9..9f05a1608 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/NfcServices.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/NfcServices.cs @@ -5,6 +5,7 @@ using System; using System.Globalization; using System.Text; using System.Threading; +using TBF.Rig.TestMethods.GenesisCommunication; using static Sensus.iPerl.NfcHandler.MCI_Protocol; namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/RfidServices.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/RfidServices.cs index 0a0bedf1e..3347eb504 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/RfidServices.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/RfidServices.cs @@ -5,6 +5,7 @@ using System; using System.Text.RegularExpressions; using System.Threading; using log4net; +using TBF.Rig.TestMethods.GenesisCommunication; namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead { diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/SimulationServices.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/SimulationServices.cs index 0f90ae570..63a39a2d0 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/SimulationServices.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/SimulationServices.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.TestMethods.iPerlCommunication.communication.C4.diagnosticLed; using TBF.Rig.TestMethods.iPerlCommunication.communication.C4.protocolCommons; diff --git a/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlASICCorrections.cs b/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlASICCorrections.cs index 75ac506dd..ff275c244 100644 --- a/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlASICCorrections.cs +++ b/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlASICCorrections.cs @@ -15,6 +15,7 @@ using TBF.Rig.Generic; using TBF.Rig.RegisterReaders.CommonRR.IPerl; using TBF.Rig.RegisterReaders.IPerlReader.implementations; using TBF.Rig.Sequences; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.TestMethods.iPerlCommunication; using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead; using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication.common; diff --git a/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlCorrections.cs b/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlCorrections.cs index d14df3d0b..844a1db13 100644 --- a/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlCorrections.cs +++ b/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/implementations/IPerlCorrections.cs @@ -15,6 +15,7 @@ using TBF.Rig.Generic; using TBF.Rig.RegisterReaders.CommonRR.IPerl; using TBF.Rig.RegisterReaders.IPerlReader.implementations; using TBF.Rig.Sequences; +using TBF.Rig.TestMethods.GenesisCommunication; using TBF.Rig.TestMethods.iPerlCommunication; using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead; using TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication.common; diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 624951d28..176ff6c4d 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -186,18 +186,12 @@ ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll - - ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll - ..\packages\Common\Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll ..\packages\Common\Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll - - ..\packages\Common\Xylem.Common.Metrology.Measurements.dll - False ..\packages\Common\Xylem.Common.Utils.Logging.dll @@ -1923,7 +1917,6 @@ Form - @@ -1950,13 +1943,6 @@ - - - - - UserControl - - @@ -3842,7 +3828,6 @@ - CfgCtrl.cs @@ -4438,6 +4423,14 @@ {439D0878-C76E-452B-B17D-209A89E91D36} Dirichlet.Numerics + + {04201e95-90a0-4b73-a72f-379739b2a3ae} + GenesisCore + + + {6ccdb656-c676-4360-baba-c4596aad175d} + Measurements + {8B10D15A-39DE-4B56-8DD1-710C1EB3A697} GemCard diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll index 22c60fa9f..c12c9e354 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll differ diff --git a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll index ba98b8559..bacac228e 100644 Binary files a/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll and b/packages/Common/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll differ diff --git a/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe b/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe index 9f15b8e69..98c5497b7 100644 Binary files a/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe and b/packages/Common/Xylem.Common.Ui.GenesisToolBox.exe differ diff --git a/packages/Common/XylemCommonUiLegacyGenCtl.dll b/packages/Common/XylemCommonUiLegacyGenCtl.dll index 376e170e5..a4b0fccc9 100644 Binary files a/packages/Common/XylemCommonUiLegacyGenCtl.dll and b/packages/Common/XylemCommonUiLegacyGenCtl.dll differ