diff --git a/.gitignore b/.gitignore index b40a187ee..c85194bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,5 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser + +Main/Settings/ diff --git a/Main/pom.xml b/Main/pom.xml index a09154d4b..7b84fffb5 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -47,19 +47,39 @@ 1.7.26 - + edu.wpi.first.cscore cscore-java RELEASE - + + edu.wpi.first.cscore + cscore-jni + RELEASE + all + + + + edu.wpi.first.cameraserver + cameraserver-java + RELEASE + + + edu.wpi.first.ntcore ntcore-java RELEASE - + + edu.wpi.first.ntcore + ntcore-jni + RELEASE + all + + + edu.wpi.first.wpiutil wpiutil-java RELEASE @@ -71,11 +91,13 @@ RELEASE + org.apache.commons commons-math3 RELEASE + com.google.code.gson gson RELEASE diff --git a/Main/src/main/java/Classes/SettingsManager.java b/Main/src/main/java/Classes/SettingsManager.java index 0281b6cbd..9f6af0959 100644 --- a/Main/src/main/java/Classes/SettingsManager.java +++ b/Main/src/main/java/Classes/SettingsManager.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import edu.wpi.cscore.*; +import edu.wpi.first.cameraserver.CameraServer; public class SettingsManager { private static SettingsManager instance; @@ -52,10 +53,9 @@ public class SettingsManager { } private void InitiateCamerasInfo(){ - UsbCameraInfo[] TrueCameras = new UsbCameraInfo[]; +// UsbCameraInfo[] TrueCameras = new UsbCameraInfo[]; UsbCameraInfo[] UsbDevices = UsbCamera.enumerateUsbCameras(); - - System.out.println(""); + } private void InitiateUsbCameras(){ diff --git a/Main/target/classes/Main.class b/Main/target/classes/Main.class deleted file mode 100644 index 07a95badb..000000000 Binary files a/Main/target/classes/Main.class and /dev/null differ