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

Make SettingsManager completely static

Browse Source
This commit is contained in:
Banks Troutman
2019-09-20 19:54:59 -04:00
parent d733995ac6
commit 096e214a8e
4 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ public class CameraManager {
public static void setCurrentCamera(String cameraName) throws CameraException {
if (!AllCamerasByName.containsKey(cameraName)) throw new CameraException(CameraException.CameraExceptionType.BAD_CAMERA);
SettingsManager.GeneralSettings.curr_camera = cameraName;
SettingsManager.getInstance().updateCameraSetting(cameraName, getCurrentCamera().getCurrentPipelineIndex());
SettingsManager.updateCameraSetting(cameraName, getCurrentCamera().getCurrentPipelineIndex());
}
public static Camera getCurrentCamera() throws CameraException {
@@ -92,7 +92,7 @@ public class CameraManager {
public static void setCurrentPipeline(int pipelineNumber) throws CameraException {
if (!getCurrentCamera().getPipelines().containsKey(pipelineNumber)) throw new CameraException(CameraException.CameraExceptionType.BAD_PIPELINE);
getCurrentCamera().setCurrentPipelineIndex(pipelineNumber);
SettingsManager.getInstance().updatePipelineSetting(pipelineNumber);
SettingsManager.updatePipelineSetting(pipelineNumber);
}
public static Pipeline getCurrentPipeline() throws CameraException {