Reconfigured for HongKong PT50

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;HONGKONG_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;HONGKONG_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Config/Data.cs

@@ -44,7 +44,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif DEWA_300 || FUZHOU_100 || ROMA_200
+#elif DEWA_300 || FUZHOU_100 || ROMA_200 || LUXEMBURG_40
         public const int WMsCount = 10;
         public const int LineSize = 10;
         public const int CompoundWMsCount = 1;

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;HONGKONG_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;HONGKONG_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;HONGKONG_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;HONGKONG_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs

@@ -297,7 +297,8 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 					switch (mode)
 					{
 						case Tst.Start:
-							if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
+							if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
+                                (regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
 							{
 								startTextBoxes[i].Enabled = false;
 							}
@@ -309,8 +310,9 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 							break;
 
 						case Tst.End:
-							if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
-							{
+                            if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
+                                (regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
+                            {
 								startTextBoxes[i].Enabled = false;
 								endTextBoxes[i].Enabled = false;
 							}
@@ -324,8 +326,9 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 							break;
 
 						case Tst.Both:
-							if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
-							{
+                            if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
+                                (regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
+                            {
 								startTextBoxes[i].Enabled = false;
 								endTextBoxes[i].Enabled = false;
 							}
@@ -561,8 +564,29 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 					if (enabledTextBoxes[i] == currentFocusOwner)
 					{
 						/// Change focus to the next enabled text box
-						enabledTextBoxes[(i + 1) % enabledTextBoxes.Count].Focus();
-						return;
+                        var currentTextBox = enabledTextBoxes[(i + 1) % enabledTextBoxes.Count];
+						currentTextBox.Focus();
+                        
+                        /// Load the respective image
+                        for (int j = 0; j < startTextBoxes.Length; j++)
+                        {
+                            if (startTextBoxes[j] == currentTextBox)
+                            {
+                                LoadImage(Tst.Start, j);
+                                return;
+                            }
+                        }
+                        for (int j = 0; j < endTextBoxes.Length; j++)
+                        {
+                            if (endTextBoxes[j] == currentTextBox)
+                            {
+                                LoadImage(Tst.End, j);
+                                return;
+                            }
+                        }
+
+                        /// No image found
+                        return;
 					}
 				}
 			}

TBF/BenchControl/Elde/ControlBoardDev.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -110,7 +110,15 @@ namespace TBF.BenchControl.Elde
         public byte MeretProtocol = 0;
 
         // Array length is the reference flowmeters count plus one
-#if CEVAK_200 || DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SENTEC
+#if ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MUNICH || MURES_40 || PETERSBURG_50 || SLM_50 || TORINO_50 || TORUN_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || ZAMBIA || ZODINO
+        public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
+  #if IZRAEL_50
+		public byte[] MeretRS485Address = new byte[6];
+  #else
+        public byte[] MeretRS485Address = new byte[4];
+  #endif
+        public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
+#elif CEVAK_200 || DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SENTEC
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
@@ -129,14 +137,6 @@ namespace TBF.BenchControl.Elde
 														 {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[5];
         public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
-#elif ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MUNICH || MURES_40 || PETERSBURG_50 || SLM_50 || TORINO_50 || TORUN_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || ZAMBIA || ZODINO
-        public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
-  #if IZRAEL_50
-		public byte[] MeretRS485Address = new byte[6];
-  #else
-        public byte[] MeretRS485Address = new byte[4];
-  #endif
-        public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
 #elif IZRAEL_50 || SLM_END
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
         public byte[] MeretRS485Address = new byte[7];      /// Modbus addresses of Pr1, Pr2, Pr3, Pr4, Pr5, Pr6, T9 (Izrael) or Pr1, Pr2, Pr3, Pr4, T9, T10 (SLM END)

TBF/BenchControl/Elde/ControlComWrap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
+/// Copyright (c) 2013-2020 Sensus Metering Systems
 ///
 using System;
 using Dirichlet.Numerics;
@@ -25,7 +25,7 @@ namespace TBF.BenchControl.Elde
 #else
         /// All newer benches
         public double ReferenceFreq { get { return 1000.0 * ctrlBrdComponent.referenceFreq[0]; } }  /// Returns in [Hz] 0..2500, nom.=2000
-                                                                                                    /// 
+                                                                                          /// 
         /// <summary>
         /// In case of I11, I12
         ///     cBrd.referenceFreq[0] = I11 + I12
@@ -80,7 +80,7 @@ namespace TBF.BenchControl.Elde
         public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
 #endif
 
-#if ALZIR_25 || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_200 || DEWA_300 || FEWA_50 || FUZHOU_100 || FILIPINY_50 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || ZAMBIA || ZODINO
+#if ALZIR_25 || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_200 || DEWA_300 || FEWA_50 || FUZHOU_100 || FILIPINY_50 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || ZAMBIA || ZODINO
         public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
         public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
         {
@@ -140,7 +140,7 @@ namespace TBF.BenchControl.Elde
 		public uint[] WMeterCont { get { return new uint[3]; } }				/// Dummy
 #endif
 
-#if ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || ZAMBIA || ZODINO
+#if ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || ZAMBIA || ZODINO
 		public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } }
 #else
         public float ValveOpenCloseTime { get { return 0.001f; } }
@@ -167,34 +167,31 @@ namespace TBF.BenchControl.Elde
         }
 
 
-        ///
         /// Reference to the control board component
-        ///
-#if DN100
-        private ControlCom2VB.ControlCom2panel ctrlBrdComponent;
-#elif FUZHOU_150 || MUNICH
-		private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
-#elif FUZHOU_300
-        private ControlComponent3F300.UserControl1 ctrlBrdComponent;
-#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150
-        private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
-#else /// newer benches
-        private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
-#endif
-
+        ///   and
         /// <summary>
 		/// Constructor that initializes the control board component reference
 		/// </summary>
 		/// <param name="ctrlBrdComponent"></param>
 #if DN100
+        private ControlCom2VB.ControlCom2panel ctrlBrdComponent;
+        ///
 		public ControlComWrap(ControlCom2VB.ControlCom2panel ctrlBrdComponent)
 #elif FUZHOU_150 || MUNICH
-		public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
+        private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
+        /// 
+        public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
 #elif FUZHOU_300
+        private ControlComponent3F300.UserControl1 ctrlBrdComponent;
+        /// 
         public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent)
 #elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150
+        private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
+        /// 
         public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
 #else /// all newer benches
+        private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
+        /// 
         public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #endif
         {
@@ -263,7 +260,7 @@ namespace TBF.BenchControl.Elde
 
             ctrlBrdComponent.ExternalCom = true;
 
-#if ALZIR_25 || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || SENTEC
+#if ALZIR_25 || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || LUXEMBURG_40 || SENTEC
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, meretProtocol);
 #else
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange);
@@ -431,7 +428,7 @@ namespace TBF.BenchControl.Elde
                                          (uint)regConst,
                                          (uint)shortImp,
                                          (uint)sendCommandArgs.StopDevs);
