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

Network.Camera.CLP1611 : IP address can be specified.

Browse Source
This commit is contained in:
Milan Hanajik
2017-03-06 13:21:10 +01:00
parent dc2b945230
commit 5b4a9c0129
4 changed files with 282 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
+12 -3
View File
@@ -138,8 +138,9 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
if (CameraCfg.DebugLevel == DebugMode.Simulate) return;
/// Detect a camera
bool cameraDetected = DetectCamera(CameraCfg.HardwareAddress, true,
out ipAddress, out hardware, out revision, out serial, out sdCardVer);
if (CameraCfg.UseIPAddress) ipAddress = IPAddress.Parse(CameraCfg.IPAddressStr);
bool cameraDetected = DetectCamera(CameraCfg.HardwareAddress, ref ipAddress, CameraCfg.UseIPAddress, true,
out hardware, out revision, out serial, out sdCardVer);
@@ -231,8 +232,16 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
/// <param name="serial">Detected serial number</param>
/// <param name="sdCardVer">Detected OS image</param>
/// <returns>true when camera detected successfully</returns>
bool DetectCamera(int hwAddress, bool setDateTime, out IPAddress ipAddress, out string hardware, out string revision, out string serial, out string sdCardVer)
bool DetectCamera(int hwAddress, ref IPAddress ipAddress, bool useIpAddress, bool setDateTime, out string hardware, out string revision, out string serial, out string sdCardVer)
{
if (useIpAddress)
{
hardware = "hw";
revision = "rev";
serial = "s/n";
sdCardVer = "img";
}
for (int trials = 1; trials <= 3; trials++)
{
UdpClient udpClient = new UdpClient();