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

Continued rework of networking, added root check

Browse Source
This commit is contained in:
Banks Troutman
2019-10-06 17:26:17 -04:00
parent 7699766091
commit 3db2f30ea7
18 changed files with 607 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
View File

@@ -1,6 +1,6 @@
package com.chameleonvision.settings;
import com.chameleonvision.settings.network.NetworkManager;
import com.chameleonvision.network.NetworkManager;
import com.chameleonvision.util.FileHelper;
import com.chameleonvision.vision.camera.CameraManager;
import com.google.gson.Gson;
@@ -19,10 +19,10 @@ public class SettingsManager {
private SettingsManager() {}
public static void initialize(boolean manageNetwork) {
public static void initialize() {
initGeneralSettings();
if (manageNetwork) {
NetworkManager.init();
// if (manageNetwork) {
// NetworkSettings netSettings = new NetworkSettings();
// netSettings.hostname = GeneralSettings.hostname;
// netSettings.gateway = GeneralSettings.gateway;
@@ -30,7 +30,7 @@ public class SettingsManager {
// netSettings.connectionType = GeneralSettings.connection_type;
// netSettings.ip = GeneralSettings.ip;
// netSettings.run();
}
// }
var allCameras = CameraManager.getAllCamerasByName();
if (!allCameras.containsKey(GeneralSettings.curr_camera) && allCameras.size() > 0) {
var cam = allCameras.entrySet().stream().findFirst().get().getValue();