From 622ae29dfff90dbed73242526d20a7168107567f Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 9 Nov 2018 01:13:39 -0800 Subject: [PATCH] CameraServer: Change opencv sources to publish "cv:" type (#1412) The LabVIEW dashboard has been fixed to understand this prefix. --- .../main/java/edu/wpi/first/cameraserver/CameraServer.java | 4 +--- .../src/main/native/cpp/cameraserver/CameraServer.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java index 8930134979..62dd71a1a5 100644 --- a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java +++ b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java @@ -85,9 +85,7 @@ public final class CameraServer { } } case kCv: - // FIXME: Should be "cv:", but LabVIEW dashboard requires "usb:". - // https://github.com/wpilibsuite/allwpilib/issues/407 - return "usb:"; + return "cv:"; default: return "unknown:"; } diff --git a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp index dca14b9d4a..7a0847c2f6 100644 --- a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp +++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp @@ -72,9 +72,7 @@ static wpi::StringRef MakeSourceValue(CS_Source source, break; } case cs::VideoSource::kCv: - // FIXME: Should be "cv:", but LabVIEW dashboard requires "usb:". - // https://github.com/wpilibsuite/allwpilib/issues/407 - return "usb:"; + return "cv:"; default: return "unknown:"; }