diff --git a/photon-client/src/components/dashboard/tabs/CustomTestTab.vue b/photon-client/src/components/dashboard/tabs/CustomTestTab.vue new file mode 100644 index 0000000..65b04ba --- /dev/null +++ b/photon-client/src/components/dashboard/tabs/CustomTestTab.vue @@ -0,0 +1,39 @@ + + + diff --git a/photon-client/src/types/PipelineTypes.ts b/photon-client/src/types/PipelineTypes.ts index b5c7abe..07e689e 100644 --- a/photon-client/src/types/PipelineTypes.ts +++ b/photon-client/src/types/PipelineTypes.ts @@ -6,7 +6,8 @@ export enum PipelineType { ColoredShape = 3, AprilTag = 4, Aruco = 5, - ObjectDetection = 6 + ObjectDetection = 6, + CustomTest = 7 } export enum AprilTagFamily { @@ -316,6 +317,29 @@ export const DefaultObjectDetectionPipelineSettings: ObjectDetectionPipelineSett model: "" }; +export interface CustomTestPipelineSettings extends PipelineSettings { + pipelineType: PipelineType.AprilTag; + test1: number; + test2: number; + test3: number; +} +export type ConfigurableCustomTestPipelineSettings = Partial< + Omit +> & + ConfigurablePipelineSettings; +export const DefaultCustomTestPipelineSettings: CustomTestPipelineSettings = { + ...DefaultPipelineSettings, + pipelineType: PipelineType.AprilTag, + cameraGain: 20, + targetModel: TargetModel.InfiniteRechargeHighGoalOuter, + ledMode: true, + outputShowMultipleTargets: false, + cameraExposureRaw: 6, + test1: 1, + test2: 2, + test3: 3 +}; + export interface Calibration3dPipelineSettings extends PipelineSettings { drawAllSnapshots: boolean; } @@ -338,6 +362,7 @@ export type ActivePipelineSettings = | AprilTagPipelineSettings | ArucoPipelineSettings | ObjectDetectionPipelineSettings + | CustomTestPipelineSettings | Calibration3dPipelineSettings; export type ActiveConfigurablePipelineSettings = @@ -346,4 +371,5 @@ export type ActiveConfigurablePipelineSettings = | ConfigurableAprilTagPipelineSettings | ConfigurableArucoPipelineSettings | ConfigurableObjectDetectionPipelineSettings + | ConfigurableCustomTestPipelineSettings | ConfigurableCalibration3dPipelineSettings; diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java b/photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java index 92b4b1f..b039432 100644 --- a/photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java +++ b/photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java @@ -380,6 +380,12 @@ public class PipelineManager { added.pipelineNickname = nickname; return added; } + case CustomTest: + { + var added = new CustomTestPipelineSettings(); + added.pipelineNickname = nickname; + return added; + } default: { logger.error("Got invalid pipeline type: " + type);