Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-22 01:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into class-abstraction

Browse Source 
# Conflicts:
#	.gitignore
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraSerializer.java
#	Main/src/main/java/com/chameleonvision/vision/enums/StreamDivisor.java
#	Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#	Main/src/main/java/com/chameleonvision/web/Server.java
#	Main/src/main/java/com/chameleonvision/web/SocketHandler.java
This commit is contained in:
Banks Troutman
2019-11-27 17:40:24 -05:00
parent 663786e21b 182ba8abe3
commit a0dddc0289
15 changed files with 275 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main/src/main/java/com/chameleonvision/Main.java
View File

@@ -24,7 +24,7 @@ public class Main {
private static final String IGNORE_ROOT_KEY = "--ignore-root"; // no args for this setting
private static final String TEST_MODE_KEY = "--cv-development";
private static final int DEFAULT_PORT = 8888;
private static final int DEFAULT_PORT = 5800;
private static boolean ntServerMode = false;
private static boolean manageNetwork = true;