-#elif ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || SENTEC || ZAMBIA || ZODINO
+#elif ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || LUXEMBURG_40 ||SENTEC || ZAMBIA || ZODINO
             ///
             /// 64-bit route, prolonged method support
             ///

TBF/BenchControl/Network/Camera/CLP1611/Camera.cs

@@ -437,7 +437,21 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
                 {
 				    scpClient.Connect();
 
-                    if (sdCardVer.Length > 0 && sdCardVer[0] == '1')
+                    DirectoryInfo dirInfo = null;
+                    if (sdCardVer.Length > 0)
+                    {
+                        switch (sdCardVer[0])
+                        {
+                            case '1':
+                                dirInfo = new DirectoryInfo(Path.Combine(System.Windows.Forms.Application.StartupPath, "CameraBinaryFiles"));
+                                break;
+                            case '2':
+                                dirInfo = new DirectoryInfo(Path.Combine(System.Windows.Forms.Application.StartupPath, "CameraBinaryFiles2"));
+                                break;
+                        }
+                    }
+
+                    if (dirInfo != null)
                     {
                         ///
                         /// Synchronize files in camera /home/tbf/clp directory with the files in "TBF/CameraBinaryFiles" project folder
@@ -446,7 +460,6 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
                         {
                             sshClient.Connect();
 
-                            DirectoryInfo dirInfo = new DirectoryInfo(Path.Combine(System.Windows.Forms.Application.StartupPath, "CameraBinaryFiles"));
                             SHA1 sha1calculator = SHA1.Create();
                             StringBuilder sha1str = new StringBuilder();
 
@@ -723,8 +736,10 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 		{
 			int wid = hiRes ? 1280 : 640;
 			int hgh = hiRes ? 960 : 480;
-			string command = string.Format("/opt/vc/bin/raspivid -t 0 -cd MJPEG -w {0} -h {1} -fps 30 -b 8000000 -o - | gst-launch-1.0 fdsrc ! \"image/jpeg,framerate=30/1\" ! jpegparse ! rtpjpegpay ! udpsink host={2} port={3}",
-										   wid, hgh, NetAdapter.IPAddress, rtpUdpLocalPort);
+            string command = string.Format("/opt/vc/bin/raspivid -t 0 -cd MJPEG -w {0} -h {1} -fps 30 -b 8000000 -o - | gst-launch-1.0 fdsrc ! \"image/jpeg,framerate=30/1\" ! jpegparse ! rtpjpegpay ! udpsink host={2} port={3}",
+                                           wid, hgh, NetAdapter.IPAddress, rtpUdpLocalPort);
+            //string command = string.Format("~/userland/build/bin/raspivid -t 0 -cd MJPEG -w {0} -h {1} -fps 30 -b 8000000 -o - | gst-launch-1.0 fdsrc ! \"image/jpeg,framerate=30/1\" ! jpegparse ! rtpjpegpay ! udpsink host={2} port={3}",
+            //                               wid, hgh, NetAdapter.IPAddress, rtpUdpLocalPort);
 
 			return new LiveStreamOp(this, Telnet, command);
 		}

TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs

@@ -1051,8 +1051,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
                                 meterRslt.VolumeStart  = 0;												    /// liter
 								meterRslt.VolumeEnd    = 0;												    /// liter
 								meterRslt.VolumeMeter  = meterRslt.PulsesMeter * regReader.LtrsPerPulse;	/// liter
-                                meterRslt.VolumeRef    = (meterRslt.PulsesMeter != 0) ? totalPulses * tstRslt.VolumeCTV / meterRslt.PulsesMeter
-                                                                                      : totalPulses * tstRslt.ConstMaster;	                /// liter
+                                meterRslt.VolumeRef    = totalPulses * tstRslt.ConstMaster;	                /// liter
 							}
 
                             meterRslt.Error = Formulas.ErrorFromVolumes(meterRslt.VolumeMeter, meterRslt.VolumeRef);

TBF/CameraBinaryFiles2/hrlivestream.sh

@@ -0,0 +1 @@
+/opt/vc/bin/raspivid -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264

TBF/CameraBinaryFiles2/livestream.sh

@@ -0,0 +1 @@
+/opt/vc/bin/raspivid -w 640 -h 480 -fps 30 -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264

TBF/CameraBinaryFiles2/mjpegrtpstream.sh

@@ -0,0 +1,2 @@
+/opt/vc/bin/raspivid -t 0 -cd MJPEG -w 1280 -h 960 -fps 30 -b 8000000 -o - | gst-launch-1.0 fdsrc ! "image/jpeg,framerate=40/1" ! jpegparse ! rtpjpegpay ! udpsink host=192.168.0.200 port=20000
+

TBF/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.26.1528.0")]
-[assembly: AssemblyFileVersion("2.26.1528.0")]
+[assembly: AssemblyVersion("2.26.1535.0")]
+[assembly: AssemblyFileVersion("2.26.1535.0")]

TBF/TBF.csproj

@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;HONGKONG_50;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -50,7 +50,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;HONGKONG_50;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -60,7 +60,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;HONGKONG_50;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;HONGKONG_50;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -101,8 +101,9 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
-      <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
+    <Reference Include="ControlComponent3U, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ControlBoard\HongKong-PT50\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
@@ -3459,6 +3460,27 @@
     <Content Include="CameraBinaryFiles\DiscoveryDaemon">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="CameraBinaryFiles2\DiscoveryDaemon">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="CameraBinaryFiles2\GrabImage">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="CameraBinaryFiles2\hrlivestream.sh">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="CameraBinaryFiles2\livestream.sh">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="CameraBinaryFiles2\Measurement">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="CameraBinaryFiles2\mjpegrtpstream.sh">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="CameraBinaryFiles2\RoiDetection">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config" />
     <None Include="Properties\app.manifest">
       <SubType>Designer</SubType>

TBF/UI/Bench/Paths/PathsDlg.cs

@@ -63,7 +63,15 @@ namespace TBF.UI.Bench.Paths
 			sharedButtons.DownClicked += downButton_Click;
 
 			/// Load the list of components from the database
-			TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config));
+            try
+            {
+                TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config));
+            }
+            catch
+            {
+                TbfComponents = new List<BenchControl.Generic.IComponent>();
+                MessageBox.Show("Error occured when loading components");
+            }
 
 			/// Find all master valves
 			Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents);

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.ProcessTabPageCtrl24();
             this.insertTabPage = new System.Windows.Forms.TabPage();
             this.resultsTabPage = new System.Windows.Forms.TabPage();
             this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl();
@@ -746,12 +746,12 @@ namespace TBF.UI
 #elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || DEWA_300 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MALTA_WSD25 || MURES_40 || PETERSBURG_50 || ROMA_200 || TORINO_50 || TORUN_50 || ZAMBIA || ZODINO
 		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 		private TBF.UI.Process.ProcessTabPageCtrl24 processTabPageCtrl;
-#elif SLM_50 || TURA_SPECIAL
-		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
-		private TBF.UI.Process.ProcessTabPageExCtrl processTabPageCtrl;
 #elif IZRAEL_50 || TURA_IPERL || TURA_IPERL_NEW
 		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 		private TBF.UI.Process.ProcessTabPageCtrl48 processTabPageCtrl;
+#elif LUXEMBURG_40 || SLM_50 || TURA_SPECIAL
+		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
+		private TBF.UI.Process.ProcessTabPageExCtrl processTabPageCtrl;
 #endif
 
         private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;