Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'networkmanager' into dev

Browse Source 
# Conflicts:
#	Main/src/main/java/com/chameleonvision/util/MathHandler.java
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
This commit is contained in:
Banks Troutman
2019-10-07 14:08:01 -04:00
parent 285125cc22 53585be088
commit 61b09f2bf3
24 changed files with 746 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
View File

@@ -1,9 +1,7 @@
package com.chameleonvision.vision.camera;
import com.chameleonvision.CameraException;
import com.chameleonvision.FileHelper;
import com.chameleonvision.util.FileHelper;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.GeneralSettings;
import com.chameleonvision.vision.Pipeline;
import com.chameleonvision.vision.process.VisionProcess;
import com.google.gson.Gson;
@@ -15,7 +13,6 @@ import org.opencv.videoio.VideoCapture;
import java.io.*;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;