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

Bahrain: Component upgraded (4.12.2017), changes for diverter, faster program shutdown, camera bins changed, ver. 2.17.763

Browse Source
This commit is contained in:
Milan Hanajik 2017-12-08 11:04:46 +03:00
parent ace0bdb2a6
commit e762aca7fb
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ namespace TBF.BenchControl.Elde
public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
#endif
#if KEMPNO_50 || KRAKOW_50
#if KEMPNO_50 || KRAKOW_50 || BAHRAIN_50
public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
{

6
TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
View File

@ -234,9 +234,9 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
public void StopDevice2()
{
if (scpThread != null) scpThread.Join(500);
if (rtpListenerThread != null) rtpListenerThread.Join(200);
if (msrmntListenerThread != null) msrmntListenerThread.Join(200);
if (scpThread != null) scpThread.Join(50);
if (rtpListenerThread != null) rtpListenerThread.Join(50);
if (msrmntListenerThread != null) msrmntListenerThread.Join(50);
if (rtpUdpClient != null)
{

2
TestBenchFramework/CameraBinaryFiles/runmeonce
View File

@ -1,4 +1,4 @@
pkill DiscoveryDaemon
cp clp/DiscoveryDaemon /usr/bin
cp clp/rc.local /etc
shutdown -r now
reboot

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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

BIN
packages/ControlBoard/Bahrain50/ControlComponent3U.dll
View File

Binary file not shown.