diff --git a/Config/Config.csproj b/Config/Config.csproj index afa47fddb..a3c74edb4 100644 --- a/Config/Config.csproj +++ b/Config/Config.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 false @@ -28,7 +28,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 diff --git a/Results/Results.csproj b/Results/Results.csproj index e76f173ff..17e9991aa 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 x86 @@ -27,7 +27,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index 519c95367..daa96f23a 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -21,7 +21,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 false @@ -31,7 +31,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 diff --git a/TBF/MainWnd.Designer.cs b/TBF/MainWnd.Designer.cs index 5123cf3b1..25a7c2ed7 100644 --- a/TBF/MainWnd.Designer.cs +++ b/TBF/MainWnd.Designer.cs @@ -54,9 +54,9 @@ namespace TBF 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.Screens.ProcessTabPageCtrl6(); + this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl48(); this.insertTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPageCtrl = new TBF.Screens.ResultsTabPageCtrl(); diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index b92bb595e..b5817c537 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;IPERL;ORACLE_DB;LANG_SK prompt 4 true @@ -49,7 +49,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH;CAMERA + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 x86 @@ -58,7 +58,7 @@ true bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK full x86 prompt @@ -67,7 +67,7 @@ bin\x86\Release\ - TRACE;MUNICH;CAMERA + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK true pdbonly x86 @@ -97,8 +97,8 @@ false - - ..\packages\ControlBoard\Munich\ControlComponent3Munich.dll + + ..\packages\ControlBoard\iPerlST\ControlComponent3U.dll ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll @@ -3342,6 +3342,24 @@ + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always 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 0d6c1687b..187a4efa6 100644 --- a/Users/Users.csproj +++ b/Users/Users.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + DEBUG;TRACE;TURA_IPERL;LANG_SK prompt 4 @@ -26,7 +26,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;TURA_IPERL;LANG_SK prompt 4