Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cscore] Make camera connection logging clearer (#5866)

Browse Source
This commit is contained in:
Ryan Blue
2023-11-03 19:03:23 -04:00
committed by GitHub
parent 87f7c19f90
commit 049732afb8
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cscore/src/main/native/linux/UsbCameraImpl.cpp
View File

@@ -595,7 +595,7 @@ void UsbCameraImpl::DeviceConnect() {
}
if (m_connectVerbose) {
SINFO("Connecting to USB camera on {}", m_path);
SINFO("Attempting to connect to USB camera on {}", m_path);
}
// Try to open the device
@@ -606,6 +606,10 @@ void UsbCameraImpl::DeviceConnect() {
}
m_fd = fd;
if (m_connectVerbose) {
SINFO("Connected to USB camera on {}", m_path);
}
// Get capabilities
SDEBUG3("getting capabilities");
struct v4l2_capability vcap;

4
cscore/src/main/native/objcpp/UsbCameraImplObjc.mm
View File

@@ -554,7 +554,7 @@ static cs::VideoMode::PixelFormat FourCCToPixelFormat(FourCharCode fourcc) {
}
std::string pathStr = [self.path UTF8String];
OBJCINFO("Connecting to USB camera on {}", pathStr);
OBJCINFO("Attempting to connect to USB camera on {}", pathStr);
self.videoDevice = [AVCaptureDevice deviceWithUniqueID:self.path];
if (self.videoDevice == nil) {
@@ -594,6 +594,8 @@ static cs::VideoMode::PixelFormat FourCCToPixelFormat(FourCharCode fourcc) {
goto err;
}
OBJCINFO("Connected to USB camera on {}", pathStr);
[[NSNotificationCenter defaultCenter]
addObserver:self
selector:@selector(sessionRuntimeError:)

6
cscore/src/main/native/windows/UsbCameraImpl.cpp
View File

@@ -499,7 +499,7 @@ bool UsbCameraImpl::DeviceConnect() {
}
if (m_connectVerbose) {
SINFO("Connecting to USB camera on {}", m_path);
SINFO("Attempting to connect to USB camera on {}", m_path);
}
SDEBUG3("opening device");
@@ -526,6 +526,10 @@ bool UsbCameraImpl::DeviceConnect() {
return false;
}
if (m_connectVerbose) {
SINFO("Connected to USB camera on {}", m_path);
}
CS_Status st = 0;
auto devices = EnumerateUsbCameras(&st);

2
cscore/src/test/java/edu/wpi/first/cscore/UsbCameraTest.java
View File

@@ -32,7 +32,7 @@ class UsbCameraTest {
assertTimeoutPreemptively(
Duration.ofSeconds(5),
() -> assertTrue(result.get().contains("Connecting to USB camera on ")));
() -> assertTrue(result.get().contains("Attempting to connect to USB camera on ")));
}
}