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

Use the new DeSerializer

Browse Source
This commit is contained in:
Matt
2019-11-19 21:49:56 -08:00
parent 824017b792
commit 0ed2697565
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Main/src/main/java/com/chameleonvision/classabstraction/config/ConfigManager.java
View File

@@ -67,12 +67,11 @@ public class ConfigManager {
var configList = new ArrayList<CameraConfig>();
// loop over all the camera names and try to create settings folders for it
cameraNames.forEach((cameraName) -> {
final Path cameraConfigFolder = Paths.get(cameraConfigPath.toString(), String.format("%s\\", cameraName));
final Path cameraConfigPath = Paths.get(cameraConfigFolder.toString(), String.format("%s.json", cameraName));
final Path cameraPipelinesPath = Paths.get(cameraConfigFolder.toString(), "pipelines.json");
final Path cameraDrivermodePath = Paths.get(cameraConfigFolder.toString(), "drivermode.json");
// check if the config folder exists, and if not, create it
boolean cameraConfigFolderExists = Files.exists(cameraConfigFolder);
@@ -89,11 +88,9 @@ public class ConfigManager {
var camJsonFile = new File(cameraConfigPath.toString());
if(camJsonFile.exists() && camJsonFile.length() > 0) {
try {
Gson gson = new GsonBuilder().registerTypeAdapter(USBCamera.class, new CameraDeserializer()).create();
var camJsonFileReader = new FileReader(camJsonFile.toString());
var gsonRead = gson.fromJson(camJsonFileReader, CameraConfig.class);
configList.add(gsonRead);
} catch (FileNotFoundException e) {
var config = FileHelper.DeSerializer(cameraConfigPath, CameraConfig.class);
configList.add(config);
} catch (IOException e) {
e.printStackTrace();
}
} else {