michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Component updated and changed: DN100 --> MUNICH

Browse Source
This commit is contained in:
Milan Hanajik 2014-07-28 10:15:38 +02:00
parent efc6d22dad
commit aa3e19a76c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
View File

@ -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
}

2
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -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();

2
TestBenchFramework/MainWnd.resx
View File

@ -331,7 +331,7 @@
<value>ctrlBrdComponent</value>
</data>
<data name="&gt;&gt;ctrlBrdComponent.Type" xml:space="preserve">
<value>ControlCom2VB.ControlCom2panel, ControlCom2VB, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ctrlBrdComponent.Parent" xml:space="preserve">
<value>homeTabPage</value>

8
TestBenchFramework/TBF.csproj
View File

@ -38,7 +38,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;DN100</DefineConstants>
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@ -46,7 +46,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;DN100</DefineConstants>
<DefineConstants>TRACE;MUNICH</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
@ -73,8 +73,8 @@
<StartupObject>TBF.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="ControlCom2VB">
<HintPath>..\packages\ControlBoard\ControlCom2VB.dll</HintPath>
<Reference Include="ControlComponent3Munich">
<HintPath>..\packages\ControlBoard\ControlComponent3Munich.dll</HintPath>
</Reference>
<Reference Include="FluentNHibernate">
<HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath>