rudefox/burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ordering between CameraServer.getInstance and UsbCamera creation (#69)

Browse Source 
If the CameraServer instance is started after the UsbCamer is created, it
never gets the source created event to actually build the NetworkTable table.
This commit is contained in:
Peter Johnson 2019-01-13 21:23:44 -08:00 committed by GitHub
parent 64b9491e15
commit 08163c0681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/examples/cpp-multiCameraServer/main.cpp vendored
View File

@ -170,8 +170,8 @@ bool ReadConfig() {
cs::UsbCamera StartCamera(const CameraConfig& config) { cs::UsbCamera StartCamera(const CameraConfig& config) {
wpi::outs() << "Starting camera '" << config.name << "' on " << config.path wpi::outs() << "Starting camera '" << config.name << "' on " << config.path
<< '\n'; << '\n';
cs::UsbCamera camera{config.name, config.path};
auto inst = frc::CameraServer::GetInstance(); auto inst = frc::CameraServer::GetInstance();
cs::UsbCamera camera{config.name, config.path};
auto server = inst->StartAutomaticCapture(camera); auto server = inst->StartAutomaticCapture(camera);
camera.SetConfigJson(config.config); camera.SetConfigJson(config.config);

2
deps/examples/java-multiCameraServer/src/main/java/Main.java vendored
View File

@ -181,8 +181,8 @@ public final class Main {
*/ */
public static VideoSource startCamera(CameraConfig config) { public static VideoSource startCamera(CameraConfig config) {
System.out.println("Starting camera '" + config.name + "' on " + config.path); System.out.println("Starting camera '" + config.name + "' on " + config.path);
UsbCamera camera = new UsbCamera(config.name, config.path);
CameraServer inst = CameraServer.getInstance(); CameraServer inst = CameraServer.getInstance();
UsbCamera camera = new UsbCamera(config.name, config.path);
MjpegServer server = inst.startAutomaticCapture(camera); MjpegServer server = inst.startAutomaticCapture(camera);
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();

2
deps/examples/python-multiCameraServer/multiCameraServer.py vendored
View File

@ -134,8 +134,8 @@ def readConfig():
"""Start running the camera.""" """Start running the camera."""
def startCamera(config): def startCamera(config):
print("Starting camera '{}' on {}".format(config.name, config.path)) print("Starting camera '{}' on {}".format(config.name, config.path))
camera = UsbCamera(config.name, config.path)
inst = CameraServer.getInstance() inst = CameraServer.getInstance()
camera = UsbCamera(config.name, config.path)
server = inst.startAutomaticCapture(camera=camera, return_server=True) server = inst.startAutomaticCapture(camera=camera, return_server=True)
camera.setConfigJson(json.dumps(config.config)) camera.setConfigJson(json.dumps(config.config))

2
deps/tools/multiCameraServer.cpp vendored
View File

@ -171,8 +171,8 @@ bool ReadConfig() {
void StartCamera(const CameraConfig& config) { void StartCamera(const CameraConfig& config) {
wpi::outs() << "Starting camera '" << config.name << "' on " << config.path wpi::outs() << "Starting camera '" << config.name << "' on " << config.path
<< '\n'; << '\n';
cs::UsbCamera camera{config.name, config.path};
auto inst = frc::CameraServer::GetInstance(); auto inst = frc::CameraServer::GetInstance();
cs::UsbCamera camera{config.name, config.path};
auto server = inst->StartAutomaticCapture(camera); auto server = inst->StartAutomaticCapture(camera);
camera.SetConfigJson(config.config); camera.SetConfigJson(config.config);