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

Point config test to testconfigdir instead of default config dir (#49)

Browse Source
This commit is contained in:
Matt
2020-07-19 19:43:02 -07:00
committed by GitHub
parent a6b5112faf
commit c5be2941e8
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
photon-server/src/main/java/org/photonvision/common/configuration/ConfigManager.java
View File

@@ -36,7 +36,7 @@ public class ConfigManager {
private static ConfigManager INSTANCE;
private PhotonConfiguration config;
private final File rootFolder;
final File rootFolder;
private final File hardwareConfigFile;
private final File networkConfigFile;
private final File camerasFolder;
@@ -52,11 +52,11 @@ public class ConfigManager {
return config;
}
protected static Path getRootFolder() {
private static Path getRootFolder() {
return Path.of("photonvision");
}
private ConfigManager(Path rootFolder) {
ConfigManager(Path rootFolder) {
this.rootFolder = new File(rootFolder.toUri());
this.hardwareConfigFile =
new File(Path.of(rootFolder.toString(), "hardwareConfig.json").toUri());
@@ -246,7 +246,7 @@ public class ConfigManager {
.map(
p -> {
var relativizedFilePath =
getRootFolder().toAbsolutePath().relativize(p).toString();
rootFolder.toPath().toAbsolutePath().relativize(p).toString();
try {
return JacksonUtils.deserialize(p, CVPipelineSettings.class);
} catch (JsonProcessingException e) {