Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-21 01:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI 3d mode, ConfigManager bugfixes (#103)

Browse Source 
* stupid bugs I guess idk where else to put this commit

* Run spotless

* Fix config file loading

Splits load into own method

* Run spotless
This commit is contained in:
Matt
2020-08-26 10:03:56 -07:00
committed by GitHub
parent fea72e18bf
commit 9f0e89ea29
13 changed files with 105 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,11 +87,9 @@ public class ConfigManager {
this.camerasFolder = new File(Path.of(configDirectoryFile.toString(), "cameras").toUri());
TimedTaskManager.getInstance().addTask("ConfigManager", this::checkSaveAndWrite, 1000);
load();
}
private void load() {
public void load() {
logger.info("Loading settings...");
if (!configDirectoryFile.exists()) {
if (configDirectoryFile.mkdirs()) {
@@ -163,6 +161,9 @@ public class ConfigManager {
public void saveToDisk() {
logger.info("Saving settings...");
// Delete old configs
FileUtils.deleteDirectory(camerasFolder.toPath());
try {
JacksonUtils.serialize(hardwareConfigFile.toPath(), config.getHardwareConfig());
} catch (IOException e) {
@@ -174,9 +175,6 @@ public class ConfigManager {
logger.error("Could not save network config!", e);
}
// Delete old configs
FileUtils.deleteDirectory(camerasFolder.toPath());
// save all of our cameras
var cameraConfigMap = config.getCameraConfigurations();
for (var subdirName : cameraConfigMap.keySet()) {