diff --git a/.gitignore b/.gitignore index ebd4c5d..d44c826 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,3 @@ deps/tools/setuidgids *.sw? *.debug stage2/01-sys-tweaks/extfiles -deps/examples/cpp-multiCameraServer/main.cpp -deps/examples/java-multiCameraServer/src diff --git a/deps/04-copy.sh b/deps/04-copy.sh index 6e76401..dec4d2a 100755 --- a/deps/04-copy.sh +++ b/deps/04-copy.sh @@ -7,9 +7,6 @@ mkdir -p ${DEST} # # examples # -mkdir -p examples/java-multiCameraServer/src/main/java -cp allwpilib/cameraserver/multiCameraServer/src/main/java/Main.java examples/java-multiCameraServer/src/main/java/ -cp allwpilib/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp examples/cpp-multiCameraServer/ sh -c 'cd examples && zip -r - java-multiCameraServer' > ${DEST}/java-multiCameraServer.zip sh -c 'cd examples && zip -r - cpp-multiCameraServer' > ${DEST}/cpp-multiCameraServer.zip diff --git a/deps/examples/cpp-multiCameraServer/main.cpp b/deps/examples/cpp-multiCameraServer/main.cpp new file mode 100644 index 0000000..3bc73f8 --- /dev/null +++ b/deps/examples/cpp-multiCameraServer/main.cpp @@ -0,0 +1,224 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "cameraserver/CameraServer.h" + +/* + JSON format: + { + "team": , + "ntmode": <"client" or "server", "client" if unspecified> + "cameras": [ + { + "name": + "path": + "pixel format": <"MJPEG", "YUYV", etc> // optional + "width":