diff --git a/Config/Config.csproj b/Config/Config.csproj index f9c958efe..72333a93e 100644 --- a/Config/Config.csproj +++ b/Config/Config.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK prompt 4 false @@ -30,7 +30,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK prompt 4 false diff --git a/Results/Results.csproj b/Results/Results.csproj index 3f7fb3453..9c68b509c 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK prompt 4 x86 @@ -29,7 +29,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK prompt 4 false diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index c5ef557e6..50d7f9cc8 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -21,7 +21,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK prompt 4 false @@ -32,7 +32,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK prompt 4 false diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index c60f61219..9472b0134 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -39,7 +39,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS prompt 4 true @@ -50,7 +50,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH;CAMERA + TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS prompt 4 x86 @@ -60,7 +60,7 @@ true bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS full x86 prompt @@ -70,7 +70,7 @@ bin\x86\Release\ - TRACE;MUNICH;CAMERA + TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS true pdbonly x86 @@ -101,8 +101,9 @@ false - - ..\packages\ControlBoard\Munich\ControlComponent3Munich.dll + + False + ..\packages\ControlBoard\iPerlST-new\ControlComponent3U.dll ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll @@ -3392,6 +3393,24 @@ + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index 1454a861d..7f372e827 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.ProcessTabPageCtrl48(); this.insertTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl(); diff --git a/TBF/libRfid1.dll b/TBF/libRfid1.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid1.dll differ diff --git a/TBF/libRfid2.dll b/TBF/libRfid2.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid2.dll differ diff --git a/TBF/libRfid3.dll b/TBF/libRfid3.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid3.dll differ diff --git a/TBF/libRfid4.dll b/TBF/libRfid4.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid4.dll differ diff --git a/TBF/libgcc_s_dw2-1.dll b/TBF/libgcc_s_dw2-1.dll new file mode 100644 index 000000000..90bd246fc Binary files /dev/null and b/TBF/libgcc_s_dw2-1.dll differ diff --git a/TBF/libstdc++-6.dll b/TBF/libstdc++-6.dll new file mode 100644 index 000000000..cb1b0ae46 Binary files /dev/null and b/TBF/libstdc++-6.dll differ diff --git a/Users/Users.csproj b/Users/Users.csproj index 1953542e4..ae82bed8d 100644 --- a/Users/Users.csproj +++ b/Users/Users.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;TURA_IPERL_NEW;LANG_SK prompt 4 false @@ -28,7 +28,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;TURA_IPERL_NEW;LANG_SK prompt 4 false