diff --git a/photon-client/src/stores/settings/CameraSettingsStore.ts b/photon-client/src/stores/settings/CameraSettingsStore.ts index 1a067de95..3e33f1af6 100644 --- a/photon-client/src/stores/settings/CameraSettingsStore.ts +++ b/photon-client/src/stores/settings/CameraSettingsStore.ts @@ -45,7 +45,7 @@ export const useCameraSettingsStore = defineStore("cameraSettings", { }, // This method only exists due to just how lazy I am and my dislike of consolidating the pipeline type enums (which mind you, suck as is) currentWebsocketPipelineType(): WebsocketPipelineType { - return this.currentPipelineType - 2; + return this.currentPipelineType - 3; }, currentVideoFormat(): VideoFormat { return this.currentCameraSettings.validVideoFormats[this.currentPipelineSettings.cameraVideoModeIndex]; diff --git a/photon-client/src/types/PipelineTypes.ts b/photon-client/src/types/PipelineTypes.ts index 1b5631194..ce9f59a7b 100644 --- a/photon-client/src/types/PipelineTypes.ts +++ b/photon-client/src/types/PipelineTypes.ts @@ -1,13 +1,16 @@ import type { WebsocketNumberPair } from "@/types/WebsocketDataTypes"; import type { ObjectDetectionModelProperties } from "@/types/SettingTypes"; +/** + * The on-wire form of PipelineType.java (the enum is serialized with `ordinal()`) + */ export enum PipelineType { - DriverMode = 1, - Reflective = 2, - ColoredShape = 3, - AprilTag = 4, - Aruco = 5, - ObjectDetection = 6 + DriverMode = 2, + Reflective = 3, + ColoredShape = 4, + AprilTag = 5, + Aruco = 6, + ObjectDetection = 7 } export enum AprilTagFamily {