From 7ac61fd6922ee2a49dccd994757003dfd125b8cd Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sun, 17 Mar 2019 12:30:40 +0100 Subject: [PATCH] Reconfigured fro SLM-50 --- Config/Config.csproj | 4 ++-- Results/Results.csproj | 4 ++-- ResultsBrowser/ResultsBrowser.csproj | 4 ++-- TBF/TBF.csproj | 13 +++++++------ TBF/UI/MainWnd.Designer.cs | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Config/Config.csproj b/Config/Config.csproj index 1da0f9935..3b3f60c70 100644 --- a/Config/Config.csproj +++ b/Config/Config.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK prompt 4 false @@ -30,7 +30,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;SLM_50;HEAT_METERS;LANG_SK prompt 4 false diff --git a/Results/Results.csproj b/Results/Results.csproj index 528176af2..4c64ea8fa 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK prompt 4 x86 @@ -29,7 +29,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;SLM_50;HEAT_METERS;LANG_SK prompt 4 false diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index 9b41bde6d..4b0d4c60b 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -21,7 +21,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK prompt 4 false @@ -32,7 +32,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;SLM_50;HEAT_METERS;LANG_SK prompt 4 false diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 95888e5b8..afc72cce7 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -39,7 +39,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS prompt 4 true @@ -50,7 +50,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH;CAMERA + TRACE;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS prompt 4 x86 @@ -60,7 +60,7 @@ true bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS full x86 prompt @@ -70,7 +70,7 @@ bin\x86\Release\ - TRACE;MUNICH;CAMERA + TRACE;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS true pdbonly x86 @@ -101,8 +101,9 @@ false - - ..\packages\ControlBoard\Munich\ControlComponent3Munich.dll + + False + ..\packages\ControlBoard\SLM-PT50\ControlComponent3U.dll ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index cb12a9a7c..168029b3c 100644 --- a/TBF/UI/MainWnd.Designer.cs +++ b/TBF/UI/MainWnd.Designer.cs @@ -54,9 +54,9 @@ namespace TBF.UI this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.homeTabPage = new System.Windows.Forms.TabPage(); - this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1(); + this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1(); this.processTabPage = new System.Windows.Forms.TabPage(); - this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl6(); + this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageExCtrl(); this.insertTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl();