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

1. Login to camera v.2.x with user 'pi', 2. DeviceTest shutdown fix, ver. 2.26.1525

Browse Source
This commit is contained in:
Milan Hanajik 2020-10-08 12:55:38 +02:00
parent abf54f765f
commit 0fc7d831b0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DeviceTest/DeviceTestDlg.cs
View File

@ -645,7 +645,8 @@ namespace DeviceTest
MessageBoxIcon.Exclamation);
foreach (var dev in tbfDevices) dev.StopDevice();
tbfDevices.Clear();
foreach (var dev in tbfDevices) dev.StopDevice2();
tbfDevices.Clear();
startButton.Enabled = true;
stopButton.Enabled = false;
@ -856,7 +857,8 @@ namespace DeviceTest
}
foreach (var d in tbfDevices) d.StopDevice();
}
foreach (var d in tbfDevices) d.StopDevice2();
}
private void stopButton_Click(object sender, EventArgs e)
{

5
TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
View File

@ -38,10 +38,9 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
}
const string ClpUserName = "tbf";
string ClpUserName = string.Empty; /// Either "tbf" or "pi" after a successful detection
const string ClpPassword = "C1ern4V0d4";
private static Object fileUploadLock = new Object();
@ -184,6 +183,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
{
UiBridge.Bridge.OnCameraInfo(this.cameraIdx, string.Format("{0} ver.{1} {2} s/n {3}", Name, sdCardVer, ipAddress, CameraCfg.HardwareAddress));
ClpUserName = (sdCardVer[0] == '1') ? "tbf" : "pi";
rtpUdpLocalPort = UdpPortBase + 4 * cameraIdx;
rtcpUdpLocalPort = UdpPortBase + 4 * cameraIdx + 1;
msrmntUdpLocalPort = UdpPortBase + 4 * cameraIdx + 2;

4
TBF/Properties/AssemblyInfo.cs
View File

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