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 remote-tracking branch 'origin/Java' into Java

Browse Source
This commit is contained in:
ori agranat
2019-09-21 18:52:36 +03:00
parent d97f3c1e1a 8a451f74ab
commit 305bd65e43
5 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,15 @@ public class SettingsManager {
private SettingsManager() {}
public static void intialize() {
public static void initialize() {
initGeneralSettings();
NetworkSettings netSettings = new NetworkSettings();
netSettings.hostname=GeneralSettings.hostname;
netSettings.gateway=GeneralSettings.gateway;
netSettings.netmask=GeneralSettings.netmask;
netSettings.connectionType=GeneralSettings.connection_type;
netSettings.ip=GeneralSettings.ip;
netSettings.run();
var allCameras = CameraManager.getAllCamerasByName();
if (!allCameras.containsKey(GeneralSettings.curr_camera) && allCameras.size() > 0) {