diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index 3c70f6602..f81db7b7e 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -219,9 +219,12 @@ namespace TBF.BenchControl.Elde #if DN100 ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, filterConstant, fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs); +#elif MUNICH + ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, + filterConstant, fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs); #else - ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)refPulses, (uint)testMethods, - filterConstant, FMFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); + ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, + filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); #endif } diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 36c42af1b..a1ec6e9d8 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -45,7 +45,7 @@ this.procedureComboBox = new System.Windows.Forms.ComboBox(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.homeTabPage = new System.Windows.Forms.TabPage(); - this.ctrlBrdComponent = new ControlCom2VB.ControlCom2panel(); + this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1(); this.processTabPage = new System.Windows.Forms.TabPage(); this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl(); this.measurementTabPage = new System.Windows.Forms.TabPage(); diff --git a/TestBenchFramework/MainWnd.resx b/TestBenchFramework/MainWnd.resx index 8dc8dfac2..095f6cc7b 100644 --- a/TestBenchFramework/MainWnd.resx +++ b/TestBenchFramework/MainWnd.resx @@ -331,7 +331,7 @@ ctrlBrdComponent - ControlCom2VB.ControlCom2panel, ControlCom2VB, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null homeTabPage diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index 5225b6a28..781278d59 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -38,7 +38,7 @@ full false bin\Debug\ - TRACE;DEBUG;DN100 + TRACE;DEBUG;MUNICH prompt 4 @@ -46,7 +46,7 @@ pdbonly true bin\Release\ - TRACE;DN100 + TRACE;MUNICH prompt 4 AnyCPU @@ -73,8 +73,8 @@ TBF.Program - - ..\packages\ControlBoard\ControlCom2VB.dll + + ..\packages\ControlBoard\ControlComponent3Munich.dll ..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll