From aa45f9ece2686ff21c1a07d420d5128babdd45f9 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 13 Sep 2019 02:45:11 +0300
Subject: [PATCH] added jni libs to pom and stated work on camera info

---
 .gitignore                                    |   2 ++
 Main/pom.xml                                  |  28 ++++++++++++++++--
 .../main/java/Classes/SettingsManager.java    |   6 ++--
 Main/target/classes/Main.class                | Bin 407 -> 0 bytes
 4 files changed, 30 insertions(+), 6 deletions(-)
 delete mode 100644 Main/target/classes/Main.class

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 @@
             <version>1.7.26</version>
         </dependency>
         <dependency>
-            <!--frc cscore libs-->
+            <!--frc cscore java libs-->
             <groupId>edu.wpi.first.cscore</groupId>
             <artifactId>cscore-java</artifactId>
             <version>RELEASE</version>
         </dependency>
         <dependency>
-            <!--frc network table core libs-->
+            <!--frc cscore interface libs-->
+            <groupId>edu.wpi.first.cscore</groupId>
+            <artifactId>cscore-jni</artifactId>
+            <version>RELEASE</version>
+            <classifier>all</classifier>
+        </dependency>
+        <dependency>
+            <!--frc camera server libs-->
+            <groupId>edu.wpi.first.cameraserver</groupId>
+            <artifactId>cameraserver-java</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <!--frc network table java libs-->
             <groupId>edu.wpi.first.ntcore</groupId>
             <artifactId>ntcore-java</artifactId>
             <version>RELEASE</version>
         </dependency>
         <dependency>
-            <!--frc network table client libs-->
+            <!--frc network tables interface libs-->
+            <groupId>edu.wpi.first.ntcore</groupId>
+            <artifactId>ntcore-jni</artifactId>
+            <version>RELEASE</version>
+            <classifier>all</classifier>
+        </dependency>
+        <dependency>
+            <!--frc java libs-->
             <groupId>edu.wpi.first.wpiutil</groupId>
             <artifactId>wpiutil-java</artifactId>
             <version>RELEASE</version>
@@ -71,11 +91,13 @@
             <version>RELEASE</version>
         </dependency>
         <dependency>
+            <!--apache common classes libs-->
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
             <version>RELEASE</version>
         </dependency>
         <dependency>
+            <!--google json save and load library-->
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>RELEASE</version>
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 07a95badbe98c465b880d4a9f52d69326ec9c7cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 407
zcmZvXK~KU!5QX1Dp|(~LP}HNIiU)c!F~N8-F`868)YOBgEo|zNQj(?czdT7i_yhb=
z#<ys~#U9?|&Aj<$`}O_t3E%?9J{)v>bg}Q^z(r4>d8tcXT?y2~ek$Nx&&Eoi73)$x
zET)+<Pckdm>BO^<EK+H-^?yyLdew6>;(MvfA-AWj0=@7hp2($)3R&h+QW;(5!!=!+
zocZoQV*x*zEzC&WXnW4H#DRqbXrSrhFhGDKp0ERfy$$~{o2XGm>a8rtg);N#S!Ge8
z%u*TV!@GWp6V&<V_NzfyAl0RdSOsh2>>c85J>H_)v5k7v;5Pst+jJiN4m)=FoYm&s
d_UUSc+GgG7DtNESOB;lXU9{Ne<Eb^Ye*jAjNO1rF