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

Add usage reporting to CameraServer (#682)

Browse Source
This commit is contained in:
sciencewhiz
2017-10-27 00:45:54 -07:00
committed by Peter Johnson
parent b65447b6f5
commit 12e96c6f13
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wpilibj/src/main/java/edu/wpi/first/wpilibj/CameraServer.java
View File

@@ -21,6 +21,8 @@ import edu.wpi.cscore.VideoMode.PixelFormat;
import edu.wpi.cscore.VideoProperty;
import edu.wpi.cscore.VideoSink;
import edu.wpi.cscore.VideoSource;
import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
import edu.wpi.first.wpilibj.hal.HAL;
import edu.wpi.first.networktables.EntryListenerFlags;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableEntry;
@@ -477,7 +479,9 @@ public class CameraServer {
* (e.g. 1, 2, etc).
*/
public UsbCamera startAutomaticCapture() {
return startAutomaticCapture(m_defaultUsbDevice.getAndIncrement());
UsbCamera camera = startAutomaticCapture(m_defaultUsbDevice.getAndIncrement());
HAL.report(tResourceType.kResourceType_PCVideoServer, camera.getHandle());
return camera;
}
/**
@@ -491,6 +495,7 @@ public class CameraServer {
public UsbCamera startAutomaticCapture(int dev) {
UsbCamera camera = new UsbCamera("USB Camera " + dev, dev);
startAutomaticCapture(camera);
HAL.report(tResourceType.kResourceType_PCVideoServer, camera.getHandle());
return camera;
}
@@ -503,6 +508,7 @@ public class CameraServer {
public UsbCamera startAutomaticCapture(String name, int dev) {
UsbCamera camera = new UsbCamera(name, dev);
startAutomaticCapture(camera);
HAL.report(tResourceType.kResourceType_PCVideoServer, camera.getHandle());
return camera;
}
@@ -515,6 +521,7 @@ public class CameraServer {
public UsbCamera startAutomaticCapture(String name, String path) {
UsbCamera camera = new UsbCamera(name, path);
startAutomaticCapture(camera);
HAL.report(tResourceType.kResourceType_PCVideoServer, camera.getHandle());
return camera;
}
@@ -564,6 +571,7 @@ public class CameraServer {
AxisCamera camera = new AxisCamera(name, host);
// Create a passthrough MJPEG server for USB access
startAutomaticCapture(camera);
HAL.report(tResourceType.kResourceType_AxisCamera, camera.getHandle());
return camera;
}
@@ -577,6 +585,7 @@ public class CameraServer {
AxisCamera camera = new AxisCamera(name, hosts);
// Create a passthrough MJPEG server for USB access
startAutomaticCapture(camera);
HAL.report(tResourceType.kResourceType_AxisCamera, camera.getHandle());
return camera;
}