Raise minimum images for calibration to 100

photon-client/src/components/cameras/CameraCalibrationCard.vue

@@ -15,6 +15,7 @@ import CameraCalibrationInfoCard from "@/components/cameras/CameraCalibrationInf
 import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
 import { useTheme } from "vuetify";
 import TooltippedLabel from "@/components/common/pv-tooltipped-label.vue";
+import type { Calibration3dPipelineSettings } from "@/types/PipelineTypes";
 
 const PromptRegular = import("@/assets/fonts/PromptRegular");
 const jspdf = import("jspdf");
@@ -269,6 +270,11 @@ const endCalibration = () => {
 };
 
 const drawAllSnapshots = ref(true);
+// We really gotta fix our typing system
+const bypassVal = computed<boolean>({
+  get: () => !!(useCameraSettingsStore().currentPipelineSettings as Calibration3dPipelineSettings | undefined)?.bypass,
+  set: (value) => useCameraSettingsStore().changeCurrentPipelineSetting({ bypass: value }, true)
+});
 
 const showCalDialog = ref(false);
 const selectedVideoFormat = ref<VideoFormat | undefined>(undefined);
@@ -545,6 +551,17 @@ const setSelectedVideoFormat = (format: VideoFormat) => {
             Snapshots: {{ useStateStore().calibrationData.imageCount }} of at least
             {{ useStateStore().calibrationData.minimumImageCount }}
           </v-chip>
+          <v-spacer />
+          <pv-switch
+            v-model="bypassVal"
+            color="error"
+            hide-details
+            class="ml-4"
+            label="Bypass minimum"
+            :label-cols="6"
+            :switch-cols="6"
+            tooltip="Bypass the minimum recommended amount of snapshots for a calibration. Should only be used for dev work or temporary tests not competitions. Still requires 10 images to calibrate."
+          />
         </div>
         <div>
           <v-btn

photon-client/src/stores/StateStore.ts

@@ -90,7 +90,7 @@ export const useStateStore = defineStore("state", {
       calibrationData: {
         imageCount: 0,
         videoFormatIndex: 0,
-        minimumImageCount: 12,
+        minimumImageCount: 100,
         hasEnoughImages: false
       },
 

photon-client/src/types/PipelineTypes.ts

@@ -374,6 +374,7 @@ export const DefaultObjectDetectionPipelineSettings: ObjectDetectionPipelineSett
 export interface Calibration3dPipelineSettings extends PipelineSettings {
   pipelineType: PipelineType.Calibration3d;
   drawAllSnapshots: boolean;
+  bypass: boolean;
 }
 export type ConfigurableCalibration3dPipelineSettings = Partial<Omit<Calibration3dPipelineSettings, "pipelineType">> &
   ConfigurablePipelineSettings;
@@ -385,7 +386,8 @@ export const DefaultCalibration3dPipelineSettings: Calibration3dPipelineSettings
   ledMode: true,
   outputMaximumTargets: 1,
   cameraExposureRaw: 6,
-  drawAllSnapshots: false
+  drawAllSnapshots: false,
+  bypass: false
 };
 
 export type ActivePipelineSettings =

photon-core/src/main/java/org/photonvision/vision/pipeline/Calibrate3dPipeline.java

@@ -63,21 +63,25 @@ public class Calibrate3dPipeline
     /// Output of the calibration, getter method is set for this.
     private CVPipeResult<CameraCalibrationCoefficients> calibrationOutput;
 
+    // minSnapshots is the typical limit for the number of snapshots needed, bypassMinSnapshots is the
+    // limit used when the bypass flag is true
     private final int minSnapshots;
+    private final int bypassMinSnapshots;
 
     private boolean calibrating = false;
 
     private static final FrameThresholdType PROCESSING_TYPE = FrameThresholdType.NONE;
 
     public Calibrate3dPipeline() {
-        this(12);
+        this(100, 10);
     }
 
-    public Calibrate3dPipeline(int minSnapshots) {
+    public Calibrate3dPipeline(int minSnapshots, int bypassMinSnapshots) {
         super(PROCESSING_TYPE);
         this.settings = new Calibration3dPipelineSettings();
         this.foundCornersList = new ArrayList<>();
         this.minSnapshots = minSnapshots;
+        this.bypassMinSnapshots = bypassMinSnapshots;
     }
 
     @Override
@@ -165,7 +169,11 @@ List<List<Point>> getCornersList() {
     }
 
     public boolean hasEnough() {
-        return foundCornersList.size() >= minSnapshots;
+        return foundCornersList.size() >= getEffectiveMinSnapshots();
+    }
+
+    private int getEffectiveMinSnapshots() {
+        return settings.bypass ? bypassMinSnapshots : minSnapshots;
     }
 
     public CameraCalibrationCoefficients tryCalibration(Path imageSavePath) {
@@ -174,7 +182,7 @@ public CameraCalibrationCoefficients tryCalibration(Path imageSavePath) {
                     "Not enough snapshots! Only got "
                             + foundCornersList.size()
                             + " of "
-                            + minSnapshots
+                            + getEffectiveMinSnapshots()
                             + " -- returning null..");
             return null;
         }
@@ -216,7 +224,7 @@ public void broadcastState() {
                         new UICalibrationData(
                                 foundCornersList.size(),
                                 settings.cameraVideoModeIndex,
-                                minSnapshots,
+                                getEffectiveMinSnapshots(),
                                 hasEnough(),
                                 Units.metersToInches(settings.gridSize),
                                 Units.metersToInches(settings.markerSize),

photon-core/src/main/java/org/photonvision/vision/pipeline/Calibration3dPipelineSettings.java

@@ -33,6 +33,7 @@ public class Calibration3dPipelineSettings extends AdvancedPipelineSettings {
     public boolean useMrCal = true;
     public boolean useOldPattern = false;
     public boolean drawAllSnapshots;
+    public boolean bypass;
 
     public Calibration3dPipelineSettings() {
         super();
@@ -41,5 +42,6 @@ public Calibration3dPipelineSettings() {
         this.outputShouldShow = true;
         this.streamingFrameDivisor = FrameDivisor.HALF;
         this.drawAllSnapshots = true;
+        this.bypass = false;
     }
 }

photon-core/src/main/java/org/photonvision/vision/processes/VisionModuleChangeSubscriber.java

@@ -154,6 +154,11 @@ public void processSettingChanges() {
                         }
 
                         parentModule.saveAndBroadcastSelective(originContext, propName, newPropValue);
+
+                        if (propName.equals("bypass")) {
+                            // Rebroadcast calibration data when bypass changes
+                            parentModule.pipelineManager.calibration3dPipeline.broadcastState();
+                        }
                     }
                 }
             }

photon-core/src/test/java/org/photonvision/vision/pipeline/Calibrate3dPipeTest.java

@@ -216,7 +216,7 @@ public static void calibrateCommon(
 
         assertTrue(directoryListing.length >= 12);
 
-        Calibrate3dPipeline calibration3dPipeline = new Calibrate3dPipeline(10);
+        Calibrate3dPipeline calibration3dPipeline = new Calibrate3dPipeline(10, 10);
         calibration3dPipeline.getSettings().boardType = boardType;
         calibration3dPipeline.getSettings().markerSize = markerSize;
         calibration3dPipeline.getSettings().tagFamily = tagFamily;