Allow 90-deg rotation of USB cameras on Pi (#1103)

UI would say that every camera on a Pi device was a CSI camera basically. It would not let you rotate usb cameras 90 degrees or 270 degrees because it thought that they were CSI cameras. Fixes: #1098
This commit is contained in:
Programmers3539
2024-01-02 07:27:09 -08:00
committed by GitHub
parent 96de176ba2
commit 2a1792e71a
6 changed files with 12 additions and 2 deletions

View File

@@ -12,7 +12,7 @@ const cameraRotations = computed(() =>
["Normal", "90° CW", "180°", "90° CCW"].map((v, i) => ({
name: v,
value: i,
disabled: useSettingsStore().gpuAccelerationEnabled ? [1, 3].includes(i) : false
disabled: useCameraSettingsStore().isCSICamera ? [1, 3].includes(i) : false
}))
);

View File

@@ -58,6 +58,9 @@ export const useCameraSettingsStore = defineStore("cameraSettings", {
},
isCalibrationMode(): boolean {
return this.currentCameraSettings.currentPipelineIndex == WebsocketPipelineType.Calib3d;
},
isCSICamera(): boolean {
return this.currentCameraSettings.isCSICamera;
}
},
actions: {
@@ -99,6 +102,7 @@ export const useCameraSettingsStore = defineStore("cameraSettings", {
perViewErrors: calib.perViewErrors,
intrinsics: calib.intrinsics
})),
isCSICamera: d.isCSICamera,
pipelineNicknames: d.pipelineNicknames,
currentPipelineIndex: d.currentPipelineIndex,
pipelineSettings: d.currentPipelineSettings

View File

@@ -112,6 +112,7 @@ export interface CameraSettings {
currentPipelineIndex: number;
pipelineNicknames: string[];
pipelineSettings: ActivePipelineSettings;
isCSICamera: boolean;
}
export const PlaceholderCameraSettings: CameraSettings = {
@@ -145,7 +146,8 @@ export const PlaceholderCameraSettings: CameraSettings = {
pipelineNicknames: ["Placeholder Pipeline"],
lastPipelineIndex: 0,
currentPipelineIndex: 0,
pipelineSettings: DefaultAprilTagPipelineSettings
pipelineSettings: DefaultAprilTagPipelineSettings,
isCSICamera: false
};
export enum CalibrationBoardTypes {

View File

@@ -52,6 +52,7 @@ export interface WebsocketCameraSettingsUpdate {
fov: number;
inputStreamPort: number;
isFovConfigurable: boolean;
isCSICamera: boolean;
nickname: string;
outputStreamPort: number;
pipelineNicknames: string[];

View File

@@ -174,5 +174,6 @@ public class PhotonConfiguration {
public int inputStreamPort;
public List<HashMap<String, Object>> calibrations;
public boolean isFovConfigurable = true;
public boolean isCSICamera;
}
}

View File

@@ -41,6 +41,7 @@ import org.photonvision.common.logging.Logger;
import org.photonvision.common.util.SerializationUtils;
import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
import org.photonvision.vision.camera.CameraQuirk;
import org.photonvision.vision.camera.CameraType;
import org.photonvision.vision.camera.LibcameraGpuSource;
import org.photonvision.vision.camera.QuirkyCamera;
import org.photonvision.vision.camera.USBCameraSource;
@@ -498,6 +499,7 @@ public class VisionModule {
var ret = new PhotonConfiguration.UICameraConfiguration();
ret.fov = visionSource.getSettables().getFOV();
ret.isCSICamera = visionSource.getCameraConfiguration().cameraType == CameraType.ZeroCopyPicam;
ret.nickname = visionSource.getSettables().getConfiguration().nickname;
ret.currentPipelineSettings =
SerializationUtils.objectToHashMap(pipelineManager.getCurrentPipelineSettings());