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

Camera binary files are only synchronized for SD v.1.x, ver. 2.26.1528

Browse Source
This commit is contained in:
Milan Hanajik
2020-10-16 14:07:57 +02:00
parent b145c71ee3
commit 91392f9452
2 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
+6 -2
View File
@@ -183,7 +183,7 @@ 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";
ClpUserName = (sdCardVer.Length > 0 && sdCardVer[0] == '1') ? "tbf" : "pi";
rtpUdpLocalPort = UdpPortBase + 4 * cameraIdx;
rtcpUdpLocalPort = UdpPortBase + 4 * cameraIdx + 1;
@@ -437,6 +437,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
{
scpClient.Connect();
if (sdCardVer.Length > 0 && sdCardVer[0] == '1')
{
///
/// Synchronize files in camera /home/tbf/clp directory with the files in "TBF/CameraBinaryFiles" project folder
///
@@ -448,7 +450,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
SHA1 sha1calculator = SHA1.Create();
StringBuilder sha1str = new StringBuilder();
foreach (FileInfo fi in dirInfo.GetFiles())
FileInfo[] fileInfos = dirInfo.GetFiles();
foreach (FileInfo fi in fileInfos)
{
lock (fileUploadLock)
{
@@ -483,6 +486,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
}
}
}
}
scpConnected = scpClient.IsConnected;
running = true;
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.26.1527.0")]
[assembly: AssemblyFileVersion("2.26.1527.0")]
[assembly: AssemblyVersion("2.26.1528.0")]
[assembly: AssemblyFileVersion("2.26.1528.0")]