From ebf03af9c12d45269f462bf829bfb177d1a33fe2 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Tue, 24 Jan 2017 15:05:30 +0100
Subject: [PATCH] Global defines clean-up

---
 .../BenchControl/Elde/ControlBoardDev.cs           |  6 ++----
 .../BenchControl/Elde/ControlComWrap.cs            | 14 +++++---------
 TestBenchFramework/BenchControl/StateMachine.cs    |  6 ++----
 TestBenchFramework/MainWnd.Designer.cs             |  5 +----
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
index af8475ac6..87485c593 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
@@ -260,14 +260,12 @@ namespace TBF.BenchControl.Elde
         public void InitializeComponent(
 #if DN100
 			ControlCom2VB.ControlCom2panel ctrlBrdComponent,
-#elif MUNICH
-			ControlComponent3Munich.UserControl1 ctrlBrdComponent,
-#elif FUZHOU150
+#elif MUNICH || FUZHOU150
 			ControlComponent3Munich.UserControl1 ctrlBrdComponent,
 #elif FUZHOU300
             ControlComponent3F300.UserControl1 ctrlBrdComponent,
 #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN
-            ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
+ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
 #else /// all newer benches
 			ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
 #endif
diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
index 3615d5bb6..825e7ce6b 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
@@ -97,14 +97,12 @@ namespace TBF.BenchControl.Elde
         ///
 #if DN100
         private ControlCom2VB.ControlCom2panel ctrlBrdComponent;
-#elif MUNICH
-		private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
-#elif FUZHOU150
+#elif MUNICH || FUZHOU150
 		private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
 #elif FUZHOU300
         private ControlComponent3F300.UserControl1 ctrlBrdComponent;
 #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN
-        private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
+		private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
 #else /// newer benches
         private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 #endif
@@ -115,14 +113,12 @@ namespace TBF.BenchControl.Elde
 		/// <param name="ctrlBrdComponent"></param>
 #if DN100
 		public ControlComWrap(ControlCom2VB.ControlCom2panel ctrlBrdComponent)
-#elif MUNICH
-		public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
-#elif FUZHOU150
+#elif MUNICH || FUZHOU150
 		public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
 #elif FUZHOU300
         public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent)
 #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN
-        public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
+		public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
 #else /// all newer benches
         public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #endif
@@ -166,7 +162,7 @@ namespace TBF.BenchControl.Elde
             //TBF.UiBridge.Bridge.OnLog(this, string.Format("{0} SendCalibData(COM{1}) rvCalib[0,0]={2} rvCalib[0,1]={3} rvCalib[1,0]={4} rvCalib[1,1]={5}\r\n",
             //                                              DateTime.Now.ToLongTimeString(), usedCom,
             //                                              rvCalib[0,0], rvCalib[0,1], rvCalib[1,0], rvCalib[1,1]));
-            log.Fatal("SendCalibData(...)");
+			log.Fatal("SendCalibData(...)");
 			for (int i = 0; i < rvCalib.GetLength(0); i++)
 				for (int j = 0; j < rvCalib.GetLength(1); j++)
 					log.FatalFormat("   rvCalib[{0},{1}] = {2}", i, j, rvCalib[i,j]);
diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs
index 9d53c09a4..22084d34b 100644
--- a/TestBenchFramework/BenchControl/StateMachine.cs
+++ b/TestBenchFramework/BenchControl/StateMachine.cs
@@ -191,14 +191,12 @@ namespace TBF.BenchControl
         /// <param name="label">Identifies the initial state</param>
 #if DN100
 		public static void InitializeBoardEtc(ControlCom2VB.ControlCom2panel ctrlBrdComponent)
-#elif MUNICH
-		public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
-#elif FUZHOU150
+#elif MUNICH || FUZHOU150
 		public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
 #elif FUZHOU300
         public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent)
 #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN
-        public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
+		public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
 #else /// all newer benches
         public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #endif
diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs
index 0fc0390f7..95a6cb62c 100644
--- a/TestBenchFramework/MainWnd.Designer.cs
+++ b/TestBenchFramework/MainWnd.Designer.cs
@@ -640,10 +640,7 @@ namespace TBF
 #if DN100
 		private ControlCom2VB.ControlCom2panel ctrlBrdComponent;
 		private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
-#elif MUNICH
-		private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
-		private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
-#elif FUZHOU150
+#elif MUNICH || FUZHOU150
 		private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
 		private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
 #elif FUZHOU300