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

Too many changes to list

Browse Source 
running in to bug in CameraStreamer with native exceptions
This commit is contained in:
Banks Troutman
2019-11-21 05:32:19 -05:00
parent 35509c0162
commit 48da9f5dfd
21 changed files with 678 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,9 @@
package com.chameleonvision;
import com.chameleonvision.classabstraction.VisionManager;
import com.chameleonvision.classabstraction.config.ConfigManager;
import com.chameleonvision.network.NetworkManager;
import com.chameleonvision.settings.GeneralSettings;
import com.chameleonvision.settings.Platform;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.util.Utilities;
@@ -134,34 +136,40 @@ public class Main {
}
if (testMode) {
ConfigManager.initializeSettings();
NetworkManager.initialize(manageNetwork);
NetworkTableInstance.getDefault().startServer();
boolean visionSourcesOk = VisionManager.initializeSources();
if (!visionSourcesOk) {
System.out.println("No cameras connected!");
return;
}
NetworkManager.initialize(manageNetwork);
boolean visionProcessesOk = VisionManager.initializeProcesses();
if (!visionProcessesOk) {
System.err.println("shit");
return;
}
runServer();
VisionManager.startProcesses();
// runServer(true);
} else {
if (CameraManager.initializeCameras()) {
SettingsManager.initialize();
NetworkManager.initialize(manageNetwork);
CameraManager.initializeThreads();
runServer();
runServer(false);
} else {
System.err.println("No cameras connected!");
}
}
}
private static void runServer() {
private static void runServer(boolean test) {
GeneralSettings settings = test ? ConfigManager.settings : SettingsManager.generalSettings;
if (ntServerMode) {
System.out.println("Starting NT Server");
NetworkTableInstance.getDefault().startServer();
@@ -170,7 +178,7 @@ public class Main {
if (ntClientModeServer != null) {
NetworkTableInstance.getDefault().startClient(ntClientModeServer);
} else {
NetworkTableInstance.getDefault().startClientTeam(SettingsManager.generalSettings.teamNumber);
NetworkTableInstance.getDefault().startClientTeam(settings.teamNumber);
}
}