From 2b2cc0f6f86d78f086aa5ab3ad29c944334142fb Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Sat, 18 Apr 2015 07:31:52 +0200
Subject: [PATCH] Diverter - preparation for calibration

---
 .../BenchControl/Elde/Diverter/Diverter.cs    |  4 +--
 .../BenchControl/Elde/Diverter/DiverterCfg.cs | 12 +++----
 .../Elde/Diverter/DiverterCfgCtrl.cs          |  8 ++---
 .../BenchControl/Elde/Diverter/Handlers.cs    | 36 +++++++++++++++++++
 TestBenchFramework/TBF.csproj                 |  1 +
 5 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 TestBenchFramework/BenchControl/Elde/Diverter/Handlers.cs

diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs b/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs
index 5ab24200d..88e0736e1 100644
--- a/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs
+++ b/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs
@@ -33,8 +33,8 @@ namespace TBF.BenchControl.Elde.Diverter
 			this.mask = (((ulong)1) << cfg.BitPosition);
 
 			/// Prepare data for SendCalibData() control board component method
-			controlBoard.DiverterEdge[0] = (uint)diverterCfg.StartingEdge;
-			controlBoard.DiverterEdge[1] = (uint)diverterCfg.StoppingEdge;
+			controlBoard.DiverterEdge[0] = (uint)diverterCfg.StartingLevel;
+			controlBoard.DiverterEdge[1] = (uint)diverterCfg.StoppingLevel;
 
 			log.Debug(this.ToString());
 		}
diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfg.cs b/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfg.cs
index b8ad01f4e..f009265a9 100644
--- a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfg.cs
+++ b/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfg.cs
@@ -17,8 +17,8 @@ namespace TBF.BenchControl.Elde.Diverter
 		/// Serialized parameters 
 		///
 		public int BitPosition;		/// 0..63
-		public int StartingEdge;	/// 0..100 in %, threshold for the ADC value to start the test
-		public int StoppingEdge;	/// 0..100 in %, threshold for the ADC value to start the test
+		public int StartingLevel;	/// 0..100 in %, threshold for the ADC value to start the test
+		public int StoppingLevel;	/// 0..100 in %, threshold for the ADC value to start the test
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		DiverterCfg()
@@ -26,8 +26,8 @@ namespace TBF.BenchControl.Elde.Diverter
             Name = "Div";
             ParentName = "CB";
             BitPosition = 0;
-			StartingEdge = 50;
-			StoppingEdge = 50;
+			StartingLevel = 50;
+			StoppingLevel = 50;
 		}
 
         public DiverterCfg(IComponentFactory factory)
@@ -42,8 +42,8 @@ namespace TBF.BenchControl.Elde.Diverter
                                  Name,
                                  (string.IsNullOrEmpty(ParentName) ? "-" : ParentName),
                                  BitPosition,
-								 StartingEdge,
-								 StoppingEdge);
+								 StartingLevel,
+								 StoppingLevel);
 		}
 	}
 }
diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs b/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs
index e05010f92..9efd69fd5 100644
--- a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs
+++ b/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs
@@ -70,8 +70,8 @@ namespace TBF.BenchControl.Elde.Diverter
 			parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
 			nameTextBox.Text = config.Name;
 			bitPositionTextBox.Text = config.BitPosition.ToString();
-			startingEdgeTextBox.Text = config.StartingEdge.ToString();
-			stoppingEdgeTextBox.Text = config.StoppingEdge.ToString();
+			startingEdgeTextBox.Text = config.StartingLevel.ToString();
+			stoppingEdgeTextBox.Text = config.StoppingLevel.ToString();
 		}
 
 		public void Unlock()
@@ -120,8 +120,8 @@ namespace TBF.BenchControl.Elde.Diverter
 			config.Name = nameTextBox.Text;
 			config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
 			config.BitPosition = int.Parse(bitPositionTextBox.Text);
-			config.StartingEdge = int.Parse(startingEdgeTextBox.Text);
-			config.StoppingEdge = int.Parse(stoppingEdgeTextBox.Text);
+			config.StartingLevel = int.Parse(startingEdgeTextBox.Text);
+			config.StoppingLevel = int.Parse(stoppingEdgeTextBox.Text);
 
 			return flags;
 		}
diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/Handlers.cs b/TestBenchFramework/BenchControl/Elde/Diverter/Handlers.cs
new file mode 100644
index 000000000..d779e8c8e
--- /dev/null
+++ b/TestBenchFramework/BenchControl/Elde/Diverter/Handlers.cs
@@ -0,0 +1,36 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using System;
+using log4net;
+
+namespace TBF.BenchControl.Elde.Diverter
+{
+    static class Handlers
+    {
+        static readonly ILog log = LogManager.GetLogger(typeof(Handlers));
+
+        static Handlers()
+        {
+        }
+
+        /// <summary>
+        /// Called from the state machine when a procedure is selected and UI needs to be updated.
+        /// </summary>
+        public static void OnAdcChanged(object sender, CmdResponseArgs data)
+        {
+            if (AdcChangedHandler == null)
+                return;
+
+            try
+            {
+                AdcChangedHandler(sender, data);
+            }
+            catch (Exception e)
+            {
+                log.Error("AdcChangedHandler(...) failed", e);
+            }
+        }
+        public static event EventHandler<CmdResponseArgs> AdcChangedHandler;
+    }
+}
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 97285653b..2f5ce6116 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -156,6 +156,7 @@
     <Compile Include="BenchControl\DataEntry\Standard\WMStatesForm.designer.cs">
       <DependentUpon>WMStatesForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="BenchControl\Elde\Diverter\Handlers.cs" />
     <Compile Include="PrintOrderDocument.cs">
       <SubType>Component</SubType>
     </Compile>