diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs index 1c6df0218..a8fc4eadd 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs @@ -511,7 +511,7 @@ 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.ToString(), rtpUdpLocalPort); + wid, hgh, NetAdapter.IPAddress, rtpUdpLocalPort); return new LiveStreamOp(this, Telnet, command); } diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs index 43d31de1d..52666526b 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs @@ -106,7 +106,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.CLEAR_RESPONSE)); telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_COMMAND, command)); grabImageCommandSent = true; - } + log.WarnFormat("{0} IP={1} command={2}", camera.Name, camera.IPAddress, command); + } return Event.CameraBusy; } else if (grabPassed) @@ -170,7 +171,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 if (grabImageCommandSent) { telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_COMMAND, Telnet.TelnetClient.CtrlCCommand)); - } + log.WarnFormat("{0} IP={1} command=CTRL-C", camera.Name, camera.IPAddress); + } } } } diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs index 85e9d0723..b155c3e49 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs @@ -1,12 +1,15 @@ using System; using System.Diagnostics; +using log4net; using TBF.BenchControl.Network.Telnet; namespace TBF.BenchControl.Network.Camera.CLP1611 { public class LiveStreamOp : IOperation { - readonly Camera camera; + private static readonly ILog log = LogManager.GetLogger(typeof(LiveStreamOp)); + + readonly Camera camera; readonly Telnet.TelnetClient telnet; readonly string command; @@ -37,6 +40,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 { telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_STRING, command)); liveStreamCommandSent = true; + log.WarnFormat("{0} IP={1} command={2}", camera.Name, camera.IPAddress, command); } } return Event.None; @@ -47,7 +51,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 if (liveStreamCommandSent) { telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_COMMAND, Telnet.TelnetClient.CtrlCCommand)); - } + log.WarnFormat("{0} IP={1} command=CTRL-C", camera.Name, camera.IPAddress); + } } } } diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs index 1ab7f1add..9e1b907d0 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs @@ -118,7 +118,8 @@ namespace TBF.BenchControl.Network.Camera.Roi telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.CLEAR_RESPONSE)); telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_COMMAND, command)); roiDetectionCommandSent = true; - } + log.WarnFormat("{0} IP={1} command={2}", camera.Name, camera.IPAddress, command); + } return Event.CameraBusy; } else if (passed) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 3f692c930..b87e77d18 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -598,6 +598,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Read the diverter switch time switchTimeStart = (int)cBrd.DivTime; + log.WarnFormat("Diverter switch time on test start = {0} ms", switchTimeStart); /// Measurement loop - begin State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name)) @@ -724,6 +725,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Read the diverter switch time switchTimeEnd = (int)cBrd.DivTime; + log.WarnFormat("Diverter switch time on test end = {0} ms", switchTimeEnd); State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name)) .AddOperation(checkUiOp) diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 1ce0d3640..3917c8dfc 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.16.669.1")] -[assembly: AssemblyFileVersion("2.16.669.1")] +[assembly: AssemblyVersion("2.16.670.1")] +[assembly: AssemblyFileVersion("2.16.670.1")]