diff --git a/TBF/CameraBinaryFiles2/DiscoveryDaemon b/TBF/CameraBinaryFiles2/DiscoveryDaemon new file mode 100644 index 000000000..f76365945 Binary files /dev/null and b/TBF/CameraBinaryFiles2/DiscoveryDaemon differ diff --git a/TBF/CameraBinaryFiles2/GrabImage b/TBF/CameraBinaryFiles2/GrabImage new file mode 100644 index 000000000..4298d9b4a Binary files /dev/null and b/TBF/CameraBinaryFiles2/GrabImage differ diff --git a/TBF/CameraBinaryFiles2/Measurement b/TBF/CameraBinaryFiles2/Measurement new file mode 100644 index 000000000..6ab0505a6 Binary files /dev/null and b/TBF/CameraBinaryFiles2/Measurement differ diff --git a/TBF/CameraBinaryFiles2/RoiDetection b/TBF/CameraBinaryFiles2/RoiDetection new file mode 100644 index 000000000..e330e4262 Binary files /dev/null and b/TBF/CameraBinaryFiles2/RoiDetection differ diff --git a/TBF/CameraBinaryFiles2/hrlivestream.sh b/TBF/CameraBinaryFiles2/hrlivestream.sh new file mode 100644 index 000000000..49ef3e3b6 --- /dev/null +++ b/TBF/CameraBinaryFiles2/hrlivestream.sh @@ -0,0 +1 @@ +/opt/vc/bin/raspivid -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264 diff --git a/TBF/CameraBinaryFiles2/livestream.sh b/TBF/CameraBinaryFiles2/livestream.sh new file mode 100644 index 000000000..0d330c379 --- /dev/null +++ b/TBF/CameraBinaryFiles2/livestream.sh @@ -0,0 +1 @@ +/opt/vc/bin/raspivid -w 640 -h 480 -fps 30 -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264 diff --git a/TBF/CameraBinaryFiles2/mjpegrtpstream.sh b/TBF/CameraBinaryFiles2/mjpegrtpstream.sh new file mode 100644 index 000000000..d3faaeca1 --- /dev/null +++ b/TBF/CameraBinaryFiles2/mjpegrtpstream.sh @@ -0,0 +1,2 @@ +/opt/vc/bin/raspivid -t 0 -cd MJPEG -w 1280 -h 960 -fps 30 -b 8000000 -o - | gst-launch-1.0 fdsrc ! "image/jpeg,framerate=40/1" ! jpegparse ! rtpjpegpay ! udpsink host=192.168.0.200 port=20000 + diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 562d847a3..b2530a674 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.5.1993.0")] -[assembly: AssemblyFileVersion("3.5.1993.0")] +[assembly: AssemblyVersion("3.5.1997.0")] +[assembly: AssemblyFileVersion("3.5.1997.0")] diff --git a/TBF/Rig/Network/Camera/CLP1611/Camera.cs b/TBF/Rig/Network/Camera/CLP1611/Camera.cs index f4bb4e27d..1d54aa449 100644 --- a/TBF/Rig/Network/Camera/CLP1611/Camera.cs +++ b/TBF/Rig/Network/Camera/CLP1611/Camera.cs @@ -156,8 +156,6 @@ namespace TBF.Rig.Network.Camera.CLP1611 NetAdapter = TbfComponents.FindComponent(cfg.ParentName, components) as GenericDevices.INetworkAdapter; if (NetAdapter == null) throw new ArgumentNullException("no network adapter"); - - log.Warn(this.ToString()); } @@ -222,12 +220,12 @@ namespace TBF.Rig.Network.Camera.CLP1611 Telnet.Enqueue(new Telnet.Command(Network.Telnet.CmdAction.CLEAR_RESPONSE)); Telnet.Enqueue(new Telnet.Command(Network.Telnet.CmdAction.SEND_COMMAND, "sha1sum clp/*")); - log.FatalFormat("'{0}' with address {1} detected, IP = {2}, SD = {3}", Name, CameraCfg.HardwareAddress, ipAddress, sdCardVer); + log.FatalFormat("'{0}' detected: Id={1} addr={2} IP={3} SD={4}", Name, CameraIdx, CameraCfg.HardwareAddress, ipAddress, sdCardVer); } else { UiBridge.Bridge.OnCameraInfo(this.cameraIdx, string.Format("{0} s/n {1} was not detected", Name, CameraCfg.HardwareAddress)); - log.FatalFormat("'{0}' with address {1} not detected", Name, CameraCfg.HardwareAddress); + log.FatalFormat("'{0}' NOT detected: Id={1} addr={2}", Name, CameraIdx, CameraCfg.HardwareAddress); } } diff --git a/TBF/Rig/TestMethods/GrabImage/Component.cs b/TBF/Rig/TestMethods/GrabImage/Component.cs index f586387f5..3671eacee 100644 --- a/TBF/Rig/TestMethods/GrabImage/Component.cs +++ b/TBF/Rig/TestMethods/GrabImage/Component.cs @@ -17,6 +17,10 @@ namespace TBF.Rig.TestMethods.GrabImage public bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return false; } + public bool CheckDeviceCaps(Test test, OutputPath devices, out string message) + { + return GrabImageSeq.CheckDeviceCaps(test, devices, out message); + } readonly GrabImageCfg cfg; @@ -51,13 +55,6 @@ namespace TBF.Rig.TestMethods.GrabImage #endregion Configuration Change Handling - - public bool CheckDeviceCaps(Test test, OutputPath devices, out string message) - { - message = string.Format("{0}: CheckDeviceCaps() is not implemented yet", Name); - return false; - } - public Component() { } /// public Component(Generic.IComponentCfg cfg) diff --git a/TBF/Rig/TestMethods/GrabImage/GrabImageSeq.cs b/TBF/Rig/TestMethods/GrabImage/GrabImageSeq.cs index faa399139..f892b3183 100644 --- a/TBF/Rig/TestMethods/GrabImage/GrabImageSeq.cs +++ b/TBF/Rig/TestMethods/GrabImage/GrabImageSeq.cs @@ -14,6 +14,16 @@ namespace TBF.Rig.TestMethods.GrabImage { private static readonly ILog log = LogManager.GetLogger(typeof(GrabImageSeq)); + /// + /// Check capabilities of devces in the output path required for this test method + /// + /// Devices + /// true when capabilities of devices are OK + public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message) + { + message = string.Empty; + return true; + } public IList Execute( Test test, GrabImageCfg cfg) { diff --git a/TBF/Rig/TestMethods/LiveStream/Component.cs b/TBF/Rig/TestMethods/LiveStream/Component.cs index 5ba4b8453..03b8c1cc9 100644 --- a/TBF/Rig/TestMethods/LiveStream/Component.cs +++ b/TBF/Rig/TestMethods/LiveStream/Component.cs @@ -17,15 +17,13 @@ namespace TBF.Rig.TestMethods.LiveStream public bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return false; } - - readonly LiveStreamCfg myCfg; - public bool CheckDeviceCaps(Test test, OutputPath devices, out string message) { - message = string.Format("{0}: CheckDeviceCaps() is not implemented yet", Name); - return false; + return LiveStreamSeq.CheckDeviceCaps(test, devices, out message); } + readonly LiveStreamCfg myCfg; + public Component() { } /// public Component(Generic.IComponentCfg cfg) diff --git a/TBF/Rig/TestMethods/LiveStream/LiveStreamSeq.cs b/TBF/Rig/TestMethods/LiveStream/LiveStreamSeq.cs index ca9f1c43a..e0c62332b 100644 --- a/TBF/Rig/TestMethods/LiveStream/LiveStreamSeq.cs +++ b/TBF/Rig/TestMethods/LiveStream/LiveStreamSeq.cs @@ -13,6 +13,16 @@ namespace TBF.Rig.TestMethods.LiveStream { private static readonly ILog log = LogManager.GetLogger(typeof(LiveStreamSeq)); + /// + /// Check capabilities of devces in the output path required for this test method + /// + /// Devices + /// true when capabilities of devices are OK + public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message) + { + message = string.Empty; + return true; + } public IList Execute(Test test, LiveStreamCfg cfg) { diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 8b68e742b..e655f3b1e 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -3334,6 +3334,27 @@ Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Designer @@ -3481,9 +3502,7 @@ Results - - - +