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

Fix settings paths for Unix systems

Browse Source
This commit is contained in:
Banks Troutman
2019-09-26 15:01:51 -04:00
parent d3083cceb1
commit 7a49541d45
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
public class SettingsManager {
public static final Path SettingsPath = Paths.get(System.getProperty("user.dir"), "Settings");
public static final Path SettingsPath = Paths.get(System.getProperty("user.dir"), "settings");
public static com.chameleonvision.vision.GeneralSettings GeneralSettings;
private SettingsManager() {}
@@ -79,7 +79,7 @@ public class SettingsManager {
private static void initGeneralSettings() {
FileHelper.CheckPath(SettingsPath);
try {
GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(), "Settings.json").toString()), com.chameleonvision.vision.GeneralSettings.class);
GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(), "settings.json").toString()), com.chameleonvision.vision.GeneralSettings.class);
} catch (FileNotFoundException e) {
GeneralSettings = new GeneralSettings();
}

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

@@ -19,7 +19,7 @@ import java.util.List;
public class CameraManager {
private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "Cams");
private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "cameras");
private static HashMap<String, Camera> AllCamerasByName = new HashMap<>();